Commit 9a0d0357 authored by Sascha Pfeiffer's avatar Sascha Pfeiffer

Merge branch 'develop' into fileserve

Signed-off-by: default avatarSascha Pfeiffer <[email protected]>
parents 0845b7c4 1cd25527
......@@ -64,7 +64,7 @@
'ko': {'code': 'ko', 'lng_code': 'LANG_KO'},
'nl': {'code': 'nl', 'lng_code': 'LANG_NL', 'active': true},
'pl': {'code': 'pl', 'lng_code': 'LANG_PL'},
'ru': {'code': 'ru', 'lng_code': 'LANG_RU'},
'ru': {'code': 'ru', 'lng_code': 'LANG_RU', 'active': true},
'vi': {'code': 'vi', 'lng_code': 'LANG_VI'},
'zh-cn': {'code': 'zh-cn', 'lng_code': 'LANG_ZH_CN'}
};
......
......@@ -52,6 +52,7 @@
"MOVE_FOLDER": "Ordner verschieben",
"DELETE_FOLDER": "Ordner löschen",
"MOVE": "Verschieben",
"API_KEYS_HAVE_BEEN_DISABLED": "Der Server Administrator hat API Keys deaktiviert. Bitte wenden sie sich an den Administrator.",
"EXPORT_HAS_BEEN_DISABLED": "Der Server Administrator hat das Export Feature deaktiviert. Bitte wenden sie sich an den Administrator.",
"SECONDS": "Sekunden",
"EMERGENCY_CODE_ACTIVATED": "Notfall Code Akttivierungs-Countdown gestartet. Sie können sich einloggen sobald der Countdown abgelaufen ist. Bitte wiederholen sie den Schritt in:",
......
......@@ -52,6 +52,7 @@
"MOVE_FOLDER": "Move Folder",
"DELETE_FOLDER": "Delete Folder",
"MOVE": "Move",
"API_KEYS_HAVE_BEEN_DISABLED": "The server administrator has disabled api keys. Please talk to your administrator.",
"EXPORT_HAS_BEEN_DISABLED": "The server administrator has disabled the export feature. Please talk to your administrator.",
"SECONDS": "seconds",
"EMERGENCY_CODE_ACTIVATED": "Emergency code activation countdown started. You can login once the countdown is finished. Please repeat this step in:",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment