summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
Diffstat (limited to 'settings')
-rw-r--r--settings/ajax/changepassword.php2
-rw-r--r--settings/js/apps.js10
-rw-r--r--settings/l10n/ca.php2
-rw-r--r--settings/l10n/da.php2
-rw-r--r--settings/l10n/de_CH.php6
-rw-r--r--settings/l10n/de_DE.php10
-rw-r--r--settings/l10n/es.php2
-rw-r--r--settings/l10n/et_EE.php2
-rw-r--r--settings/l10n/fi_FI.php4
-rw-r--r--settings/l10n/nl.php2
-rw-r--r--settings/l10n/pt_BR.php2
-rw-r--r--settings/l10n/ru.php1
-rw-r--r--settings/l10n/sv.php2
-rw-r--r--settings/l10n/tr.php2
-rw-r--r--settings/l10n/ug.php9
-rw-r--r--settings/l10n/zh_CN.GB2312.php118
-rw-r--r--settings/l10n/zh_CN.php6
-rw-r--r--settings/l10n/zh_TW.php6
-rw-r--r--settings/personal.php2
-rw-r--r--settings/templates/personal.php2
20 files changed, 65 insertions, 127 deletions
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index d409904ebc7..47ceb5ab873 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -8,7 +8,7 @@ OC_JSON::checkLoggedIn();
OC_APP::loadApps();
$username = isset($_POST['username']) ? $_POST['username'] : OC_User::getUser();
-$password = isset($_POST['password']) ? $_POST['password'] : null;
+$password = isset($_POST['personal-password']) ? $_POST['personal-password'] : null;
$oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : '';
$recoveryPassword = isset($_POST['recoveryPassword']) ? $_POST['recoveryPassword'] : null;
diff --git a/settings/js/apps.js b/settings/js/apps.js
index d9817aff6b6..1ae45932172 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -27,7 +27,15 @@ OC.Settings.Apps = OC.Settings.Apps || {
}
page.find('small.externalapp').attr('style', 'visibility:visible');
page.find('span.author').text(app.author);
- page.find('span.licence').text(app.license);
+
+ // FIXME licenses of downloaded apps go into app.licence, licenses of not-downloaded apps into app.license
+ var appLicense = '';
+ if (typeof(app.licence) !== 'undefined') {
+ appLicense = app.licence;
+ } else if (typeof(app.license) !== 'undefined') {
+ appLicense = app.license;
+ }
+ page.find('span.licence').text(appLicense);
if (app.update !== false) {
page.find('input.update').show();
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index f87d92ecbe1..6de7d4518c3 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
"Disable" => "Desactiva",
"Enable" => "Habilita",
"Please wait...." => "Espereu...",
+"Error while disabling app" => "Error en desactivar l'aplicació",
+"Error while enabling app" => "Error en activar l'aplicació",
"Updating...." => "Actualitzant...",
"Error while updating app" => "Error en actualitzar l'aplicació",
"Error" => "Error",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index f352dd459f9..b34625f75e1 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
"Disable" => "Deaktiver",
"Enable" => "Aktiver",
"Please wait...." => "Vent venligst...",
+"Error while disabling app" => "Kunne ikke deaktivere app",
+"Error while enabling app" => "Kunne ikke aktivere app",
"Updating...." => "Opdaterer....",
"Error while updating app" => "Der opstod en fejl under app opgraderingen",
"Error" => "Fejl",
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
index e3316a9b039..45650a3b440 100644
--- a/settings/l10n/de_CH.php
+++ b/settings/l10n/de_CH.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
"Disable" => "Deaktivieren",
"Enable" => "Aktivieren",
"Please wait...." => "Bitte warten....",
+"Error while disabling app" => "Fehler während der Deaktivierung der Anwendung",
+"Error while enabling app" => "Fehler während der Aktivierung der Anwendung",
"Updating...." => "Update...",
"Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten",
"Error" => "Fehler",
"Update" => "Update durchführen",
"Updated" => "Aktualisiert",
+"Decrypting files... Please wait, this can take some time." => "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
"Saving..." => "Speichern...",
"deleted" => "gelöscht",
"undo" => "rückgängig machen",
@@ -102,6 +105,9 @@ $TRANSLATIONS = array(
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">auf ihre Dateien per WebDAV zuzugreifen</a>.",
"Encryption" => "Verschlüsselung",
+"The encryption app is no longer enabled, decrypt all your file" => "Die Anwendung zur Verschlüsselung ist nicht länger aktiv, all Ihre Dateien werden entschlüsselt. ",
+"Log-in password" => "Login-Passwort",
+"Decrypt all Files" => "Alle Dateien entschlüsseln",
"Login Name" => "Loginname",
"Create" => "Erstellen",
"Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 5a76de7d2e6..c14e5a3606a 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
"Disable" => "Deaktivieren",
"Enable" => "Aktivieren",
"Please wait...." => "Bitte warten....",
+"Error while disabling app" => "Beim deaktivieren der Applikation ist ein Fehler aufgetreten.",
+"Error while enabling app" => "Beim aktivieren der Applikation ist ein Fehler aufgetreten.",
"Updating...." => "Update...",
"Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten",
"Error" => "Fehler",
@@ -39,7 +41,7 @@ $TRANSLATIONS = array(
"A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
"__language_name__" => "Deutsch (Förmlich: Sie)",
"Security Warning" => "Sicherheitshinweis",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis und Ihre Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis und Ihre Dateien sind möglicherweise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
"Setup Warning" => "Einrichtungswarnung",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte überprüfen Sie die <a href=\"%s\">Instalationsanleitungen</a>.",
@@ -48,17 +50,17 @@ $TRANSLATIONS = array(
"Locale not working" => "Die Lokalisierung funktioniert nicht",
"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Die System-Ländereinstellung kann nicht auf %s geändert werden. Dies bedeutet, dass es Probleme mit bestimmten Zeichen in Dateinamen geben könnte. Wir empfehlen, die für %s benötigten Pakete auf ihrem System zu installieren.",
"Internet connection not working" => "Keine Internetverbindung",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen.",
"Cron" => "Cron",
"Execute one task with each page loaded" => "Eine Aufgabe bei jedem Laden der Seite ausführen",
"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php ist als Webcron-Dienst registriert, der die cron.php minütlich per HTTP aufruft.",
-"Use systems cron service to call the cron.php file once a minute." => "Benutzen Sie den System-Crondienst um die cron.php minütlich aufzurufen.",
+"Use systems cron service to call the cron.php file once a minute." => "Benutzen Sie den System-Crondienst, um die cron.php minütlich aufzurufen.",
"Sharing" => "Teilen",
"Enable Share API" => "Share-API aktivieren",
"Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen",
"Allow links" => "Links erlauben",
"Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
-"Allow public uploads" => "Erlaube öffentliches hochladen",
+"Allow public uploads" => "Öffentliches Hochladen erlauben",
"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen",
"Allow resharing" => "Erlaube Weiterverteilen",
"Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 971500305da..4f3099b8c24 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -60,7 +60,7 @@ $TRANSLATIONS = array(
"Allow public uploads" => "Permitir subidas públicas",
"Allow users to enable others to upload into their publicly shared folders" => "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente",
"Allow resharing" => "Permitir re-compartición",
-"Allow users to share items shared with them again" => "Permitir a los usuarios compartir elementos ya compartidos con ellos mismos",
+"Allow users to share items shared with them again" => "Permitir a los usuarios compartir de nuevo elementos ya compartidos",
"Allow users to share with anyone" => "Permitir a los usuarios compartir con todo el mundo",
"Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los usuarios en sus grupos",
"Security" => "Seguridad",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index cbe0c838f54..d779a36cb9b 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
"Disable" => "Lülita välja",
"Enable" => "Lülita sisse",
"Please wait...." => "Palun oota...",
+"Error while disabling app" => "Viga rakendi keelamisel",
+"Error while enabling app" => "Viga rakendi lubamisel",
"Updating...." => "Uuendamine...",
"Error while updating app" => "Viga rakenduse uuendamisel",
"Error" => "Viga",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 9bc90fa63f1..cf2ff5041c1 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
"Disable" => "Poista käytöstä",
"Enable" => "Käytä",
"Please wait...." => "Odota hetki...",
+"Error while disabling app" => "Virhe poistaessa sovellusta käytöstä",
+"Error while enabling app" => "Virhe ottaessa sovellusta käyttöön",
"Updating...." => "Päivitetään...",
"Error while updating app" => "Virhe sovellusta päivittäessä",
"Error" => "Virhe",
@@ -39,6 +41,7 @@ $TRANSLATIONS = array(
"A valid password must be provided" => "Anna kelvollinen salasana",
"__language_name__" => "_kielen_nimi_",
"Security Warning" => "Turvallisuusvaroitus",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Lue <a href=\"%s\">asennusohjeet</a> tarkasti.",
"Module 'fileinfo' missing" => "Moduuli 'fileinfo' puuttuu",
"Internet connection not working" => "Internet-yhteys ei toimi",
"Cron" => "Cron",
@@ -53,6 +56,7 @@ $TRANSLATIONS = array(
"Allow users to only share with users in their groups" => "Salli jakaminen vain samoissa ryhmissä olevien käyttäjien kesken",
"Security" => "Tietoturva",
"Enforce HTTPS" => "Pakota HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta.",
"Log" => "Loki",
"Log level" => "Lokitaso",
"More" => "Enemmän",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index d3e4e0e99ac..6e82c9c92f6 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
"Disable" => "Uitschakelen",
"Enable" => "Activeer",
"Please wait...." => "Even geduld aub....",
+"Error while disabling app" => "Fout tijdens het uitzetten van het programma",
+"Error while enabling app" => "Fout tijdens het aanzetten van het programma",
"Updating...." => "Bijwerken....",
"Error while updating app" => "Fout bij bijwerken app",
"Error" => "Fout",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 78fad69c22e..7b51025356b 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
"Disable" => "Desabilitar",
"Enable" => "Habilitar",
"Please wait...." => "Por favor, aguarde...",
+"Error while disabling app" => "Erro enquanto desabilitava o aplicativo",
+"Error while enabling app" => "Erro enquanto habilitava o aplicativo",
"Updating...." => "Atualizando...",
"Error while updating app" => "Erro ao atualizar aplicativo",
"Error" => "Erro",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 3d05f6bb08d..63e502b8d5b 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -25,6 +25,7 @@ $TRANSLATIONS = array(
"Error" => "Ошибка",
"Update" => "Обновить",
"Updated" => "Обновлено",
+"Decrypting files... Please wait, this can take some time." => "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
"Saving..." => "Сохранение...",
"deleted" => "удален",
"undo" => "отмена",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index b7a280625c8..15e0ca9b8d5 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
"Disable" => "Deaktivera",
"Enable" => "Aktivera",
"Please wait...." => "Var god vänta...",
+"Error while disabling app" => "Fel vid inaktivering av app",
+"Error while enabling app" => "Fel vid aktivering av app",
"Updating...." => "Uppdaterar...",
"Error while updating app" => "Fel uppstod vid uppdatering av appen",
"Error" => "Fel",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index cd9e26742a0..cd90d2f8a01 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
"Disable" => "Etkin değil",
"Enable" => "Etkinleştir",
"Please wait...." => "Lütfen bekleyin....",
+"Error while disabling app" => "Uygulama devre dışı bırakılırken hata",
+"Error while enabling app" => "Uygulama etkinleştirilirken hata",
"Updating...." => "Güncelleniyor....",
"Error while updating app" => "Uygulama güncellenirken hata",
"Error" => "Hata",
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index b62b0a7930e..df9b7e988c1 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
"Unable to delete user" => "ئىشلەتكۈچىنى ئۆچۈرەلمىدى",
"Language changed" => "تىل ئۆزگەردى",
"Invalid request" => "ئىناۋەتسىز ئىلتىماس",
+"Admins can't remove themself from the admin group" => "باشقۇرغۇچى ئۆزىنى باشقۇرۇش گۇرۇپپىسىدىن چىقىرىۋېتەلمەيدۇ",
"Unable to add user to group %s" => "ئىشلەتكۈچىنى %s گۇرۇپپىغا قوشالمايدۇ",
"Unable to remove user from group %s" => "ئىشلەتكۈچىنى %s گۇرۇپپىدىن چىقىرىۋېتەلمەيدۇ",
"Couldn't update app." => "ئەپنى يېڭىلىيالمايدۇ.",
@@ -32,6 +33,14 @@ $TRANSLATIONS = array(
"Group Admin" => "گۇرۇپپا باشقۇرغۇچى",
"Delete" => "ئۆچۈر",
"add group" => "گۇرۇپپا قوش",
+"A valid username must be provided" => "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
+"Error creating user" => "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى",
+"A valid password must be provided" => "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك",
+"__language_name__" => "ئۇيغۇرچە",
+"Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش",
+"Setup Warning" => "ئاگاھلاندۇرۇش تەڭشەك",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ.",
+"Module 'fileinfo' missing" => "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان",
"Sharing" => "ھەمبەھىر",
"Security" => "بىخەتەرلىك",
"Log" => "خاتىرە",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
deleted file mode 100644
index b2457a75e50..00000000000
--- a/settings/l10n/zh_CN.GB2312.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unable to load list from App Store" => "不能从App Store 中加载列表",
-"Authentication error" => "验证错误",
-"Your display name has been changed." => "您的显示名称已修改",
-"Unable to change display name" => "无法更改显示名称",
-"Group already exists" => "群组已存在",
-"Unable to add group" => "未能添加群组",
-"Email saved" => "Email 保存了",
-"Invalid email" => "非法Email",
-"Unable to delete group" => "未能删除群组",
-"Unable to delete user" => "未能删除用户",
-"Language changed" => "语言改变了",
-"Invalid request" => "非法请求",
-"Admins can't remove themself from the admin group" => "管理员无法将自己从管理组中移除",
-"Unable to add user to group %s" => "未能添加用户到群组 %s",
-"Unable to remove user from group %s" => "未能将用户从群组 %s 移除",
-"Couldn't update app." => "应用无法升级。",
-"Update to {appversion}" => "升级至{appversion}",
-"Disable" => "禁用",
-"Enable" => "启用",
-"Please wait...." => "请稍候……",
-"Updating...." => "升级中……",
-"Error while updating app" => "应用升级时出现错误",
-"Error" => "出错",
-"Update" => "更新",
-"Updated" => "已升级",
-"Saving..." => "保存中...",
-"deleted" => "删除",
-"undo" => "撤销",
-"Unable to remove user" => "无法移除用户",
-"Groups" => "群组",
-"Group Admin" => "群组管理员",
-"Delete" => "删除",
-"add group" => "添加群组",
-"A valid username must be provided" => "请填写有效用户名",
-"Error creating user" => "新增用户时出现错误",
-"A valid password must be provided" => "请填写有效密码",
-"__language_name__" => "Chinese",
-"Security Warning" => "安全警告",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的数据文件夹和您的文件或许能够从互联网访问。ownCloud 提供的 .htaccesss 文件未其作用。我们强烈建议您配置网络服务器以使数据文件夹不能从互联网访问，或将移动数据文件夹移出网络服务器文档根目录。",
-"Setup Warning" => "配置注意",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "因WebDAV接口故障，您的网络服务器好像并未允许文件同步。",
-"Please double check the <a href=\"%s\">installation guides</a>." => "请双击<a href='%s'>安装向导</a>。",
-"Module 'fileinfo' missing" => "模块“fileinfo”丢失。",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP 模块“fileinfo”丢失。我们强烈建议打开此模块来获得 mine 类型检测的最佳结果。",
-"Locale not working" => "区域设置未运作",
-"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "ownCloud 服务器不能把系统区域设置为 %s。这意味着文件名可内可能含有某些引起问题的字符。我们强烈建议在您的系统上安装必要的区域/语言支持包来支持 “%s” 。",
-"Internet connection not working" => "互联网连接未运作",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "服务器没有可用的Internet连接。这意味着像挂载外部储存、版本更新提示和安装第三方插件等功能会失效。远程访问文件和发送邮件提醒也可能会失效。如果您需要这些功能，建议开启服务器的英特网连接。",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "在每个页面载入时执行一项任务",
-"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php 已作为 webcron 服务注册。owncloud 将通过 http 协议每分钟调用一次 cron.php。",
-"Use systems cron service to call the cron.php file once a minute." => "使用系统 cron 服务。通过系统 cronjob 每分钟调用一次 owncloud 文件夹下的 cron.php",
-"Sharing" => "分享",
-"Enable Share API" => "开启分享API",
-"Allow apps to use the Share API" => "允许应用使用分享API",
-"Allow links" => "允许链接",
-"Allow users to share items to the public with links" => "允许用户通过链接共享内容",
-"Allow public uploads" => "允许公众账户上传",
-"Allow users to enable others to upload into their publicly shared folders" => "允许其它人向用户的公众共享文件夹里上传文件",
-"Allow resharing" => "允许转帖",
-"Allow users to share items shared with them again" => "允许用户再次共享已共享的内容",
-"Allow users to share with anyone" => "允许用户向任何人分享",
-"Allow users to only share with users in their groups" => "只允许用户向所在群组中的其他用户分享",
-"Security" => "安全",
-"Enforce HTTPS" => "强制HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "强制客户端通过加密连接与%s连接",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "请通过HTTPS协议连接到 %s，需要启用或者禁止强制SSL的开关。",
-"Log" => "日志",
-"Log level" => "日志等级",
-"More" => "更多",
-"Less" => "更少",
-"Version" => "版本",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社区</a>开发，<a href=\"https://github.com/owncloud\" target=\"_blank\">s源代码</a> 以 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 许可协议发布。",
-"Add your App" => "添加你的应用程序",
-"More Apps" => "更多应用",
-"Select an App" => "选择一个程序",
-"See application page at apps.owncloud.com" => "在owncloud.com上查看应用程序",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>授权协议 <span class=\"author\"></span>",
-"User Documentation" => "用户文档",
-"Administrator Documentation" => "管理员文档",
-"Online Documentation" => "在线说明文档",
-"Forum" => "论坛",
-"Bugtracker" => "Bug追踪者",
-"Commercial Support" => "商业支持",
-"Get the apps to sync your files" => "获取应用并同步您的文件",
-"Show First Run Wizard again" => "再次显示首次运行向导",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "您已使用<strong>%s</strong>/<strong>%s</strong>",
-"Password" => "密码",
-"Your password was changed" => "您的密码以变更",
-"Unable to change your password" => "不能改变你的密码",
-"Current password" => "现在的密码",
-"New password" => "新密码",
-"Change password" => "改变密码",
-"Display Name" => "显示名称",
-"Email" => "电子邮件",
-"Your email address" => "你的email地址",
-"Fill in an email address to enable password recovery" => "输入一个邮箱地址以激活密码恢复功能",
-"Language" => "语言",
-"Help translate" => "帮助翻译",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "访问WebDAV请点击 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">此处</a>",
-"Encryption" => "加密",
-"Login Name" => "登录名",
-"Create" => "新建",
-"Admin Recovery Password" => "管理员恢复密码",
-"Enter the recovery password in order to recover the users files during password change" => "在恢复密码的过程中请输入恢复密钥来恢复用户数据",
-"Default Storage" => "默认容量",
-"Unlimited" => "无限制",
-"Other" => "其他",
-"Username" => "用户名",
-"Storage" => "容量",
-"change display name" => "更改显示名称",
-"set new password" => "设置新的密码",
-"Default" => "默认"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 82dc8774dfc..cc14a3648a8 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
"Disable" => "禁用",
"Enable" => "开启",
"Please wait...." => "请稍等....",
+"Error while disabling app" => "禁用 app 时出错",
+"Error while enabling app" => "启用 app 时出错",
"Updating...." => "正在更新....",
"Error while updating app" => "更新 app 时出错",
"Error" => "错误",
"Update" => "更新",
"Updated" => "已更新",
+"Decrypting files... Please wait, this can take some time." => "正在解密文件... 请稍等，可能需要一些时间。",
"Saving..." => "保存中",
"deleted" => "已经删除",
"undo" => "撤销",
@@ -102,6 +105,9 @@ $TRANSLATIONS = array(
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "使用该链接 <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">通过WebDAV访问你的文件</a>",
"Encryption" => "加密",
+"The encryption app is no longer enabled, decrypt all your file" => "加密 app 未启用，将解密您所有文件",
+"Log-in password" => "登录密码",
+"Decrypt all Files" => "解密所有文件",
"Login Name" => "登录名称",
"Create" => "创建",
"Admin Recovery Password" => "管理恢复密码",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index a11182b5a79..5cd3679751b 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
"Disable" => "停用",
"Enable" => "啟用",
"Please wait...." => "請稍候...",
+"Error while disabling app" => "停用應用程式錯誤",
+"Error while enabling app" => "啓用應用程式錯誤",
"Updating...." => "更新中...",
"Error while updating app" => "更新應用程式錯誤",
"Error" => "錯誤",
"Update" => "更新",
"Updated" => "已更新",
+"Decrypting files... Please wait, this can take some time." => "檔案解密中，請稍候。",
"Saving..." => "儲存中...",
"deleted" => "已刪除",
"undo" => "復原",
@@ -102,6 +105,9 @@ $TRANSLATIONS = array(
"WebDAV" => "WebDAV",
"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "使用<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">這個網址</a>來透過 WebDAV 存取您的檔案",
"Encryption" => "加密",
+"The encryption app is no longer enabled, decrypt all your file" => "加密應用程式已經停用，請您解密您所有的檔案",
+"Log-in password" => "登入密碼",
+"Decrypt all Files" => "解密所有檔案",
"Login Name" => "登入名稱",
"Create" => "建立",
"Admin Recovery Password" => "管理者復原密碼",
diff --git a/settings/personal.php b/settings/personal.php
index e69898f6f8f..112eaa3c748 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -17,7 +17,7 @@ OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
OC_Util::addStyle( '3rdparty', 'chosen' );
OC_App::setActiveNavigationEntry( 'personal' );
-$storageInfo=OC_Helper::getStorageInfo();
+$storageInfo=OC_Helper::getStorageInfo('/');
$email=OC_Preferences::getValue(OC_User::getUser(), 'settings', 'email', '');
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index bad88142da9..63e1258b958 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -40,7 +40,7 @@ if($_['passwordChangeSupported']) {
<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
- <input type="password" id="pass2" name="password"
+ <input type="password" id="pass2" name="personal-password"
placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#personal-show" />
<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-23 11:59:55 +0000