summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2013-06-10 12:12:07 +0200
committerBjörn Schießle <schiessle@owncloud.com>2013-06-10 12:12:07 +0200
commit13017ce9e114d84ba9b4ced240e5648447fdfe45 (patch)
tree5a4ae7b311319a239d9c6792cefc879b5558d1cc /settings
parentb25ab94a08ab9ba5e322043ac470d5352d456c71 (diff)
parentdb06b906e50d7d1b7eca28f51db913af1fbc81f1 (diff)
downloadnextcloud-server-13017ce9e114d84ba9b4ced240e5648447fdfe45.tar.gz
nextcloud-server-13017ce9e114d84ba9b4ced240e5648447fdfe45.zip
Merge branch 'master' into files_encryption_check_private_key
Conflicts: settings/ajax/changepassword.php
Diffstat (limited to 'settings')
-rwxr-xr-xsettings/admin.php2
-rw-r--r--settings/ajax/changepassword.php30
-rw-r--r--settings/l10n/bg_BG.php1
-rw-r--r--settings/l10n/cs_CZ.php1
-rw-r--r--settings/l10n/de.php1
-rw-r--r--settings/l10n/fr.php1
-rw-r--r--settings/l10n/he.php47
-rw-r--r--settings/l10n/hu_HU.php4
-rw-r--r--settings/l10n/is.php5
-rw-r--r--settings/l10n/lt_LT.php1
-rw-r--r--settings/l10n/nl.php12
-rw-r--r--settings/l10n/ru.php1
-rw-r--r--settings/l10n/sv.php21
-rw-r--r--settings/l10n/tr.php1
-rw-r--r--settings/l10n/zh_CN.GB2312.php4
-rw-r--r--settings/l10n/zh_CN.php1
-rw-r--r--settings/templates/users.php6
17 files changed, 114 insertions, 25 deletions
diff --git a/settings/admin.php b/settings/admin.php
index 035cef5bf95..db041ef889c 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -24,7 +24,7 @@ $tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 ));
$tmpl->assign('entries', $entries);
$tmpl->assign('entriesremain', $entriesremain);
$tmpl->assign('htaccessworking', $htaccessworking);
-$tmpl->assign('internetconnectionworking', OC_Util::isinternetconnectionworking());
+$tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false);
$tmpl->assign('islocaleworking', OC_Util::issetlocaleworking());
$tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
$tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index e8adb8c959f..d409904ebc7 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -27,24 +27,38 @@ if (is_null($userstatus)) {
OC_JSON::error(array('data' => array('message' => 'Authentication error')));
exit();
}
+
if (\OCP\App::isEnabled('files_encryption') && $userstatus !== 'user') {
+ //handle the recovery case
$util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $username);
$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
- $recoveryEnabledForUser = $util->recoveryEnabledForUser();
- if ($recoveryAdminEnabled && $recoveryEnabledForUser && $recoveryPassword === '') {
+ $validRecoveryPassword = false;
+ $recoveryPasswordSupported = false;
+ if ($recoveryAdminEnabled) {
+ $validRecoveryPassword = $util->checkRecoveryPassword($recoveryPassword);
+ $recoveryEnabledForUser = $util->recoveryEnabledForUser();
+ }
+
+ if ($recoveryEnabledForUser && $recoveryPassword === '') {
OC_JSON::error(array('data' => array('message' => 'Please provide a admin recovery password, otherwise all user data will be lost')));
- } elseif ($recoveryPassword && !$util->checkRecoveryPassword($recoveryPassword)) {
+ } elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) {
OC_JSON::error(array('data' => array('message' => 'Wrong admin recovery password. Please check the password and try again.')));
- } elseif (!is_null($password) && OC_User::setPassword($username, $password, $recoveryPassword)) {
- OC_JSON::success(array('data' => array('username' => $username)));
+ } else { // now we know that everything is fine regarding the recovery password, let's try to change the password
+ $result = OC_User::setPassword($username, $password, $recoveryPassword);
+ if (!$result && $recoveryPasswordSupported) {
+ OC_JSON::error(array("data" => array( "message" => "Back-end doesn't support password change, but the users encryption key was successfully updated." )));
+ } elseif (!$result && !$recoveryPasswordSupported) {
+ OC_JSON::error(array("data" => array( "message" => "Unable to change password" )));
} else {
- OC_JSON::error(array('data' => array('message' => 'Unable to change password')));
+ OC_JSON::success(array("data" => array( "username" => $username )));
+ }
+
}
-} else {
+} else { // if user changes his own password or if encryption is disabled, proceed
if (!is_null($password) && OC_User::setPassword($username, $password)) {
OC_JSON::success(array('data' => array('username' => $username)));
} else {
OC_JSON::error(array('data' => array('message' => 'Unable to change password')));
}
-} \ No newline at end of file
+}
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index e5cc8bde398..d20e64f2e0b 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -22,6 +22,7 @@
"Delete" => "Изтриване",
"add group" => "нова група",
"__language_name__" => "__language_name__",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Вашият web сървър все още не е удачно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.",
"Please double check the <a href='%s'>installation guides</a>." => "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>.",
"Cron" => "Крон",
"Sharing" => "Споделяне",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 6fec132701b..fdd38e7bb2a 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Použijte tuto adresu pro připojení k vašemu ownCloud skrze správce souborů",
"Login Name" => "Přihlašovací jméno",
"Create" => "Vytvořit",
+"Admin Recovery Password" => "Heslo obnovy správce",
"Default Storage" => "Výchozí úložiště",
"Unlimited" => "Neomezeně",
"Other" => "Jiný",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 2cf828e7342..928130f398e 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden",
"Login Name" => "Loginname",
"Create" => "Anlegen",
+"Admin Recovery Password" => "Admin-Wiederherstellungspasswort",
"Default Storage" => "Standard-Speicher",
"Unlimited" => "Unbegrenzt",
"Other" => "Andere",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 0067236bad1..2067fbc4c5d 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Utiliser cette adresse pour vous connecter à ownCloud dans votre gestionnaire de fichiers",
"Login Name" => "Nom de la connexion",
"Create" => "Créer",
+"Admin Recovery Password" => "Récupération du mot de passe administrateur",
"Default Storage" => "Support de stockage par défaut",
"Unlimited" => "Illimité",
"Other" => "Autre",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 5aeba49dcf7..77c6d37fbbe 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -1,6 +1,8 @@
<?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" => "לא ניתן להוסיף קבוצה",
"Could not enable app. " => "לא ניתן להפעיל את היישום",
@@ -13,18 +15,49 @@
"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...." => "נא להמתין…",
"Error" => "שגיאה",
+"Updating...." => "מתבצע עדכון…",
+"Error while updating app" => "אירעה שגיאה בעת עדכון היישום",
+"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__" => "עברית",
"Security Warning" => "אזהרת אבטחה",
"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "יתכן שתיקיית הנתונים והקבצים שלך נגישים דרך האינטרנט. קובץ ה־‎.htaccess שמסופק על ידי ownCloud כנראה אינו עובד. אנו ממליצים בחום להגדיר את שרת האינטרנט שלך בדרך שבה תיקיית הנתונים לא תהיה זמינה עוד או להעביר את תיקיית הנתונים מחוץ לספריית העל של שרת האינטרנט.",
+"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“ חסר",
+"Internet connection not working" => "החיבור לאינטרנט אינו פעיל",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "יש להפעיל משימה אחת עם כל עמוד שנטען",
+"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 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",
"Log" => "יומן",
+"Log level" => "רמת הדיווח",
"More" => "יותר",
"Less" => "פחות",
"Version" => "גרסא",
@@ -39,21 +72,33 @@
"Administrator Documentation" => "תיעוד מנהלים",
"Online Documentation" => "תיעוד מקוון",
"Forum" => "פורום",
+"Bugtracker" => "עוקב תקלות",
"Commercial Support" => "תמיכה בתשלום",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך",
"Get the apps to sync your files" => "השג את האפליקציות על מנת לסנכרן את הקבצים שלך",
+"Show First Run Wizard again" => "הצגת אשף ההפעלה הראשונית שוב",
"Password" => "סיסמא",
"Your password was changed" => "הססמה שלך הוחלפה",
"Unable to change your password" => "לא ניתן לשנות את הססמה שלך",
"Current password" => "ססמה נוכחית",
"New password" => "ססמה חדשה",
"Change password" => "שינוי ססמה",
+"Display Name" => "שם תצוגה",
"Email" => "דואר אלקטרוני",
"Your email address" => "כתובת הדוא״ל שלך",
"Fill in an email address to enable password recovery" => "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה",
"Language" => "פה",
"Help translate" => "עזרה בתרגום",
+"WebDAV" => "WebDAV",
"Use this address to connect to your ownCloud in your file manager" => "השתמש בכתובת זאת על מנת להתחבר אל ownCloud דרך סייר קבצים.",
+"Login Name" => "שם כניסה",
"Create" => "יצירה",
-"Other" => "אחר"
+"Admin Recovery Password" => "ססמת השחזור של המנהל",
+"Default Storage" => "אחסון בררת המחדל",
+"Unlimited" => "ללא הגבלה",
+"Other" => "אחר",
+"Storage" => "אחסון",
+"change display name" => "החלפת שם התצוגה",
+"set new password" => "הגדרת ססמה חדשה",
+"Default" => "בררת מחדל"
);
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 70cbf3d1365..550796c3c79 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -37,12 +37,12 @@
"A valid password must be provided" => "Érvényes jelszót kell megadnia",
"__language_name__" => "__language_name__",
"Security Warning" => "Biztonsági figyelmeztetés",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "Az adatkönytára és az itt levő fájlok valószínűleg elérhetők az internetről. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon fontos, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár nem legyen közvetlenül kívülről elérhető, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kívülre.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides 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." => "Az adatkönytára és az itt levő fájlok valószínűleg elérhetők az internetről. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon fontos, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár ne legyen közvetlenül kívülről elérhető, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kívülre.",
"Setup Warning" => "A beállítással kapcsolatos figyelmeztetés",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.",
"Please double check the <a href='%s'>installation guides</a>." => "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
"Module 'fileinfo' missing" => "A 'fileinfo' modul hiányzik",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak az telepítése, ha az ember jó eredményt szeretne a MIME-típusok felismerésében.",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak a telepítése a MIME-típusok felismerésének eredményessé tételéhez.",
"Locale not working" => "A nyelvi lokalizáció nem működik",
"This ownCloud server can't set system locale 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." => "Ezen az ownCloud kiszolgálón nem használható a %s nyelvi beállítás. Ez azt jelenti, hogy a fájlnevekben gond lehet bizonyos karakterekkel. Nyomatékosan ajánlott, hogy telepítse a szükséges csomagokat annak érdekében, hogy a rendszer támogassa a %s beállítást.",
"Internet connection not working" => "Az internet kapcsolat nem működik",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index b3172855c14..e8f64966ce7 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -15,8 +15,12 @@
"Unable to remove user from group %s" => "Ekki tókst að fjarlægja notanda úr hópnum %s",
"Disable" => "Gera óvirkt",
"Enable" => "Virkja",
+"Please wait...." => "Andartak....",
"Error" => "Villa",
+"Updating...." => "Uppfæri...",
+"Updated" => "Uppfært",
"Saving..." => "Er að vista ...",
+"deleted" => "eytt",
"undo" => "afturkalla",
"Groups" => "Hópar",
"Group Admin" => "Hópstjóri",
@@ -47,6 +51,7 @@
"Current password" => "Núverandi lykilorð",
"New password" => "Nýtt lykilorð",
"Change password" => "Breyta lykilorði",
+"Display Name" => "Vísa nafn",
"Email" => "Netfang",
"Your email address" => "Netfangið þitt",
"Fill in an email address to enable password recovery" => "Sláðu inn netfangið þitt til að virkja endurheimt á lykilorði",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index dba1f92017e..225185686d0 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -27,6 +27,7 @@
"Select an App" => "Pasirinkite programą",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>",
"Update" => "Atnaujinti",
+"Get the apps to sync your files" => "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus",
"Password" => "Slaptažodis",
"Your password was changed" => "Jūsų slaptažodis buvo pakeistas",
"Unable to change your password" => "Neįmanoma pakeisti slaptažodžio",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 00de9e8b49a..bab1babd938 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -82,8 +82,8 @@
"Forum" => "Forum",
"Bugtracker" => "Bugtracker",
"Commercial Support" => "Commerciële ondersteuning",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "U heeft <strong>%s</strong> van de <strong>%s</strong> beschikbaren gebruikt",
-"Get the apps to sync your files" => "Download de apps om bestanden te synchen",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>",
+"Get the apps to sync your files" => "Download de apps om bestanden te syncen",
"Show First Run Wizard again" => "Toon de Eerste start Wizard opnieuw",
"Password" => "Wachtwoord",
"Your password was changed" => "Je wachtwoord is veranderd",
@@ -94,7 +94,7 @@
"Display Name" => "Weergavenaam",
"Email" => "E-mailadres",
"Your email address" => "Uw e-mailadres",
-"Fill in an email address to enable password recovery" => "Vul een e-mailadres in om wachtwoord reset uit te kunnen voeren",
+"Fill in an email address to enable password recovery" => "Vul een mailadres in om je wachtwoord te kunnen herstellen",
"Language" => "Taal",
"Help translate" => "Help met vertalen",
"WebDAV" => "WebDAV",
@@ -102,11 +102,11 @@
"Login Name" => "Inlognaam",
"Create" => "Creëer",
"Admin Recovery Password" => "Beheer herstel wachtwoord",
-"Default Storage" => "Default opslag",
+"Default Storage" => "Standaard Opslaglimiet",
"Unlimited" => "Ongelimiteerd",
"Other" => "Anders",
-"Storage" => "Opslag",
+"Storage" => "Opslaglimiet",
"change display name" => "wijzig weergavenaam",
"set new password" => "Instellen nieuw wachtwoord",
-"Default" => "Default"
+"Default" => "Standaard"
);
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index e10e022e8e5..1531f6a361f 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Используйте этот URL для подключения файлового менеджера к Вашему хранилищу",
"Login Name" => "Имя пользователя",
"Create" => "Создать",
+"Admin Recovery Password" => "Восстановление Пароля Администратора",
"Default Storage" => "Хранилище по-умолчанию",
"Unlimited" => "Неограниченно",
"Other" => "Другое",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index db4f63d2219..dca9692999b 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,6 +1,7 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Kan inte ladda listan från App Store",
"Authentication error" => "Fel vid autentisering",
+"Your display name has been changed." => "Ditt visningsnamn har ändrats.",
"Unable to change display name" => "Kan inte ändra visningsnamn",
"Group already exists" => "Gruppen finns redan",
"Unable to add group" => "Kan inte lägga till grupp",
@@ -15,7 +16,7 @@
"Unable to add user to group %s" => "Kan inte lägga till användare i gruppen %s",
"Unable to remove user from group %s" => "Kan inte radera användare från gruppen %s",
"Couldn't update app." => "Kunde inte uppdatera appen",
-"Update to {appversion}" => "Uppdaterar till {appversion}",
+"Update to {appversion}" => "Uppdatera till {appversion}",
"Disable" => "Deaktivera",
"Enable" => "Aktivera",
"Please wait...." => "Var god vänta...",
@@ -42,6 +43,10 @@
"Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
"Module 'fileinfo' missing" => "Modulen \"fileinfo\" saknas",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ.",
+"Locale not working" => "Locale fungerar inte",
+"This ownCloud server can't set system locale 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." => "Denna ownCloud server kan inte sätta system locale till %s. Det innebär att det kan vara problem med vissa tecken i filnamnet. Vi vill verkligen rekommendera att du installerar nödvändiga paket på ditt system för att stödja %s.",
+"Internet connection not working" => "Internetförbindelsen fungerar inte",
+"This ownCloud 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 of ownCloud." => "Den här ownCloudservern har ingen fungerande internetförbindelse. Det innebär att några funktioner som t.ex. att montera externa lagringsplatser, meddelanden om uppdateringar eller installation av tredjepartsappar inte fungerar. Det kan vara så att det inte går att få fjärråtkomst till filer och att e-post inte fungerar. Vi rekommenderar att du tillåter internetåtkomst för den här servern om du vill ha tillgång till alla funktioner hos ownCloud",
"Cron" => "Cron",
"Execute one task with each page loaded" => "Exekvera en uppgift vid varje sidladdning",
"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php är registrerad som en webcron-tjänst. Anropa cron.php sidan i ownCloud en gång i minuten över HTTP.",
@@ -56,12 +61,15 @@
"Allow users to share with anyone" => "Tillåt delning med alla",
"Allow users to only share with users in their groups" => "Tillåt bara delning med användare i egna grupper",
"Security" => "Säkerhet",
+"Enforce HTTPS" => "Kräv HTTPS",
+"Enforces the clients to connect to ownCloud via an encrypted connection." => "Tvingar klienter att ansluta till ownCloud via en krypterad förbindelse.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Vänligen anslut till denna instans av ownCloud via HTTPS för att aktivera/avaktivera SSL",
"Log" => "Logg",
"Log level" => "Nivå på loggning",
"More" => "Mer",
"Less" => "Mindre",
"Version" => "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>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"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>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Community</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <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" => "Lägg till din applikation",
"More Apps" => "Fler Appar",
"Select an App" => "Välj en App",
@@ -69,13 +77,13 @@
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>",
"Update" => "Uppdatera",
"User Documentation" => "Användardokumentation",
-"Administrator Documentation" => "Administratördokumentation",
+"Administrator Documentation" => "Administratörsdokumentation",
"Online Documentation" => "Onlinedokumentation",
"Forum" => "Forum",
"Bugtracker" => "Bugtracker",
"Commercial Support" => "Kommersiell support",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>",
-"Get the apps to sync your files" => "Skaffa appar för att synkronisera dina filer",
+"Get the apps to sync your files" => "Skaffa apparna för att synkronisera dina filer",
"Show First Run Wizard again" => "Visa Första uppstarts-guiden igen",
"Password" => "Lösenord",
"Your password was changed" => "Ditt lösenord har ändrats",
@@ -83,7 +91,7 @@
"Current password" => "Nuvarande lösenord",
"New password" => "Nytt lösenord",
"Change password" => "Ändra lösenord",
-"Display Name" => "Visat namn",
+"Display Name" => "Visningsnamn",
"Email" => "E-post",
"Your email address" => "Din e-postadress",
"Fill in an email address to enable password recovery" => "Fyll i en e-postadress för att aktivera återställning av lösenord",
@@ -93,11 +101,12 @@
"Use this address to connect to your ownCloud in your file manager" => "Använd denna adress för att ansluta till ownCloud i din filhanterare",
"Login Name" => "Inloggningsnamn",
"Create" => "Skapa",
+"Admin Recovery Password" => "Admin återställningslösenord",
"Default Storage" => "Förvald lagring",
"Unlimited" => "Obegränsad",
"Other" => "Annat",
"Storage" => "Lagring",
-"change display name" => "ändra visat namn",
+"change display name" => "ändra visningsnamn",
"set new password" => "ange nytt lösenord",
"Default" => "Förvald"
);
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 0a803d64ec0..e694b627afd 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "Bu adresi kullanarak ownCloud 'unuza dosya yöneticinizde bağlanın",
"Login Name" => "Giriş Adı",
"Create" => "Oluştur",
+"Admin Recovery Password" => "Yönetici kurtarma parolası",
"Default Storage" => "Varsayılan Depolama",
"Unlimited" => "Limitsiz",
"Other" => "Diğer",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index e2f59e72d0f..6e88d71fe44 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -1,6 +1,7 @@
<?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" => "未能添加群组",
@@ -40,7 +41,10 @@
"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" => "区域设置未运作",
+"This ownCloud server can't set system locale 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" => "互联网连接未运作",
"Cron" => "Cron",
"Execute one task with each page loaded" => "在每个页面载入时执行一项任务",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 1ec0b004c60..bb2553e4c67 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -101,6 +101,7 @@
"Use this address to connect to your ownCloud in your file manager" => "用该地址来连接文件管理器中的 ownCloud",
"Login Name" => "登录名称",
"Create" => "创建",
+"Admin Recovery Password" => "管理恢复密码",
"Default Storage" => "默认存储",
"Unlimited" => "无限",
"Other" => "其它",
diff --git a/settings/templates/users.php b/settings/templates/users.php
index a6df85983dd..b0637814f5d 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -31,7 +31,11 @@ $_['subadmingroups'] = array_flip($items);
</form>
<?php if((bool)$_['recoveryAdminEnabled']): ?>
<div class="recoveryPassword">
- <input id="recoveryPassword" type="password" placeholder="<?php p($l->t('Admin Recovery Password'))?>" />
+ <input id="recoveryPassword"
+ type="password"
+ placeholder="<?php p($l->t('Admin Recovery Password'))?>"
+ title="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"
+ alt="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"/>
</div>
<?php endif; ?>
<div class="quota">