Commit graph

126 commits

Author SHA1 Message Date
Ponkhy 4711aeb355
Merge branch 'master' into import-export 2021-09-12 23:21:33 +02:00
Adam Stachowicz 7199bb5ead Remove unused i18n key 2021-09-12 23:11:07 +02:00
LouisLam 7df9698e5d eslint: comma-dangle for language files 2021-09-13 00:58:45 +08:00
Ponkhy d313966d80
Merge branch 'master' into import-export 2021-09-12 18:46:11 +02:00
LouisLam 8205f90f3d update language files 2021-09-13 00:45:43 +08:00
Louis Lam c52b9b63d5
Merge pull request #389 from Ponkhy/default-notification
Wording correction for notification modal
2021-09-12 23:49:09 +08:00
Louis Lam e55193270d
Merge pull request #377 from Lrss/master
Fix: Inconsistent white-space for the "Avg."-Ping/Response title.
2021-09-12 23:48:29 +08:00
Louis Lam 9d39071a91
Merge pull request #363 from Ponkhy/2fa
Added simple TOTP Two Factor Authentication
2021-09-12 23:47:42 +08:00
Ponkhy db14768229 Wording correction for notification modal 2021-09-12 01:44:05 +02:00
jtagcat b80c88d9a0 i10n: update Estonian 2021-09-12 00:51:03 +03:00
Ponkhy 862672731f Minor typo fix 2021-09-11 22:06:26 +02:00
Ponkhy 7fee4a7ea7 Added import options 2021-09-11 21:53:17 +02:00
Ponkhy 8cd5bad44c
Merge branch 'master' into 2fa 2021-09-11 16:32:11 +02:00
Ponkhy d003abcd60
Update src/languages/en.js
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-11 14:34:23 +02:00
Lars Sørensen 66769e1c79
Fixed inconsistent white-space for the "Avg."-Ping/Response title. 2021-09-11 13:52:41 +02:00
Lars Sørensen 39c7b5e748
Added new Strings to Danish translation 2021-09-11 13:37:53 +02:00
Lars Sørensen b709857e19
Better wording for Danish language 2021-09-11 13:20:40 +02:00
Louis Lam 97df200d6c
Merge pull request #365 from Ponkhy/master
Minor translation fixes
2021-09-10 11:46:20 +08:00
新逸Cary 2f0d994c83 update Simplified Chinese language(更新简体中文语言) 2021-09-10 09:26:01 +08:00
Ponkhy c3c576bd13 Added "Show URI" translation 2021-09-10 01:33:26 +02:00
Ponkhy c62732fa9c Minor translation fixes 2021-09-10 01:24:21 +02:00
Ponkhy 403202d4d4 Added simple TOTP Two Factor Authentication 2021-09-09 21:10:31 +02:00
LouisLam 94a6c1a344 update language files 2021-09-09 20:38:19 +08:00
Paride Barison 44eba70b78 altri errorini sistemati 2021-09-09 14:19:15 +02:00
Paride Barison c6dab944d1 altra correzione 2021-09-09 14:12:30 +02:00
Ioma Taani 0f4bc5850b
Merge branch 'louislam:master' into italian-translation-update 2021-09-09 14:05:00 +02:00
Louis Lam 331ae5ec20
Merge pull request #306 from Ponkhy/import-export
Added import and export function
2021-09-09 16:15:48 +08:00
Ioma Taani b54bbc302d migliorata la traduzione 2021-09-08 21:34:48 +02:00
Paride Barison f44f951e40 Tradotte le ultime cose come richiesto 2021-09-08 08:41:19 +02:00
Ioma Taani dea9b05d49
Merge branch 'louislam:master' into italian-language 2021-09-08 08:30:10 +02:00
Louis Lam d761d54d0e
Merge pull request #340 from Ponkhy/default-notification
Added the option for default notifications
2021-09-08 12:49:14 +08:00
LouisLam e37621853e Merge branch 'estonian'
# Conflicts:
#	src/pages/Settings.vue
2021-09-08 11:00:19 +08:00
Ponkhy 69a7c4dab4 Improved importBackup handling 2021-09-07 23:14:44 +02:00
jtagcat 2c3880a326 Added Estonian.
- "Avg.": using ≈, as it's commonly enough known.
   There is no known shorthand for 'average' that I know of.

- Leaved some strings empty, as repeating the same words is useless, just noise.
2021-09-07 23:31:48 +03:00
Ponkhy f4e885982d Added export/import description for de-DE 2021-09-07 21:10:47 +02:00
Ioma Taani dcf6dd8b32
Ultimi aggiustamenti 2021-09-07 19:16:29 +02:00
Ioma Taani 093cfec8dd
Typo. 2021-09-07 19:13:04 +02:00
Ioma Taani f13dcb3c5b
Update it-IT.js
Completed.
2021-09-07 19:07:50 +02:00
LouisLam 1a5ffd4755 add description for export/import 2021-09-08 00:46:48 +08:00
Ioma Taani a2f9e9e9c4
Creata lingua italiana 2021-09-07 18:25:24 +02:00
LouisLam 62712f5cc4 Merge branch 'master' into import-export 2021-09-08 00:18:43 +08:00
LouisLam f0f1847ad8 update language files 2021-09-07 23:53:20 +08:00
LouisLam 0aeaf87f5b Merge branch 'master' into default-notification
# Conflicts:
#	server/notification.js
#	src/components/NotificationDialog.vue
2021-09-07 23:40:42 +08:00
LouisLam 4a106431f3 convert Telegram into a vue components 2021-09-07 23:32:05 +08:00
Ponkhy 242e494cb5
Merge branch 'master' into import-export 2021-09-07 14:12:53 +02:00
Ponkhy 4faa409027
Merge branch 'master' into default-notification 2021-09-07 14:07:50 +02:00
LouisLam fe35d95441 merge language files 2021-09-07 17:38:04 +08:00
LouisLam da131a5156 Merge branch 'master' into clear-monitor-data
# Conflicts:
#	src/languages/da-DK.js
#	src/languages/en.js
#	src/languages/es-ES.js
#	src/languages/fr-FR.js
#	src/languages/ja.js
#	src/languages/ko-KR.js
#	src/languages/nl-NL.js
#	src/languages/ru-RU.js
#	src/languages/sr-latn.js
#	src/languages/sr.js
#	src/languages/sv-SE.js
#	src/languages/zh-CN.js
#	src/languages/zh-HK.js
2021-09-07 17:36:37 +08:00
Louis Lam cc351b2883
Merge pull request #339 from Minvinea/master
Update few words and file name
2021-09-06 13:38:26 +08:00
Ponkhy fd8c95d64e
Merge branch 'master' into default-notification 2021-09-05 23:32:31 +02:00