summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
Diffstat (limited to 'settings')
-rwxr-xr-xsettings/admin.php18
-rw-r--r--settings/admin/controller.php4
-rw-r--r--settings/ajax/addRootCertificate.php32
-rw-r--r--settings/ajax/apps/ocs.php2
-rw-r--r--settings/ajax/changedisplayname.php2
-rw-r--r--settings/ajax/creategroup.php2
-rw-r--r--settings/ajax/decryptall.php2
-rw-r--r--settings/ajax/deletekeys.php2
-rw-r--r--settings/ajax/excludegroups.php2
-rw-r--r--settings/ajax/geteveryonecount.php49
-rw-r--r--settings/ajax/installapp.php2
-rw-r--r--settings/ajax/lostpassword.php2
-rw-r--r--settings/ajax/removeRootCertificate.php7
-rw-r--r--settings/ajax/removeuser.php4
-rw-r--r--settings/ajax/restorekeys.php2
-rw-r--r--settings/ajax/setlanguage.php2
-rw-r--r--settings/ajax/setquota.php2
-rw-r--r--settings/ajax/setsecurity.php12
-rw-r--r--settings/ajax/togglegroups.php6
-rw-r--r--settings/ajax/uninstallapp.php2
-rw-r--r--settings/ajax/updateapp.php5
-rw-r--r--settings/ajax/userlist.php6
-rw-r--r--settings/changepassword/controller.php6
-rw-r--r--settings/css/settings.css20
-rw-r--r--settings/js/admin.js18
-rw-r--r--settings/js/personal.js214
-rw-r--r--settings/js/users/deleteHandler.js47
-rw-r--r--settings/js/users/groups.js35
-rw-r--r--settings/js/users/users.js110
-rw-r--r--settings/l10n/ar.php17
-rw-r--r--settings/l10n/ast.php4
-rw-r--r--settings/l10n/az.php113
-rw-r--r--settings/l10n/bg_BG.php17
-rw-r--r--settings/l10n/bn_BD.php13
-rw-r--r--settings/l10n/bn_IN.php1
-rw-r--r--settings/l10n/ca.php4
-rw-r--r--settings/l10n/cs_CZ.php33
-rw-r--r--settings/l10n/cy_GB.php2
-rw-r--r--settings/l10n/da.php17
-rw-r--r--settings/l10n/de.php17
-rw-r--r--settings/l10n/de_AT.php2
-rw-r--r--settings/l10n/de_CH.php5
-rw-r--r--settings/l10n/de_DE.php45
-rw-r--r--settings/l10n/el.php11
-rw-r--r--settings/l10n/en_GB.php17
-rw-r--r--settings/l10n/eo.php4
-rw-r--r--settings/l10n/es.php19
-rw-r--r--settings/l10n/es_AR.php4
-rw-r--r--settings/l10n/es_MX.php4
-rw-r--r--settings/l10n/et_EE.php17
-rw-r--r--settings/l10n/eu.php10
-rw-r--r--settings/l10n/fa.php9
-rw-r--r--settings/l10n/fi_FI.php15
-rw-r--r--settings/l10n/fr.php10
-rw-r--r--settings/l10n/gl.php40
-rw-r--r--settings/l10n/he.php5
-rw-r--r--settings/l10n/hi.php2
-rw-r--r--settings/l10n/hr.php255
-rw-r--r--settings/l10n/hu_HU.php157
-rw-r--r--settings/l10n/ia.php2
-rw-r--r--settings/l10n/id.php4
-rw-r--r--settings/l10n/is.php4
-rw-r--r--settings/l10n/it.php17
-rw-r--r--settings/l10n/ja.php41
-rw-r--r--settings/l10n/ja_JP.php187
-rw-r--r--settings/l10n/ka.php5
-rw-r--r--settings/l10n/ka_GE.php4
-rw-r--r--settings/l10n/km.php2
-rw-r--r--settings/l10n/ko.php4
-rw-r--r--settings/l10n/lb.php2
-rw-r--r--settings/l10n/lt_LT.php4
-rw-r--r--settings/l10n/lv.php4
-rw-r--r--settings/l10n/mk.php4
-rw-r--r--settings/l10n/ms_MY.php2
-rw-r--r--settings/l10n/nb_NO.php10
-rw-r--r--settings/l10n/nl.php29
-rw-r--r--settings/l10n/nn_NO.php4
-rw-r--r--settings/l10n/oc.php2
-rw-r--r--settings/l10n/pa.php2
-rw-r--r--settings/l10n/pl.php10
-rw-r--r--settings/l10n/pt_BR.php17
-rw-r--r--settings/l10n/pt_PT.php10
-rw-r--r--settings/l10n/ro.php4
-rw-r--r--settings/l10n/ru.php9
-rw-r--r--settings/l10n/si_LK.php4
-rw-r--r--settings/l10n/sk_SK.php9
-rw-r--r--settings/l10n/sl.php11
-rw-r--r--settings/l10n/sq.php2
-rw-r--r--settings/l10n/sr.php2
-rw-r--r--settings/l10n/sr@latin.php7
-rw-r--r--settings/l10n/sv.php4
-rw-r--r--settings/l10n/ta_LK.php4
-rw-r--r--settings/l10n/th_TH.php4
-rw-r--r--settings/l10n/tr.php17
-rw-r--r--settings/l10n/ug.php2
-rw-r--r--settings/l10n/uk.php4
-rw-r--r--settings/l10n/ur.php5
-rw-r--r--settings/l10n/vi.php4
-rw-r--r--settings/l10n/zh_CN.php4
-rw-r--r--settings/l10n/zh_HK.php2
-rw-r--r--settings/l10n/zh_TW.php4
-rw-r--r--settings/personal.php4
-rw-r--r--settings/routes.php6
-rw-r--r--settings/templates/admin.php47
-rw-r--r--settings/templates/personal.php51
-rw-r--r--settings/templates/users/main.php18
-rw-r--r--settings/templates/users/part.createuser.php2
-rw-r--r--settings/templates/users/part.grouplist.php6
-rw-r--r--settings/templates/users/part.setquota.php65
-rw-r--r--settings/tests/js/users/deleteHandlerSpec.js185
-rw-r--r--settings/users.php35
111 files changed, 1723 insertions, 654 deletions
diff --git a/settings/admin.php b/settings/admin.php
index dd5f969fa1a..65deed6b883 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -19,6 +19,7 @@ $htaccessworking=OC_Util::isHtaccessWorking();
$entries=OC_Log_Owncloud::getEntries(3);
$entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 3;
+$config = \OC::$server->getConfig();
// Should we display sendmail as an option?
$tmpl->assign('sendmail_is_available', (bool) findBinaryPath('sendmail'));
@@ -37,8 +38,9 @@ $tmpl->assign('mail_smtppassword', OC_Config::getValue( "mail_smtppassword", ''
$tmpl->assign('entries', $entries);
$tmpl->assign('entriesremain', $entriesremain);
$tmpl->assign('htaccessworking', $htaccessworking);
-$tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false);
+$tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : 'disabled');
$tmpl->assign('isLocaleWorking', OC_Util::isSetLocaleWorking());
+$tmpl->assign('isPhpCharSetUtf8', OC_Util::isPhpCharSetUtf8());
$tmpl->assign('isAnnotationsWorking', OC_Util::isAnnotationsWorking());
$tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
$tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
@@ -70,14 +72,16 @@ $tmpl->assign('groups', $groups);
// Check if connected using HTTPS
-if (OC_Request::serverProtocol() === 'https') {
- $connectedHTTPS = true;
-} else {
- $connectedHTTPS = false;
-}
-$tmpl->assign('isConnectedViaHTTPS', $connectedHTTPS);
+$tmpl->assign('isConnectedViaHTTPS', OC_Request::serverProtocol() === 'https');
$tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false));
+// If the current webroot is non-empty but the webroot from the config is,
+// and system cron is used, the URL generator fails to build valid URLs.
+$shouldSuggestOverwriteWebroot = $config->getAppValue('core', 'backgroundjobs_mode', 'ajax') === 'cron' &&
+ \OC::$WEBROOT && \OC::$WEBROOT !== '/' &&
+ !$config->getSystemValue('overwritewebroot', '');
+$tmpl->assign('suggestedOverwriteWebroot', ($shouldSuggestOverwriteWebroot) ? \OC::$WEBROOT : '');
+
$tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
$tmpl->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired());
$tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'));
diff --git a/settings/admin/controller.php b/settings/admin/controller.php
index 7ced57791e9..395bc7c6e49 100644
--- a/settings/admin/controller.php
+++ b/settings/admin/controller.php
@@ -27,7 +27,7 @@ class Controller {
\OC_Util::checkAdminUser();
\OCP\JSON::callCheck();
- $l = \OC_L10N::get('settings');
+ $l = \OC::$server->getL10N('settings');
$smtp_settings = array(
'mail_domain' => null,
@@ -80,7 +80,7 @@ class Controller {
\OC_Util::checkAdminUser();
\OCP\JSON::callCheck();
- $l = \OC_L10N::get('settings');
+ $l = \OC::$server->getL10N('settings');
$email = \OC_Preferences::getValue(\OC_User::getUser(), 'settings', 'email', '');
if (!empty($email)) {
$defaults = new \OC_Defaults();
diff --git a/settings/ajax/addRootCertificate.php b/settings/ajax/addRootCertificate.php
new file mode 100644
index 00000000000..378ef39c1e5
--- /dev/null
+++ b/settings/ajax/addRootCertificate.php
@@ -0,0 +1,32 @@
+<?php
+OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+
+$l = new OC_L10N('core');
+
+if (!isset($_FILES['rootcert_import'])) {
+ OCP\JSON::error(array('error' => 'No certificate uploaded'));
+ exit;
+}
+
+$data = file_get_contents($_FILES['rootcert_import']['tmp_name']);
+$filename = basename($_FILES['rootcert_import']['name']);
+
+$certificateManager = \OC::$server->getCertificateManager();
+
+try {
+ $cert = $certificateManager->addCertificate($data, $filename);
+ OCP\JSON::success(array(
+ 'name' => $cert->getName(),
+ 'commonName' => $cert->getCommonName(),
+ 'organization' => $cert->getOrganization(),
+ 'validFrom' => $cert->getIssueDate()->getTimestamp(),
+ 'validTill' => $cert->getExpireDate()->getTimestamp(),
+ 'validFromString' => $l->l('date', $cert->getIssueDate()),
+ 'validTillString' => $l->l('date', $cert->getExpireDate()),
+ 'issuer' => $cert->getIssuerName(),
+ 'issuerOrganization' => $cert->getIssuerOrganization()
+ ));
+} catch(\Exception $e) {
+ OCP\JSON::error(array('error' => 'Couldn\'t import SSL root certificate, allowed formats: PEM and DER'));
+}
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index b68083fca6b..aad0690e01c 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -8,7 +8,7 @@
OC_JSON::checkAdminUser();
-$l = OC_L10N::get('settings');
+$l = \OC::$server->getL10N('settings');
if(OC_Config::getValue('appstoreenabled', true)==false) {
OCP\JSON::success(array('type' => 'external', 'data' => array()));
diff --git a/settings/ajax/changedisplayname.php b/settings/ajax/changedisplayname.php
index 54c8c05dd4b..1e52182ccf6 100644
--- a/settings/ajax/changedisplayname.php
+++ b/settings/ajax/changedisplayname.php
@@ -4,7 +4,7 @@
OCP\JSON::callCheck();
OC_JSON::checkLoggedIn();
-$l=OC_L10N::get('settings');
+$l = \OC::$server->getL10N('settings');
$username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
$displayName = $_POST["displayName"];
diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index 854f2c37189..be376bea9dc 100644
--- a/settings/ajax/creategroup.php
+++ b/settings/ajax/creategroup.php
@@ -4,7 +4,7 @@ OCP\JSON::callCheck();
OC_JSON::checkAdminUser();
$groupname = $_POST["groupname"];
-$l = OC_L10N::get('settings');
+$l = \OC::$server->getL10N('settings');
// Does the group exist?
if( in_array( $groupname, OC_Group::getGroups())) {
diff --git a/settings/ajax/decryptall.php b/settings/ajax/decryptall.php
index 55685f778d1..527e5b8fcee 100644
--- a/settings/ajax/decryptall.php
+++ b/settings/ajax/decryptall.php
@@ -12,7 +12,7 @@ $params = array('uid' => \OCP\User::getUser(),
$view = new OC\Files\View('/');
$util = new \OCA\Encryption\Util($view, \OCP\User::getUser());
-$l = \OC_L10N::get('settings');
+$l = \OC::$server->getL10N('settings');
$result = $util->initEncryption($params);
diff --git a/settings/ajax/deletekeys.php b/settings/ajax/deletekeys.php
index 1f84452e117..86a45820af9 100644
--- a/settings/ajax/deletekeys.php
+++ b/settings/ajax/deletekeys.php
@@ -3,7 +3,7 @@
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
-$l = \OC_L10N::get('settings');
+$l = \OC::$server->getL10N('settings');
$user = \OC_User::getUser();
$view = new \OC\Files\View('/' . $user . '/files_encryption');
diff --git a/settings/ajax/excludegroups.php b/settings/ajax/excludegroups.php
index 2934a448a6a..c3488c5bae7 100644
--- a/settings/ajax/excludegroups.php
+++ b/settings/ajax/excludegroups.php
@@ -1,5 +1,5 @@
<?php
-OC_JSON::checkSubAdminUser();
+OC_JSON::checkAdminUser();
OCP\JSON::callCheck();
$selectedGroups = isset($_POST["selectedGroups"]) ? json_decode($_POST["selectedGroups"]) : array();
diff --git a/settings/ajax/geteveryonecount.php b/settings/ajax/geteveryonecount.php
new file mode 100644
index 00000000000..54fbd6e2fbd
--- /dev/null
+++ b/settings/ajax/geteveryonecount.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Clark Tomlinson
+ * @copyright 2014 Clark Tomlinson <clark@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+OC_JSON::callCheck();
+OC_JSON::checkSubAdminUser();
+
+$userCount = 0;
+
+$currentUser = \OC::$server->getUserSession()->getLoginName();
+
+if (!OC_User::isAdminUser($currentUser)) {
+ $groups = OC_SubAdmin::getSubAdminsGroups($currentUser);
+
+ foreach ($groups as $group) {
+ $userCount += count(OC_Group::usersInGroup($group));
+
+ }
+} else {
+
+ $userCountArray = \OC::$server->getUserManager()->countUsers();
+
+ if (!empty($userCountArray)) {
+ foreach ($userCountArray as $classname => $usercount) {
+ $userCount += $usercount;
+ }
+ }
+}
+
+
+OC_JSON::success(array('count' => $userCount));
diff --git a/settings/ajax/installapp.php b/settings/ajax/installapp.php
index 47f40f2b0cd..80bc1819724 100644
--- a/settings/ajax/installapp.php
+++ b/settings/ajax/installapp.php
@@ -14,6 +14,6 @@ $result = OC_App::installApp($appId);
if($result !== false) {
OC_JSON::success(array('data' => array('appid' => $appId)));
} else {
- $l = OC_L10N::get('settings');
+ $l = \OC::$server->getL10N('settings');
OC_JSON::error(array("data" => array( "message" => $l->t("Couldn't remove app.") )));
}
diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php
index 15b6cbc0122..395ba31f92b 100644
--- a/settings/ajax/lostpassword.php
+++ b/settings/ajax/lostpassword.php
@@ -3,7 +3,7 @@
OC_JSON::checkLoggedIn();
OCP\JSON::callCheck();
-$l=OC_L10N::get('settings');
+$l = \OC::$server->getL10N('settings');
// Get data
if( isset( $_POST['email'] ) && OC_Mail::validateAddress($_POST['email']) ) {
diff --git a/settings/ajax/removeRootCertificate.php b/settings/ajax/removeRootCertificate.php
new file mode 100644
index 00000000000..a3de035269e
--- /dev/null
+++ b/settings/ajax/removeRootCertificate.php
@@ -0,0 +1,7 @@
+<?php
+OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+
+$name = $_POST['cert'];
+$certificateManager = \OC::$server->getCertificateManager();
+$certificateManager->removeCertificate($name);
diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index 8732c6518a8..eda85238780 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -11,7 +11,7 @@ if(OC_User::getUser() === $username) {
}
if(!OC_User::isAdminUser(OC_User::getUser()) && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
- $l = OC_L10N::get('core');
+ $l = \OC::$server->getL10N('core');
OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
exit();
}
@@ -21,6 +21,6 @@ if( OC_User::deleteUser( $username )) {
OC_JSON::success(array("data" => array( "username" => $username )));
}
else{
- $l = OC_L10N::get('core');
+ $l = \OC::$server->getL10N('core');
OC_JSON::error(array("data" => array( "message" => $l->t("Unable to delete user") )));
}
diff --git a/settings/ajax/restorekeys.php b/settings/ajax/restorekeys.php
index 68e19c90457..5c263fadab4 100644
--- a/settings/ajax/restorekeys.php
+++ b/settings/ajax/restorekeys.php
@@ -3,7 +3,7 @@
OCP\JSON::checkLoggedIn();
OCP\JSON::callCheck();
-$l = \OC_L10N::get('settings');
+$l = \OC::$server->getL10N('settings');
$user = \OC_User::getUser();
$view = new \OC\Files\View('/' . $user . '/files_encryption');
diff --git a/settings/ajax/setlanguage.php b/settings/ajax/setlanguage.php
index 94773f3dc70..a3988db85bb 100644
--- a/settings/ajax/setlanguage.php
+++ b/settings/ajax/setlanguage.php
@@ -1,6 +1,6 @@
<?php
-$l=OC_L10N::get('settings');
+$l = \OC::$server->getL10N('settings');
OC_JSON::checkLoggedIn();
OCP\JSON::callCheck();
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 2e6de2b759c..f19506a0456 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -13,7 +13,7 @@ $username = isset($_POST["username"])?$_POST["username"]:'';
if(($username === '' && !OC_User::isAdminUser(OC_User::getUser()))
|| (!OC_User::isAdminUser(OC_User::getUser())
&& !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) {
- $l = OC_L10N::get('core');
+ $l = \OC::$server->getL10N('core');
OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
exit();
}
diff --git a/settings/ajax/setsecurity.php b/settings/ajax/setsecurity.php
index 675d7eced47..f1f737a4943 100644
--- a/settings/ajax/setsecurity.php
+++ b/settings/ajax/setsecurity.php
@@ -1,6 +1,6 @@
<?php
/**
- * Copyright (c) 2013, Lukas Reschke <lukas@statuscode.ch>
+ * Copyright (c) 2013-2014, Lukas Reschke <lukas@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*/
@@ -8,6 +8,14 @@
OC_Util::checkAdminUser();
OCP\JSON::callCheck();
-OC_Config::setValue( 'forcessl', filter_var($_POST['enforceHTTPS'], FILTER_VALIDATE_BOOLEAN));
+if(isset($_POST['enforceHTTPS'])) {
+ \OC::$server->getConfig()->setSystemValue('forcessl', filter_var($_POST['enforceHTTPS'], FILTER_VALIDATE_BOOLEAN));
+}
+
+if(isset($_POST['trustedDomain'])) {
+ $trustedDomains = \OC::$server->getConfig()->getSystemValue('trusted_domains');
+ $trustedDomains[] = $_POST['trustedDomain'];
+ \OC::$server->getConfig()->setSystemValue('trusted_domains', $trustedDomains);
+}
echo 'true';
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index 6963f9eb43c..27cb2b446ec 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -8,7 +8,7 @@ $username = $_POST["username"];
$group = $_POST["group"];
if($username === OC_User::getUser() && $group === "admin" && OC_User::isAdminUser($username)) {
- $l = OC_L10N::get('core');
+ $l = \OC::$server->getL10N('core');
OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group'))));
exit();
}
@@ -16,7 +16,7 @@ if($username === OC_User::getUser() && $group === "admin" && OC_User::isAdminUs
if(!OC_User::isAdminUser(OC_User::getUser())
&& (!OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)
|| !OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group))) {
- $l = OC_L10N::get('core');
+ $l = \OC::$server->getL10N('core');
OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
exit();
}
@@ -25,7 +25,7 @@ if(!OC_Group::groupExists($group)) {
OC_Group::createGroup($group);
}
-$l = OC_L10N::get('settings');
+$l = \OC::$server->getL10N('settings');
$error = $l->t("Unable to add user to group %s", $group);
$action = "add";
diff --git a/settings/ajax/uninstallapp.php b/settings/ajax/uninstallapp.php
index 5c6371dc16f..cae7c33f292 100644
--- a/settings/ajax/uninstallapp.php
+++ b/settings/ajax/uninstallapp.php
@@ -14,6 +14,6 @@ $result = OC_App::removeApp($appId);
if($result !== false) {
OC_JSON::success(array('data' => array('appid' => $appId)));
} else {
- $l = OC_L10N::get('settings');
+ $l = \OC::$server->getL10N('settings');
OC_JSON::error(array("data" => array( "message" => $l->t("Couldn't remove app.") )));
}
diff --git a/settings/ajax/updateapp.php b/settings/ajax/updateapp.php
index 78f6775fe95..6375a41024a 100644
--- a/settings/ajax/updateapp.php
+++ b/settings/ajax/updateapp.php
@@ -33,10 +33,13 @@ if (!is_numeric($appId)) {
$appId = OC_App::cleanAppId($appId);
+\OC_Config::setValue('maintenance', true);
$result = OC_Installer::updateAppByOCSId($appId, $isShipped);
+\OC_Config::setValue('maintenance', false);
+
if($result !== false) {
OC_JSON::success(array('data' => array('appid' => $appId)));
} else {
- $l = OC_L10N::get('settings');
+ $l = \OC::$server->getL10N('settings');
OC_JSON::error(array("data" => array( "message" => $l->t("Couldn't update app.") )));
}
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index a99c221beb8..807cf5f1899 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -58,8 +58,8 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
$users[] = array(
'name' => $uid,
'displayname' => $displayname,
- 'groups' => join(', ', OC_Group::getUserGroups($uid)),
- 'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($uid)),
+ 'groups' => OC_Group::getUserGroups($uid),
+ 'subadmin' => OC_SubAdmin::getSubAdminsGroups($uid),
'quota' => OC_Preferences::getValue($uid, 'files', 'quota', 'default'),
'storageLocation' => $user->getHome(),
'lastLogin' => $user->getLastLogin(),
@@ -82,7 +82,7 @@ if (OC_User::isAdminUser(OC_User::getUser())) {
$users[] = array(
'name' => $uid,
'displayname' => $user->getDisplayName(),
- 'groups' => join(', ', $userGroups),
+ 'groups' => $userGroups,
'quota' => OC_Preferences::getValue($uid, 'files', 'quota', 'default'),
'storageLocation' => $user->getHome(),
'lastLogin' => $user->getLastLogin(),
diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
index 052715555e5..ee596c3e7ed 100644
--- a/settings/changepassword/controller.php
+++ b/settings/changepassword/controller.php
@@ -56,7 +56,7 @@ class Controller {
$recoveryAdminEnabled = \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
$validRecoveryPassword = false;
- $recoveryPasswordSupported = false;
+ $recoveryEnabledForUser = false;
if ($recoveryAdminEnabled) {
$validRecoveryPassword = $util->checkRecoveryPassword($recoveryPassword);
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
@@ -74,14 +74,14 @@ class Controller {
)));
} 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) {
+ if (!$result && $recoveryEnabledForUser) {
$l = new \OC_L10n('settings');
\OC_JSON::error(array(
"data" => array(
"message" => $l->t("Back-end doesn't support password change, but the users encryption key was successfully updated.")
)
));
- } elseif (!$result && !$recoveryPasswordSupported) {
+ } elseif (!$result && !$recoveryEnabledForUser) {
$l = new \OC_L10n('settings');
\OC_JSON::error(array("data" => array( "message" => $l->t("Unable to change password" ) )));
} else {
diff --git a/settings/css/settings.css b/settings/css/settings.css
index b9ce79bc3b8..95fab85df97 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -6,9 +6,11 @@ select#languageinput, select#timezone { width:15em; }
input#openid, input#webdav { width:20em; }
/* PERSONAL */
-#rootcert_import {
- margin: 0 0 10px 0;
- display: block;
+#sslCertificate tr.expired {
+ background-color: rgba(255, 0, 0, 0.5);
+}
+#sslCertificate td {
+ padding: 5px;
}
/* Sync clients */
@@ -92,17 +94,14 @@ td.password>img,td.displayName>img, td.remove>a, td.quota>img { visibility:hidde
td.password, td.quota, td.displayName { width:12em; cursor:pointer; }
td.password>span, td.quota>span, rd.displayName>span { margin-right: 1.2em; color: #C7C7C7; }
span.usersLastLoginTooltip { white-space: nowrap; }
+th#headerLastLogin, td.lastLogin { display : none; }
+th#headerStorageLocation, td.storageLocation { display : none; }
td.remove { width:1em; padding-right:1em; }
tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:pointer; }
tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
tr:hover>td.remove>a { float:right; }
-div.quota {
- margin: 10px;
- display: block;
-}
-div.quota-select-wrapper { position: relative; }
div.recoveryPassword { left:50em; display:block; position:absolute; top:-1px; }
input#recoveryPassword {width:15em;}
#controls select.quota {
@@ -111,11 +110,6 @@ input#recoveryPassword {width:15em;}
height: 37px;
}
select.quota-user { position:relative; left:0; top:0; width:10em; }
-div.quota>span {
- white-space: nowrap;
- color: #888;
- text-shadow: 0 1px 0 #fff;
-}
select.quota.active { background: #fff; }
input.userFilter {width: 200px;}
diff --git a/settings/js/admin.js b/settings/js/admin.js
index a202feb4f65..56dc1b98716 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -38,6 +38,24 @@ var SharingGroupList = {
};
$(document).ready(function(){
+ var params = OC.Util.History.parseUrlQuery();
+
+ // Hack to add a trusted domain
+ if (params.trustDomain) {
+ OC.dialogs.confirm(t('core', 'Are you really sure you want add "{domain}" as trusted domain?', {domain: params.trustDomain}),
+ t('core', 'Add trusted domain'), function(answer) {
+ if(answer) {
+ $.ajax({
+ type: 'POST',
+ url: OC.generateUrl('settings/ajax/setsecurity.php'),
+ data: { trustedDomain: params.trustDomain }
+ }).done(function() {
+ window.location.replace(OC.generateUrl('settings/admin'));
+ });
+ }
+ });
+ }
+
$('select#excludedGroups[multiple]').each(function (index, element) {
SharingGroupList.applyMultipleSelect($(element));
diff --git a/settings/js/personal.js b/settings/js/personal.js
index f56dd3425f7..11e9593d74a 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -13,12 +13,12 @@
*
* @param callback
*/
-jQuery.fn.keyUpDelayedOrEnter = function(callback){
+jQuery.fn.keyUpDelayedOrEnter = function (callback) {
var cb = callback;
var that = this;
this.keyup(_.debounce(function (event) {
// enter is already handled in keypress
- if(event.keyCode === 13) {
+ if (event.keyCode === 13) {
return;
}
if (that.val() !== '') {
@@ -27,7 +27,7 @@ jQuery.fn.keyUpDelayedOrEnter = function(callback){
}, 1000));
this.keypress(function (event) {
- if (event.keyCode === 13 && that.val() !== '' ){
+ if (event.keyCode === 13 && that.val() !== '') {
event.preventDefault();
cb();
}
@@ -38,48 +38,48 @@ jQuery.fn.keyUpDelayedOrEnter = function(callback){
/**
* Post the email address change to the server.
*/
-function changeEmailAddress(){
- var emailInfo = $('#email');
- if (emailInfo.val() === emailInfo.defaultValue){
- return;
- }
- emailInfo.defaultValue = emailInfo.val();
- OC.msg.startSaving('#lostpassword .msg');
- var post = $( "#lostpassword" ).serialize();
- $.post( 'ajax/lostpassword.php', post, function(data){
- OC.msg.finishedSaving('#lostpassword .msg', data);
- });
+function changeEmailAddress () {
+ var emailInfo = $('#email');
+ if (emailInfo.val() === emailInfo.defaultValue) {
+ return;
+ }
+ emailInfo.defaultValue = emailInfo.val();
+ OC.msg.startSaving('#lostpassword .msg');
+ var post = $("#lostpassword").serialize();
+ $.post('ajax/lostpassword.php', post, function (data) {
+ OC.msg.finishedSaving('#lostpassword .msg', data);
+ });
}
/**
* Post the display name change to the server.
*/
-function changeDisplayName(){
- if ($('#displayName').val() !== '' ) {
- OC.msg.startSaving('#displaynameform .msg');
- // Serialize the data
- var post = $( "#displaynameform" ).serialize();
- // Ajax foo
- $.post( 'ajax/changedisplayname.php', post, function(data){
- if( data.status === "success" ){
- $('#oldDisplayName').val($('#displayName').val());
- // update displayName on the top right expand button
- $('#expandDisplayName').text($('#displayName').val());
- updateAvatar();
- }
- else{
- $('#newdisplayname').val(data.data.displayName);
- }
- OC.msg.finishedSaving('#displaynameform .msg', data);
- });
- }
+function changeDisplayName () {
+ if ($('#displayName').val() !== '') {
+ OC.msg.startSaving('#displaynameform .msg');
+ // Serialize the data
+ var post = $("#displaynameform").serialize();
+ // Ajax foo
+ $.post('ajax/changedisplayname.php', post, function (data) {
+ if (data.status === "success") {
+ $('#oldDisplayName').val($('#displayName').val());
+ // update displayName on the top right expand button
+ $('#expandDisplayName').text($('#displayName').val());
+ updateAvatar();
+ }
+ else {
+ $('#newdisplayname').val(data.data.displayName);
+ }
+ OC.msg.finishedSaving('#displaynameform .msg', data);
+ });
+ }
}
function updateAvatar (hidedefault) {
var $headerdiv = $('#header .avatardiv');
var $displaydiv = $('#displayavatar .avatardiv');
- if(hidedefault) {
+ if (hidedefault) {
$headerdiv.hide();
$('#header .avatardiv').removeClass('avatardiv-shown');
} else {
@@ -93,16 +93,16 @@ function updateAvatar (hidedefault) {
$('#removeavatar').show();
}
-function showAvatarCropper() {
+function showAvatarCropper () {
var $cropper = $('#cropper');
$cropper.prepend("<img>");
var $cropperImage = $('#cropper img');
$cropperImage.attr('src',
- OC.generateUrl('/avatar/tmp')+'?requesttoken='+oc_requesttoken+'#'+Math.floor(Math.random()*1000));
+ OC.generateUrl('/avatar/tmp') + '?requesttoken=' + oc_requesttoken + '#' + Math.floor(Math.random() * 1000));
// Looks weird, but on('load', ...) doesn't work in IE8
- $cropperImage.ready(function(){
+ $cropperImage.ready(function () {
$('#displayavatar').hide();
$cropper.show();
@@ -117,7 +117,7 @@ function showAvatarCropper() {
});
}
-function sendCropData() {
+function sendCropData () {
cleanCropper();
var cropperData = $('#cropper').data();
@@ -130,11 +130,11 @@ function sendCropData() {
$.post(OC.generateUrl('/avatar/cropped'), {crop: data}, avatarResponseHandler);
}
-function saveCoords(c) {
+function saveCoords (c) {
$('#cropper').data(c);
}
-function cleanCropper() {
+function cleanCropper () {
var $cropper = $('#cropper');
$('#displayavatar').show();
$cropper.hide();
@@ -143,7 +143,7 @@ function cleanCropper() {
$('#cropper img').remove();
}
-function avatarResponseHandler(data) {
+function avatarResponseHandler (data) {
var $warning = $('#avatar .warning');
$warning.hide();
if (data.status === "success") {
@@ -156,20 +156,20 @@ function avatarResponseHandler(data) {
}
}
-$(document).ready(function(){
- $("#passwordbutton").click( function(){
+$(document).ready(function () {
+ $("#passwordbutton").click(function () {
if ($('#pass1').val() !== '' && $('#pass2').val() !== '') {
// Serialize the data
- var post = $( "#passwordform" ).serialize();
+ var post = $("#passwordform").serialize();
$('#passwordchanged').hide();
$('#passworderror').hide();
// Ajax foo
- $.post(OC.generateUrl('/settings/personal/changepassword'), post, function(data){
- if( data.status === "success" ){
+ $.post(OC.generateUrl('/settings/personal/changepassword'), post, function (data) {
+ if (data.status === "success") {
$('#pass1').val('');
$('#pass2').val('');
$('#passwordchanged').show();
- } else{
+ } else {
if (typeof(data.data) !== "undefined") {
$('#passworderror').html(data.data.message);
} else {
@@ -190,22 +190,22 @@ $(document).ready(function(){
$('#displayName').keyUpDelayedOrEnter(changeDisplayName);
$('#email').keyUpDelayedOrEnter(changeEmailAddress);
- $("#languageinput").change( function(){
+ $("#languageinput").change(function () {
// Serialize the data
- var post = $( "#languageinput" ).serialize();
+ var post = $("#languageinput").serialize();
// Ajax foo
- $.post( 'ajax/setlanguage.php', post, function(data){
- if( data.status === "success" ){
+ $.post('ajax/setlanguage.php', post, function (data) {
+ if (data.status === "success") {
location.reload();
}
- else{
- $('#passworderror').html( data.data.message );
+ else {
+ $('#passworderror').html(data.data.message);
}
});
return false;
});
- $('button:button[name="submitDecryptAll"]').click(function() {
+ $('button:button[name="submitDecryptAll"]').click(function () {
var privateKeyPassword = $('#decryptAll input:password[id="privateKeyPassword"]').val();
$('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", true);
$('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", true);
@@ -213,23 +213,23 @@ $(document).ready(function(){
});
- $('button:button[name="submitRestoreKeys"]').click(function() {
+ $('button:button[name="submitRestoreKeys"]').click(function () {
$('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", true);
$('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", true);
OC.Encryption.restoreKeys();
});
- $('button:button[name="submitDeleteKeys"]').click(function() {
+ $('button:button[name="submitDeleteKeys"]').click(function () {
$('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", true);
$('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", true);
OC.Encryption.deleteKeys();
});
- $('#decryptAll input:password[name="privateKeyPassword"]').keyup(function(event) {
+ $('#decryptAll input:password[name="privateKeyPassword"]').keyup(function (event) {
var privateKeyPassword = $('#decryptAll input:password[id="privateKeyPassword"]').val();
- if (privateKeyPassword !== '' ) {
+ if (privateKeyPassword !== '') {
$('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", false);
- if(event.which === 13) {
+ if (event.which === 13) {
$('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", true);
$('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", true);
OC.Encryption.decryptAll(privateKeyPassword);
@@ -240,21 +240,21 @@ $(document).ready(function(){
});
var uploadparms = {
- done: function(e, data) {
+ done: function (e, data) {
avatarResponseHandler(data.result);
}
};
- $('#uploadavatarbutton').click(function(){
+ $('#uploadavatarbutton').click(function () {
$('#uploadavatar').click();
});
$('#uploadavatar').fileupload(uploadparms);
- $('#selectavatar').click(function(){
+ $('#selectavatar').click(function () {
OC.dialogs.filepicker(
t('settings', "Select a profile picture"),
- function(path){
+ function (path) {
$.post(OC.generateUrl('/avatar/'), {path: path}, avatarResponseHandler);
},
false,
@@ -262,27 +262,27 @@ $(document).ready(function(){
);
});
- $('#removeavatar').click(function(){
+ $('#removeavatar').click(function () {
$.ajax({
- type: 'DELETE',
- url: OC.generateUrl('/avatar/'),
- success: function() {
+ type: 'DELETE',
+ url: OC.generateUrl('/avatar/'),
+ success: function () {
updateAvatar(true);
$('#removeavatar').hide();
}
});
});
- $('#abortcropperbutton').click(function(){
+ $('#abortcropperbutton').click(function () {
cleanCropper();
});
- $('#sendcropperbutton').click(function(){
+ $('#sendcropperbutton').click(function () {
sendCropData();
});
$('#pass2').strengthify({
- zxcvbn: OC.linkTo('3rdparty','zxcvbn/js/zxcvbn.js'),
+ zxcvbn: OC.linkTo('3rdparty', 'zxcvbn/js/zxcvbn.js'),
titles: [
t('core', 'Very weak password'),
t('core', 'Weak password'),
@@ -298,18 +298,58 @@ $(document).ready(function(){
'/avatar/{user}/{size}',
{user: OC.currentUser, size: 1}
) + '?requesttoken=' + oc_requesttoken;
- $.get(url, function(result) {
+ $.get(url, function (result) {
if (typeof(result) === 'object') {
$('#removeavatar').hide();
}
});
-} );
+
+ $('#sslCertificate').on('click', 'td.remove > img', function () {
+ var row = $(this).parent().parent();
+ $.post(OC.generateUrl('settings/ajax/removeRootCertificate'), {
+ cert: row.data('name')
+ });
+ row.remove();
+ return true;
+ });
+
+ $('#sslCertificate tr > td').tipsy({fade: true, gravity: 'n', live: true});
+
+ $('#rootcert_import').fileupload({
+ done: function (e, data) {
+ var issueDate = new Date(data.result.validFrom * 1000);
+ var expireDate = new Date(data.result.validTill * 1000);
+ var now = new Date();
+ var isExpired = !(issueDate <= now && now <= expireDate);
+
+ var row = $('<tr/>');
+ row.addClass(isExpired? 'expired': 'valid');
+ row.append($('<td/>').attr('title', data.result.organization).text(data.result.commonName));
+ row.append($('<td/>').attr('title', t('core,', 'Valid until {date}', {date: data.result.validFromString}))
+ .text(data.result.validTillString));
+ row.append($('<td/>').attr('title', data.result.issuerOrganization).text(data.result.issuer));
+ row.append($('<td/>').addClass('remove').append(
+ $('<img/>').attr({
+ alt: t('core', 'Delete'),
+ title: t('core', 'Delete'),
+ src: OC.imagePath('core', 'actions/delete.svg')
+ }).addClass('action')
+ ));
+
+ $('#sslCertificate tbody').append(row);
+ }
+ });
+
+ $('#rootcert_import_button').click(function () {
+ $('#rootcert_import').click();
+ });
+});
OC.Encryption = {
- decryptAll: function(password) {
+ decryptAll: function (password) {
var message = t('settings', 'Decrypting files... Please wait, this can take some time.');
OC.Encryption.msg.start('#decryptAll .msg', message);
- $.post('ajax/decryptall.php', {password:password}, function(data) {
+ $.post('ajax/decryptall.php', {password: password}, function (data) {
if (data.status === "error") {
OC.Encryption.msg.finished('#decryptAll .msg', data);
$('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", false);
@@ -320,10 +360,10 @@ OC.Encryption = {
});
},
- deleteKeys: function() {
+ deleteKeys: function () {
var message = t('settings', 'Delete encryption keys permanently.');
OC.Encryption.msg.start('#restoreBackupKeys .msg', message);
- $.post('ajax/deletekeys.php', null, function(data) {
+ $.post('ajax/deletekeys.php', null, function (data) {
if (data.status === "error") {
OC.Encryption.msg.finished('#restoreBackupKeys .msg', data);
$('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", false);
@@ -334,10 +374,10 @@ OC.Encryption = {
});
},
- restoreKeys: function() {
+ restoreKeys: function () {
var message = t('settings', 'Restore encryption keys.');
OC.Encryption.msg.start('#restoreBackupKeys .msg', message);
- $.post('ajax/restorekeys.php', {}, function(data) {
+ $.post('ajax/restorekeys.php', {}, function (data) {
if (data.status === "error") {
OC.Encryption.msg.finished('#restoreBackupKeys .msg', data);
$('#restoreBackupKeys button:button[name="submitDeleteKeys"]').prop("disabled", false);
@@ -349,24 +389,24 @@ OC.Encryption = {
}
};
-OC.Encryption.msg={
- start:function(selector, msg){
- var spinner = '<img src="'+ OC.imagePath('core', 'loading-small.gif') +'">';
+OC.Encryption.msg = {
+ start: function (selector, msg) {
+ var spinner = '<img src="' + OC.imagePath('core', 'loading-small.gif') + '">';
$(selector)
- .html( msg + ' ' + spinner )
+ .html(msg + ' ' + spinner)
.removeClass('success')
.removeClass('error')
.stop(true, true)
.show();
},
- finished:function(selector, data){
- if( data.status === "success" ){
- $(selector).html( data.data.message )
+ finished: function (selector, data) {
+ if (data.status === "success") {
+ $(selector).html(data.data.message)
.addClass('success')
.stop(true, true)
.delay(3000);
- }else{
- $(selector).html( data.data.message ).addClass('error');
+ } else {
+ $(selector).html(data.data.message).addClass('error');
}
}
};
diff --git a/settings/js/users/deleteHandler.js b/settings/js/users/deleteHandler.js
index d4736d88701..c89a844044e 100644
--- a/settings/js/users/deleteHandler.js
+++ b/settings/js/users/deleteHandler.js
@@ -35,6 +35,16 @@ function DeleteHandler(endpoint, paramID, markCallback, removeCallback) {
}
/**
+ * Number of milliseconds after which the operation is performed.
+ */
+DeleteHandler.TIMEOUT_MS = 7000;
+
+/**
+ * Timer after which the action will be performed anyway.
+ */
+DeleteHandler.prototype._timeout = null;
+
+/**
* The function to be called after successfully marking the object for deletion
* @callback markCallback
* @param {string} oid the ID of the specific user or group
@@ -72,7 +82,9 @@ DeleteHandler.prototype.setNotification = function(notifier, dataID, message, un
var dh = this;
- $('#notification').on('click', '.undo', function () {
+ $('#notification')
+ .off('click.deleteHandler_' + dataID)
+ .on('click.deleteHandler_' + dataID, '.undo', function () {
if ($('#notification').data(dh.notificationDataID)) {
var oid = dh.oidToDelete;
dh.cancel();
@@ -116,18 +128,36 @@ DeleteHandler.prototype.hideNotification = function() {
*/
DeleteHandler.prototype.mark = function(oid) {
if(this.oidToDelete !== false) {
- this.deleteEntry();
+ // passing true to avoid hiding the notification
+ // twice and causing the second notification
+ // to disappear immediately
+ this.deleteEntry(true);
}
this.oidToDelete = oid;
this.canceled = false;
this.markCallback(oid);
this.showNotification();
+ if (this._timeout) {
+ clearTimeout(this._timeout);
+ this._timeout = null;
+ }
+ if (DeleteHandler.TIMEOUT_MS > 0) {
+ this._timeout = window.setTimeout(
+ _.bind(this.deleteEntry, this),
+ DeleteHandler.TIMEOUT_MS
+ );
+ }
};
/**
* cancels a delete operation
*/
DeleteHandler.prototype.cancel = function() {
+ if (this._timeout) {
+ clearTimeout(this._timeout);
+ this._timeout = null;
+ }
+
this.canceled = true;
this.oidToDelete = false;
};
@@ -137,22 +167,31 @@ DeleteHandler.prototype.cancel = function() {
* initialized by mark(). On error, it will show a message via
* OC.dialogs.alert. On success, a callback is fired so that the client can
* update the web interface accordingly.
+ *
+ * @param {boolean} [keepNotification] true to keep the notification, false to hide
+ * it, defaults to false
*/
-DeleteHandler.prototype.deleteEntry = function() {
+DeleteHandler.prototype.deleteEntry = function(keepNotification) {
if(this.canceled || this.oidToDelete === false) {
return false;
}
var dh = this;
- if($('#notification').data(this.notificationDataID) === true) {
+ if(!keepNotification && $('#notification').data(this.notificationDataID) === true) {
dh.hideNotification();
}
+ if (this._timeout) {
+ clearTimeout(this._timeout);
+ this._timeout = null;
+ }
+
var payload = {};
payload[dh.ajaxParamID] = dh.oidToDelete;
$.ajax({
type: 'POST',
url: OC.filePath('settings', 'ajax', dh.ajaxEndpoint),
+ // FIXME: do not use synchronous ajax calls as they block the browser !
async: false,
data: payload,
success: function (result) {
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index fe06edff34d..081842734f0 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -251,12 +251,23 @@ GroupList = {
getElementGID: function (element) {
return ($(element).closest('li').data('gid') || '').toString();
+ },
+ getEveryoneCount: function () {
+ $.ajax({
+ type: "GET",
+ dataType: "json",
+ url: OC.generateUrl('/settings/ajax/geteveryonecount')
+ }).success(function (data) {
+ $('#everyonegroup').data('usercount', data.count);
+ $('#everyonecount').text(data.count);
+ });
}
};
$(document).ready( function () {
$userGroupList = $('#usergrouplist');
GroupList.initDeleteHandling();
+ GroupList.getEveryoneCount();
// Display or hide of Create Group List Element
$('#newgroup-form').hide();
@@ -289,28 +300,4 @@ $(document).ready( function () {
$userGroupList.on('click', '.isgroup', function () {
GroupList.showGroup(GroupList.getElementGID(this));
});
-
- // Implements Quota Settings Toggle.
- var $appSettings = $('#app-settings');
- $('#app-settings-header').on('click keydown',function(event) {
- if(wrongKey(event)) {
- return;
- }
- if($appSettings.hasClass('open')) {
- $appSettings.switchClass('open', '');
- } else {
- $appSettings.switchClass('', 'open');
- }
- });
- $('body').on('click', function(event){
- if($appSettings.find(event.target).length === 0) {
- $appSettings.switchClass('open', '');
- }
- });
-
});
-
-var wrongKey = function(event) {
- return ((event.type === 'keydown' || event.type === 'keypress') &&
- (event.keyCode !== 32 && event.keyCode !== 13));
-};
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index a94352e8e18..f39f8c2c064 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -18,6 +18,18 @@ var UserList = {
usersToLoad: 10, //So many users will be loaded when user scrolls down
currentGid: '',
+ /**
+ * Initializes the user list
+ * @param $el user list table element
+ */
+ initialize: function($el) {
+ this.$el = $el;
+
+ // initially the list might already contain user entries (not fully ajaxified yet)
+ // initialize these entries
+ this.$el.find('.quota-user').singleSelect().on('change', this.onQuotaSelect);
+ },
+
add: function (username, displayname, groups, subadmin, quota, storageLocation, lastLogin, sort) {
var $tr = $userListBody.find('tr:first-child').clone();
var subAdminsEl;
@@ -84,9 +96,8 @@ var UserList = {
var lastLoginRel = t('settings', 'never');
var lastLoginAbs = lastLoginRel;
if(lastLogin !== 0) {
- lastLogin = new Date(lastLogin * 1000);
- lastLoginRel = relative_modified_date(lastLogin.getTime() / 1000);
- lastLoginAbs = formatDate(lastLogin.getTime());
+ lastLoginRel = OC.Util.relativeModifiedDate(lastLogin);
+ lastLoginAbs = OC.Util.formatDate(lastLogin);
}
var $tdLastLogin = $tr.find('td.lastLogin');
$tdLastLogin.text(lastLoginRel);
@@ -109,15 +120,7 @@ var UserList = {
UserList.doSort();
}
- $quotaSelect.on('change', function () {
- var uid = UserList.getUID(this);
- var quota = $(this).val();
- setQuota(uid, quota, function(returnedQuota){
- if (quota !== returnedQuota) {
- $($quotaSelect).find(':selected').text(returnedQuota);
- }
- });
- });
+ $quotaSelect.on('change', UserList.onQuotaSelect);
// defer init so the user first sees the list appear more quickly
window.setTimeout(function(){
@@ -498,20 +501,41 @@ var UserList = {
if (UserList.scrollArea.scrollTop() + UserList.scrollArea.height() > UserList.scrollArea.get(0).scrollHeight - 500) {
UserList.update(UserList.currentGid, true);
}
- }
-};
+ },
-function setQuota (uid, quota, ready) {
- $.post(
- OC.filePath('settings', 'ajax', 'setquota.php'),
- {username: uid, quota: quota},
- function (result) {
- if (ready) {
- ready(result.data.quota);
+ /**
+ * Event handler for when a quota has been changed through a single select.
+ * This will save the value.
+ */
+ onQuotaSelect: function(ev) {
+ var $select = $(ev.target);
+ var uid = UserList.getUID($select);
+ var quota = $select.val();
+ UserList._updateQuota(uid, quota, function(returnedQuota){
+ if (quota !== returnedQuota) {
+ $select.find(':selected').text(returnedQuota);
}
- }
- );
-}
+ });
+ },
+
+ /**
+ * Saves the quota for the given user
+ * @param {String} [uid] optional user id, sets default quota if empty
+ * @param {String} quota quota value
+ * @param {Function} ready callback after save
+ */
+ _updateQuota: function(uid, quota, ready) {
+ $.post(
+ OC.filePath('settings', 'ajax', 'setquota.php'),
+ {username: uid, quota: quota},
+ function (result) {
+ if (ready) {
+ ready(result.data.quota);
+ }
+ }
+ );
+ }
+};
$(document).ready(function () {
$userList = $('#userlist');
@@ -530,6 +554,9 @@ $(document).ready(function () {
$userList.after($('<div class="loading" style="height: 200px; visibility: hidden;"></div>'));
+ // TODO: move other init calls inside of initialize
+ UserList.initialize($('#userlist'));
+
$('.groupsselect').each(function (index, element) {
UserList.applyGroupSelect(element);
});
@@ -613,15 +640,9 @@ $(document).ready(function () {
});
});
- $('#default_quota, .quota-user').singleSelect().on('change', function () {
- var $select = $(this);
- var uid = UserList.getUID($select);
- var quota = $select.val();
- setQuota(uid, quota, function(returnedQuota){
- if (quota !== returnedQuota) {
- $select.find(':selected').text(returnedQuota);
- }
- });
+ // init the quota field select box after it is shown the first time
+ $('#app-settings').one('show', function() {
+ $(this).find('#default_quota').singleSelect().on('change', UserList.onQuotaSelect);
});
$('#newuser').submit(function (event) {
@@ -688,4 +709,27 @@ $(document).ready(function () {
);
});
+ // Option to display/hide the "Storage location" column
+ $('#CheckboxStorageLocation').click(function() {
+ if ($('#CheckboxStorageLocation').is(':checked')) {
+ $("#headerStorageLocation").show();
+ $("#userlist td.storageLocation").show();
+ } else {
+ $("#headerStorageLocation").hide();
+ $("#userlist td.storageLocation").hide();
+ }
+ });
+ // Option to display/hide the "Last Login" column
+ $('#CheckboxLastLogin').click(function() {
+ if ($('#CheckboxLastLogin').is(':checked')) {
+ $("#headerLastLogin").show();
+ $("#userlist td.lastLogin").show();
+ } else {
+ $("#headerLastLogin").hide();
+ $("#userlist td.lastLogin").hide();
+ }
+ });
+
+
+
});
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 4d667286e90..6d4880502dc 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -19,6 +19,7 @@ $TRANSLATIONS = array(
"Invalid email" => "البريد الإلكتروني غير صالح",
"Unable to delete group" => "فشل إزالة المجموعة",
"Unable to delete user" => "فشل إزالة المستخدم",
+"Backups restored successfully" => "تم إسترجاع النسخة الإحتياطية بنجاح",
"Language changed" => "تم تغيير اللغة",
"Invalid request" => "طلب غير مفهوم",
"Admins can't remove themself from the admin group" => "لا يستطيع المدير إزالة حسابه من مجموعة المديرين",
@@ -31,9 +32,11 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "خطا في كلمة مرور المسؤول المستردة, يرجى التاكد من كلمة المرور والمحاولة مرة اخرى.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح.",
"Unable to change password" => "لا يمكن تغيير كلمة المرور",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "هل أنت متأكد انك تريد إضافة \"{domain}\" كنطاق موثوق فيه.",
"Sending..." => "جاري الارسال ...",
"User Documentation" => "كتاب توثيق المستخدم",
"Update to {appversion}" => "تم التحديث الى ",
+"Uninstall App" => "أزالة تطبيق",
"Disable" => "إيقاف",
"Enable" => "تفعيل",
"Please wait...." => "الرجاء الانتظار ...",
@@ -44,16 +47,18 @@ $TRANSLATIONS = array(
"Error" => "خطأ",
"Update" => "حدث",
"Updated" => "تم التحديث بنجاح",
+"Uninstalling ...." => "جاري إلغاء التثبيت ...",
+"Uninstall" => "ألغاء التثبيت",
"Select a profile picture" => "اختر صورة الملف الشخصي ",
"Very weak password" => "كلمة السر ضعيفة جدا",
"Weak password" => "كلمة السر ضعيفة",
"Good password" => "كلمة السر جيدة",
"Strong password" => "كلمة السر قوية",
+"Delete" => "إلغاء",
"Decrypting files... Please wait, this can take some time." => "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت.",
"undo" => "تراجع",
"Groups" => "مجموعات",
"Group Admin" => "مدير المجموعة",
-"Delete" => "إلغاء",
"never" => "بتاتا",
"add group" => "اضافة مجموعة",
"A valid username must be provided" => "يجب ادخال اسم مستخدم صحيح",
@@ -89,9 +94,12 @@ $TRANSLATIONS = array(
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "الملف cron.php تم تسجيله فى خدمه webcron لاستدعاء الملف cron.php كل 15 دقيقه",
"Sharing" => "مشاركة",
"Allow apps to use the Share API" => "السماح للتطبيقات بالمشاركة عن طريق الAPI",
+"Allow users to share via link" => "السماح للمستخدم بمشاركة الملف عن طريق رابط",
"Allow public uploads" => "السماح بالرفع للعامة ",
+"Expire after " => "ينتهي بعد",
+"days" => "أيام",
"Allow resharing" => "السماح بإعادة المشاركة ",
-"Security" => "حماية",
+"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." => "يرجى الاتصال بـ %s عن طريق HTTPS لتفعيل او تعطيل SSL enforcement.",
@@ -131,13 +139,14 @@ $TRANSLATIONS = array(
"Profile picture" => "صورة الملف الشخصي",
"Upload new" => "رفع الان",
"Select new from Files" => "اختر جديد من الملفات ",
-"Remove image" => "احذف الصورة ",
+"Remove image" => "إزالة الصورة",
"Either png or jpg. Ideally square but you will be able to crop it." => "سواء png او jpg. بامكانك قص الصورة ",
"Your avatar is provided by your original account." => "صورتك الرمزية يتم توفيرها عن طريق حسابك الاصلي.",
"Cancel" => "الغاء",
"Choose as profile image" => "اختر صورة الملف الشخصي",
"Language" => "اللغة",
"Help translate" => "ساعد في الترجمه",
+"Valid until" => "صالح حتى",
"The encryption app is no longer enabled, please decrypt all your files" => "البرنامج المشفر لم يعد مفعل, يرجى فك التشفير عن كل ملفاتك",
"Log-in password" => "كلمه سر الدخول",
"Decrypt all Files" => "فك تشفير جميع الملفات ",
@@ -146,12 +155,14 @@ $TRANSLATIONS = array(
"Admin Recovery Password" => "استعادة كلمة المرور للمسؤول",
"Enter the recovery password in order to recover the users files during password change" => "ادخل كلمة المرور المستعادة من اجل استرداد ملفات المستخدمين اثناء تغيير كلمة المرور",
"Group" => "مجموعة",
+"Everyone" => "الجميع",
"Default Quota" => "الحصة النسبية الإفتراضية",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "يرجى ادخال تخزين quota (مثل:\"512 MB\" او \"12 GB\")",
"Unlimited" => "غير محدود",
"Other" => "شيء آخر",
"Username" => "إسم المستخدم",
"Quota" => "حصه",
+"Last Login" => "آخر تسجيل دخول",
"change full name" => "تغيير اسمك الكامل",
"set new password" => "اعداد كلمة مرور جديدة",
"Default" => "افتراضي"
diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php
index 5bacf32cd99..a2cd5518342 100644
--- a/settings/l10n/ast.php
+++ b/settings/l10n/ast.php
@@ -64,6 +64,7 @@ $TRANSLATIONS = array(
"So-so password" => "Contraseña pasable",
"Good password" => "Contraseña bona",
"Strong password" => "Contraseña mui bona",
+"Delete" => "Desaniciar",
"Decrypting files... Please wait, this can take some time." => "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu.",
"Delete encryption keys permanently." => "Desaniciar dafechu les claves de cifráu.",
"Restore encryption keys." => "Restaurar claves de cifráu.",
@@ -74,7 +75,6 @@ $TRANSLATIONS = array(
"undo" => "desfacer",
"Groups" => "Grupos",
"Group Admin" => "Alministrador del Grupu",
-"Delete" => "Desaniciar",
"never" => "enxamás",
"deleted {userName}" => "desaniciáu {userName}",
"add group" => "amestar Grupu",
@@ -195,6 +195,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Esbillar como imaxe de perfil",
"Language" => "Llingua",
"Help translate" => "Ayúdanos nes traducciones",
+"SSL root certificates" => "Certificaos raíz SSL",
+"Import Root Certificate" => "Importar certificáu raíz",
"The encryption app is no longer enabled, please decrypt all your files" => "L'aplicación de cifráu yá nun ta activada, descifra tolos ficheros",
"Log-in password" => "Contraseña d'accesu",
"Decrypt all Files" => "Descifrar ficheros",
diff --git a/settings/l10n/az.php b/settings/l10n/az.php
new file mode 100644
index 00000000000..c0937e271e2
--- /dev/null
+++ b/settings/l10n/az.php
@@ -0,0 +1,113 @@
+<?php
+$TRANSLATIONS = array(
+"Invalid value supplied for %s" => "%s üçün yalnış təyinat mənimsədildi",
+"Saved" => "Saxlanıldı",
+"test email settings" => "sınaq məktubu quraşdırmaları",
+"If you received this email, the settings seem to be correct." => "Əgər siz bu məktubu aldınızsa, demək quraşdırmalar düzgündür.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Məktubun göndərilməsində səhv baş verdi. Xahiş edirik öz configlərinizə yenidən baxasınız.",
+"Email sent" => "Məktub göndərildi",
+"You need to set your user email before being able to send test emails." => "Test məktubu göndərməzdən öncə, siz öz istifadəçi poçtunuzu təyiin etməlisiniz.",
+"Send mode" => "Göndərmə rejimi",
+"Encryption" => "Şifrələnmə",
+"Authentication method" => "Qeydiyyat metodikası",
+"Unable to load list from App Store" => "Listi App Store-dan yükləmək mümkün deyil",
+"Authentication error" => "Təyinat metodikası",
+"Your full name has been changed." => "Sizin tam adınız dəyişdirildi.",
+"Unable to change full name" => "Tam adı dəyişmək olmur",
+"Group already exists" => "Qrup artıq mövcuddur",
+"Unable to add group" => "Qrupu əlavə etmək olmur",
+"Files decrypted successfully" => "Fayllar uğurla deşifrə edildi",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Sizin faylları deşifrə etmək olmur, xahiş olunur owncloud.log faylını yoxlaya vəya inzibatçıya müraciət edəsiniz.",
+"Couldn't decrypt your files, check your password and try again" => "Sizin faylları deşifrə etmək olmur, xahiş olunur şifrəni yoxlaya və yenidən təkrar edəsiniz.",
+"Encryption keys deleted permanently" => "Şifrələmə açarları həmişəlik silindi",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Sizin şifrələnmə açarlarınızı həmişəlik silmək mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
+"Couldn't remove app." => "Proqram təminatını silmək mümkün olmadı.",
+"Email saved" => "Məktub yadda saxlanıldı",
+"Invalid email" => "Yalnış məktub",
+"Unable to delete group" => "Qrupu silmək olmur",
+"Unable to delete user" => "İstifadəçini silmək olmur",
+"Backups restored successfully" => "Ehtiyyat nüsxələr uğurla geri qaytarıldı",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Sizin şifrələnmə açarlarınızı geri qaytarmaq mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
+"Language changed" => "Dil dəyişdirildi",
+"Invalid request" => "Səhv müraciət",
+"Admins can't remove themself from the admin group" => "İnzibatçılar özlərini inzibatçı qrupundan silə bilməz",
+"Unable to add user to group %s" => "İstifadəçini %s qrupuna əlavə etmək mümkün olmadı",
+"Unable to remove user from group %s" => "İstifadəçini %s qrupundan silmək mümkün olmadı",
+"Couldn't update app." => "Proqram təminatını yeniləmək mümkün deyil.",
+"Wrong password" => "Yalnış şifrə",
+"No user supplied" => "Heç bir istifadəçiyə mənimsədilmir",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Xahış olunur inzibatçı geriyə qayıdış şifrəsini təqdim edəsiniz, əks halda bütün istfadəçi datası itəcək.",
+"Wrong admin recovery password. Please check the password and try again." => "İnzibatçı geriyə qayıdış şifrəsi yalnışdır. Xahiş olunur şifrəni yoxlayıb yenidən təkrar edəsiniz.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "İnzibatçı mərkəzi şifrə dəyişilməsini dəstəkləmir ancaq, istifadəçi şifrələnmə açarı uğurla yeniləndi.",
+"Unable to change password" => "Şifrəni dəyişmək olmur",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "\"{domain}\" adını inamlı domainlər siyahısına əlavə etməyinizdən əminsinizmi?",
+"Add trusted domain" => "İnamlı domainlərə əlavə et",
+"Sending..." => "Göndərilir...",
+"User Documentation" => "İstifadəçi sənədləri",
+"Admin Documentation" => "İnzibatçı sənədləri",
+"Update to {appversion}" => "{appversion} -a yenilə",
+"Uninstall App" => "Proqram təminatını sil",
+"Disable" => "Dayandır",
+"Enable" => "İşə sal",
+"Please wait...." => "Xahiş olunur gözləyəsiniz.",
+"Error while disabling app" => "Proqram təminatını dayandırdıqda səhv baş verdi",
+"Error while enabling app" => "Proqram təminatını işə saldıqda səhv baş verdi",
+"Updating...." => "Yenilənir...",
+"Error while updating app" => "Proqram təminatı yeniləndikdə səhv baş verdi",
+"Error" => "Səhv",
+"Update" => "Yenilənmə",
+"Updated" => "Yeniləndi",
+"Uninstalling ...." => "Silinir...",
+"Error while uninstalling app" => "Proqram təminatını sildikdə səhv baş verdi",
+"Uninstall" => "Sil",
+"Select a profile picture" => "Profil üçün şəkli seç",
+"Very weak password" => "Çox asan şifrə",
+"Weak password" => "Asan şifrə",
+"So-so password" => "Elə-belə şifrə",
+"Good password" => "Yaxşı şifrə",
+"Strong password" => "Çətin şifrə",
+"Delete" => "Sil",
+"Decrypting files... Please wait, this can take some time." => "Fayllar deşifrə edilir... Xahiş olunur gözləyəsiniz, bu biraz vaxt alacaq.",
+"Delete encryption keys permanently." => "Şifrələnmə açarlarını həmişəlik sil.",
+"Restore encryption keys." => "Şifrələnmə açarlarını geri qaytar",
+"Unable to delete {objName}" => "{objName} silmək olmur",
+"Error creating group" => "Qrup yaranmasında səhv baş verdi",
+"A valid group name must be provided" => "Düzgün qrup adı təyin edilməlidir",
+"deleted {groupName}" => "{groupName} silindi",
+"undo" => "geriyə",
+"Groups" => "Qruplar",
+"Group Admin" => "Qrup İnzibatçısı",
+"never" => "heç vaxt",
+"deleted {userName}" => "{userName} silindi",
+"add group" => "qrupu əlavə et",
+"A valid username must be provided" => "Düzgün istifadəçi adı daxil edilməlidir",
+"Error creating user" => "İstifadəçi yaratdıqda səhv baş verdi",
+"A valid password must be provided" => "Düzgün şifrə daxil edilməlidir",
+"Warning: Home directory for user \"{user}\" already exists" => "Xəbərdarlıq: \"{user}\" istfadəçisi üçün ev qovluğu artıq mövcuddur.",
+"__language_name__" => "__AZ_Azerbaijan__",
+"Everything (fatal issues, errors, warnings, info, debug)" => "Hər şey(ən pis hadisələr, səhvlər, xəbərdarlıqlar, məlmat, araşdırma səhvləri)",
+"Info, warnings, errors and fatal issues" => "Məlmat, xəbərdarlıqlar, səhvlər və ən pis hadisələr",
+"Warnings, errors and fatal issues" => "Xəbərdarlıqlar, səhvlər və ən pis hadisələr",
+"Errors and fatal issues" => "Səhvlər və ən pis hadisələr",
+"Fatal issues only" => "Yalnız ən pis hadisələr",
+"None" => "Heç bir",
+"Login" => "Giriş",
+"Plain" => "Adi",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
+"Security Warning" => "Təhlükəsizlik xəbərdarlığı",
+"Setup Warning" => "Quruluş xəbərdarlığı",
+"Database Performance Info" => "Verilənlər bazasının davamiyyəti məlumatı",
+"Module 'fileinfo' missing" => "'fileinfo' modulu çatışmır",
+"Your PHP version is outdated" => "Sizin PHP versiyası köhnəlib",
+"PHP charset is not set to UTF-8" => "PHP simvol tipi UTF-8 deyil",
+"Internet connection not working" => "İnternet qoşulması işləmir",
+"More" => "Yenə",
+"Get the apps to sync your files" => "Fayllarınızın sinxronizasiyası üçün proqramları götürün",
+"Password" => "Şifrə",
+"Change password" => "Şifrəni dəyiş",
+"Cancel" => "Dayandır",
+"Username" => "İstifadəçi adı"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index e2f097bb5f0..507b46f6b28 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Грешна администраторска парола за възстановяване. Моля, провери паролата и опитай отново.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Сървърът не позволява смяна на паролата, но ключът за криптиране беше успешно обновен.",
"Unable to change password" => "Неуспешна смяна на паролата.",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Сигурен ли си, че искащ да добавиш \"{domain}\" сигурен домейн?",
+"Add trusted domain" => "Добави сигурен домейн",
"Sending..." => "Изпращане...",
"User Documentation" => "Потребителска Документация",
"Admin Documentation" => "Админ Документация",
@@ -64,6 +66,8 @@ $TRANSLATIONS = array(
"So-so password" => "Не особено добра парола",
"Good password" => "Добра парола",
"Strong password" => "Сигурна парола",
+"Valid until {date}" => "Валиден до {date}",
+"Delete" => "Изтрий",
"Decrypting files... Please wait, this can take some time." => "Разшифроване на файловете... Моля, изчакай, това може да отнеме време...",
"Delete encryption keys permanently." => "Изтрий криптиращите ключове безвъзвратно.",
"Restore encryption keys." => "Възстанови криптиращите ключове.",
@@ -74,7 +78,6 @@ $TRANSLATIONS = array(
"undo" => "възтановяване",
"Groups" => "Групи",
"Group Admin" => "Админ Група",
-"Delete" => "Изтрий",
"never" => "никога",
"deleted {userName}" => "{userName} изтрит",
"add group" => "нова група",
@@ -108,12 +111,16 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP модулът 'fileinfo' липсва. Силно препоръчваме този модъл да бъде добавен, за да бъдат постигнати най-добри резултати при mime-type откриването.",
"Your PHP version is outdated" => "PHP версията е остаряла.",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "PHP версията е остаряла. Силно препоръчваме да я обновиш на 5.3.8 или по-нова, защото по-старите версии създават проблеми. Възможно е тази инсталация да не работи правилно.",
+"PHP charset is not set to UTF-8" => "PHP таблицата от символи не е настроена за UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP таблицата от символи не е настроена за UTF-8. Това може да предизвика големи проблеми с не ASCII символи в имена на файлове. Силно перпоръчваме да промените стойноста на 'defaul_charset' в php.ini до 'UTF-8'.",
"Locale not working" => "Местоположението не работи",
"System locale can not be set to a one which supports UTF-8." => "Системните настройки за местоположение не могат да бъдат промени на такива, подържащи UTF-8.",
"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 one of the following locales: %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." => "Сървърът няма работеща интернет връзка. Това означава, че някои функции като прикачването на външни дискови устройства, уведомления за обновяване или инсталиране на външни приложения няма да работят. Достъпът на файлове отвън или изпращане на имейли за уведомление вероятно също няма да работят. Препоръчваме да включиш интернет връзката за този сървър ако искаш да използваш всички тези функции.",
+"URL generation in notification emails" => "Генериране на URL в имейлите за известяване",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Ако инсталацията не e инсталиранa в root на домейна и използва cron, може да има проблеми с генерирането на URL. За да избегнеш тези проблеми, моля, промени \"overwritewebroot\" в config.php с webroot пътя (Препоръчително: \"%s\")",
"Cron" => "Крон",
"Last cron was executed at %s." => "Последният cron се изпълни в %s.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Последният cron се изпълни в %s. Това е преди повече от час, нещо не както трябва.",
@@ -195,12 +202,20 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Избери като аватар",
"Language" => "Език",
"Help translate" => "Помогни с превода",
+"SSL root certificates" => "SSL root сертификати",
+"Common Name" => "Познато Име",
+"Valid until" => "Валиден до",
+"Issued By" => "Издаден От",
+"Valid until %s" => "Валиден до %s",
+"Import Root Certificate" => "Внасяне на Root Сертификат",
"The encryption app is no longer enabled, please decrypt all your files" => "Приложението за криптиране вече не е включено, моля разшифрирай всичките си файлове.",
"Log-in password" => "Парола за вписване",
"Decrypt all Files" => "Разшифровай всички Файлове",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Криптиращите ти ключове са преместени на резервно място. Ако нещо се случи ще можеш да възстановиш ключовете. Изтрий ги единствено ако си сигурен, че всички файлове са успешно разшифровани.",
"Restore Encryption Keys" => "Възстанови Криптиращи Ключове",
"Delete Encryption Keys" => "Изтрий Криптиращи Ключове",
+"Show storage location" => "Покажи място за запис",
+"Show last log in" => "Покажи последно вписване",
"Login Name" => "Потребителско Име",
"Create" => "Създаване",
"Admin Recovery Password" => "Възстановяване на Администраторска Парола",
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index a5f52992ebe..be67c187834 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -1,6 +1,11 @@
<?php
$TRANSLATIONS = array(
+"Invalid value supplied for %s" => "%s এর জন্য অবৈধ ভ্যাল্যু প্রদান করা হয়েছৈ",
+"Saved" => "সংরক্ষণ করা হলো",
+"test email settings" => "ইমেইল নিয়ামকসমূহ পরীক্ষা করুন",
+"If you received this email, the settings seem to be correct." => "এই ইমেইলের অর্থ নিয়ামকসমূহ সঠিক।",
"Email sent" => "ই-মেইল পাঠানো হয়েছে",
+"Send mode" => "পাঠানো মোড",
"Encryption" => "সংকেতায়ন",
"Unable to load list from App Store" => "অ্যাপস্টোর থেকে তালিকা লোড করতে সক্ষম নয়",
"Authentication error" => "অনুমোদন ঘটিত সমস্যা",
@@ -20,15 +25,16 @@ $TRANSLATIONS = array(
"Enable" => "সক্রিয় ",
"Error" => "সমস্যা",
"Update" => "পরিবর্ধন",
+"Delete" => "মুছে",
"undo" => "ক্রিয়া প্রত্যাহার",
"Groups" => "গোষ্ঠীসমূহ",
"Group Admin" => "গোষ্ঠী প্রশাসক",
-"Delete" => "মুছে",
"never" => "কখনোই নয়",
"__language_name__" => "__language_name__",
"None" => "কোনটিই নয়",
"Login" => "প্রবেশ",
"Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
+"days" => "দিনগুলি",
"Server address" => "সার্ভার ঠিকানা",
"Port" => "পোর্ট",
"More" => "বেশী",
@@ -40,11 +46,13 @@ $TRANSLATIONS = array(
"Select an App" => "অ্যাপ নির্বাচন করুন",
"See application page at apps.owncloud.com" => "apps.owncloud.com এ অ্যাপ্লিকেসন পৃষ্ঠা দেখুন",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-লাইসেন্সধারী <span class=\"author\"></span>",
+"All" => "সবাই",
"Administrator Documentation" => "প্রশাসক সহায়িকা",
"Online Documentation" => "অনলাইন সহায়িকা",
"Forum" => "ফোরাম",
"Bugtracker" => "বাগট্র্যাকার",
"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" => "কূটশব্দ",
@@ -58,8 +66,11 @@ $TRANSLATIONS = array(
"Cancel" => "বাতির",
"Language" => "ভাষা",
"Help translate" => "অনুবাদ করতে সহায়তা করুন",
+"SSL root certificates" => "SSL রুট সনদপত্র",
+"Import Root Certificate" => "রুট সনদপত্রটি আমদানি করুন",
"Login Name" => "প্রবেশ",
"Create" => "তৈরী কর",
+"Group" => "গোষ্ঠীসমূহ",
"Unlimited" => "অসীম",
"Other" => "অন্যান্য",
"Username" => "ব্যবহারকারী",
diff --git a/settings/l10n/bn_IN.php b/settings/l10n/bn_IN.php
index 27bbb3d6617..9e3ce7f906b 100644
--- a/settings/l10n/bn_IN.php
+++ b/settings/l10n/bn_IN.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Saved" => "সংরক্ষিত",
"Error" => "ভুল",
"Delete" => "মুছে ফেলা",
"Get the apps to sync your files" => "আপনার ফাইল সিঙ্ক করার অ্যাপ পান",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 8809a603a20..5517e29012e 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -64,6 +64,7 @@ $TRANSLATIONS = array(
"So-so password" => "Contrasenya passable",
"Good password" => "Contrasenya bona",
"Strong password" => "Contrasenya forta",
+"Delete" => "Esborra",
"Decrypting files... Please wait, this can take some time." => "Desencriptant fitxers... Espereu, això pot trigar una estona.",
"Delete encryption keys permanently." => "Esborra les claus d'encriptació permanentment.",
"Restore encryption keys." => "Esborra les claus d'encripació.",
@@ -74,7 +75,6 @@ $TRANSLATIONS = array(
"undo" => "desfés",
"Groups" => "Grups",
"Group Admin" => "Grup Admin",
-"Delete" => "Esborra",
"never" => "mai",
"deleted {userName}" => "eliminat {userName}",
"add group" => "afegeix grup",
@@ -194,6 +194,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Selecciona com a imatge de perfil",
"Language" => "Idioma",
"Help translate" => "Ajudeu-nos amb la traducció",
+"SSL root certificates" => "Certificats SSL root",
+"Import Root Certificate" => "Importa certificat root",
"The encryption app is no longer enabled, please decrypt all your files" => "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers",
"Log-in password" => "Contrasenya d'accés",
"Decrypt all Files" => "Desencripta tots els fitxers",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 425210103c1..12484bdc5e6 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -19,9 +19,9 @@ $TRANSLATIONS = array(
"Files decrypted successfully" => "Soubory úspěšně dešifrovány",
"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nebylo možno dešifrovat soubory, zkontroluje prosím owncloud.log nebo kontaktujte svého administrátora",
"Couldn't decrypt your files, check your password and try again" => "Nebylo možno dešifrovat soubory, zkontrolujte své heslo a zkuste znovu",
-"Encryption keys deleted permanently" => "Šifrovací klíče trvale smazány",
+"Encryption keys deleted permanently" => "Šifrovací klíče trvale smazány",
"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nebylo možno trvale smazat vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
-"Couldn't remove app." => "Nepodařilo se odstranit aplikaci.",
+"Couldn't remove app." => "Nepodařilo se odebrat aplikaci.",
"Email saved" => "E-mail uložen",
"Invalid email" => "Neplatný e-mail",
"Unable to delete group" => "Nelze smazat skupinu",
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatelů byl úspěšně změněn.",
"Unable to change password" => "Změna hesla se nezdařila",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Jste si jisti, že chcete přidat \"{domain}\" mezi důvěryhodné domény?",
+"Add trusted domain" => "Přidat důvěryhodnou doménu",
"Sending..." => "Odesílání...",
"User Documentation" => "Uživatelská dokumentace",
"Admin Documentation" => "Dokumentace pro administrátory",
@@ -64,9 +66,11 @@ $TRANSLATIONS = array(
"So-so password" => "Středně silné heslo",
"Good password" => "Dobré heslo",
"Strong password" => "Silné heslo",
+"Valid until {date}" => "Platný do {date}",
+"Delete" => "Smazat",
"Decrypting files... Please wait, this can take some time." => "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu.",
-"Delete encryption keys permanently." => "Trvale smazat šifrovací klíče",
-"Restore encryption keys." => "Obnovit šifrovací klíče",
+"Delete encryption keys permanently." => "Trvale smazat šifrovací klíče.",
+"Restore encryption keys." => "Obnovit šifrovací klíče.",
"Unable to delete {objName}" => "Nelze smazat {objName}",
"Error creating group" => "Chyba při vytváření skupiny",
"A valid group name must be provided" => "Musíte zadat platný název skupiny",
@@ -74,7 +78,6 @@ $TRANSLATIONS = array(
"undo" => "vrátit zpět",
"Groups" => "Skupiny",
"Group Admin" => "Správa skupiny",
-"Delete" => "Smazat",
"never" => "nikdy",
"deleted {userName}" => "smazán {userName}",
"add group" => "přidat skupinu",
@@ -100,27 +103,31 @@ $TRANSLATIONS = array(
"Setup Warning" => "Upozornění nastavení",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server není správně nastaven pro umožnění synchronizace, protože rozhraní WebDAV se zdá nefunkční.",
"Please double check the <a href=\"%s\">installation guides</a>." => "Zkontrolujte prosím znovu <a href=\"%s\">instalační příručku</a>.",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP je patrně nastaveno tak, aby odstraňovalo vnitřní části dokumentů. Toto bude mít za následek množsví nedostupných hlavních aplikací.",
+"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.",
"Database Performance Info" => "Informace o výkonu databáze",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Je použita databáze SQLite. Pro větší instalace doporučujeme toto změnit. Pro migraci na jiný typ databáze lze použít příkaz: 'occ db:convert-type'",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Je použita databáze SQLite. Pro větší instalace doporučujeme toto změnit. Pro migraci na jiný typ databáze lze použít nástroj pro příkazový řádek: 'occ db:convert-type'",
"Module 'fileinfo' missing" => "Schází modul 'fileinfo'",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Schází PHP modul 'fileinfo'. Doporučujeme jej povolit pro nejlepší výsledky detekce typů MIME.",
"Your PHP version is outdated" => "Vaše verze PHP je zastaralá",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Vámi používaná verze PHP je zastaralá. Důrazně doporučujeme aktualizovat na verzi 5.3.8 nebo novější, protože starší verze obsahují chyby. Je možné, že tato instalace nebude fungovat správně.",
+"PHP charset is not set to UTF-8" => "Znaková sada PHP není nastavena na UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Znaková sada PHP není nastavena na UTF-8. To může způsobit závažné problémy se jmény souborů se znaky neobsaženými v ASCII. Důrazně doporučujeme změnit hodnotu 'default_charset' v php.ini na 'UTF-8'.",
"Locale not working" => "Lokalizace nefunguje",
"System locale can not be set to a one which supports UTF-8." => "Není možné nastavit znakovou sadu, která podporuje UTF-8.",
"This means that there might be problems with certain characters in file names." => "To znamená, že se mohou vyskytnout problémy s určitými znaky v názvech souborů.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Důrazně doporučujeme nainstalovat do vašeho systém balíčky nutné pro podporu některé z následujících znakových sad: %s.",
"Internet connection not working" => "Připojení k internetu nefunguje",
"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." => "Server nemá funkční připojení k internetu. Některé moduly jako např. externí úložiště, oznámení o dostupných aktualizacích nebo instalace aplikací třetích stran nebudou fungovat. Přístup k souborům z jiných míst a odesílání oznamovacích e-mailů také nemusí fungovat. Pokud si přejete využívat všech vlastností ownCloud, doporučujeme povolit připojení k internetu tomuto serveru.",
+"URL generation in notification emails" => "Generování adresy URL v oznamovacích e-mailech",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Instalace mimo kořenový adresář domény a používání systémového příkazu cron může způsobit problém s generováním správné URL. Pro zabránění těmto chybám nastavte prosím správnou cestu ve svém config.php souboru v hodnotě \"overwritewebroot\" (Doporučujeme: \"%s\")",
"Cron" => "Cron",
"Last cron was executed at %s." => "Poslední cron byl spuštěn v %s",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Poslední cron byl spuštěn v %s. To je více než před hodinou. Vypadá to, že není něco v pořádku.",
"Cron was not executed yet!" => "Cron ještě nebyl spuštěn!",
"Execute one task with each page loaded" => "Spustit jednu úlohu s každým načtením stránky",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Použít systémovou službu cron pro spuštění souboru cron.php každých 15 minut.",
+"Use system's cron service to call the cron.php file every 15 minutes." => "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
"Sharing" => "Sdílení",
"Allow apps to use the Share API" => "Povolit aplikacím používat API sdílení",
"Allow users to share via link" => "Povolit uživatelům sdílení pomocí odkazů",
@@ -195,12 +202,20 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Vybrat jako profilový obrázek",
"Language" => "Jazyk",
"Help translate" => "Pomoci s překladem",
+"SSL root certificates" => "Kořenové certifikáty SSL",
+"Common Name" => "Common Name",
+"Valid until" => "Platný do",
+"Issued By" => "Vydal",
+"Valid until %s" => "Platný do %s",
+"Import Root Certificate" => "Import kořenového certifikátu",
"The encryption app is no longer enabled, please decrypt all your files" => "Šifrovací aplikace již není spuštěna, dešifrujte prosím všechny své soubory",
"Log-in password" => "Přihlašovací heslo",
"Decrypt all Files" => "Odšifrovat všechny soubory",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vaše šifrovací klíče byly zálohovány. Pokud se něco pokazilo, dají se znovu obnovit. Smažte je trvale pouze pokud jste jisti, že jsou všechny vaše soubory bezchybně dešifrovány.",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vaše šifrovací klíče byly zálohovány. Pokud se něco pokazí, můžete je obnovit. Smažte je trvale pouze pokud jste jisti, že jsou všechny vaše soubory bezchybně dešifrovány.",
"Restore Encryption Keys" => "Obnovit šifrovací klíče",
"Delete Encryption Keys" => "Smazat šifrovací klíče",
+"Show storage location" => "Zobrazit umístění úložiště",
+"Show last log in" => "Zobrazit poslední přihlášení",
"Login Name" => "Přihlašovací jméno",
"Create" => "Vytvořit",
"Admin Recovery Password" => "Heslo obnovy správce",
diff --git a/settings/l10n/cy_GB.php b/settings/l10n/cy_GB.php
index b99541b6cf5..9bcee30b28a 100644
--- a/settings/l10n/cy_GB.php
+++ b/settings/l10n/cy_GB.php
@@ -5,9 +5,9 @@ $TRANSLATIONS = array(
"Authentication error" => "Gwall dilysu",
"Invalid request" => "Cais annilys",
"Error" => "Gwall",
+"Delete" => "Dileu",
"undo" => "dadwneud",
"Groups" => "Grwpiau",
-"Delete" => "Dileu",
"never" => "byth",
"None" => "Dim",
"Login" => "Mewngofnodi",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 20fbde08cf1..1e01ee6d651 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret.",
"Unable to change password" => "Kunne ikke ændre kodeord",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Sikker på at du vil tilføje \"{domain}\" som et domæne du har tiilid til?",
+"Add trusted domain" => "Tilføj et domæne som du har tillid til",
"Sending..." => "Sender...",
"User Documentation" => "Brugerdokumentation",
"Admin Documentation" => "Administrator Dokumentation",
@@ -64,6 +66,8 @@ $TRANSLATIONS = array(
"So-so password" => "Jævnt kodeord",
"Good password" => "Godt kodeord",
"Strong password" => "Stærkt kodeord",
+"Valid until {date}" => "Gyldig indtil {date}",
+"Delete" => "Slet",
"Decrypting files... Please wait, this can take some time." => "Dekryptere filer... Vent venligst, dette kan tage lang tid. ",
"Delete encryption keys permanently." => "Slet krypteringsnøgler permanent.",
"Restore encryption keys." => "Genopret krypteringsnøgler.",
@@ -74,7 +78,6 @@ $TRANSLATIONS = array(
"undo" => "fortryd",
"Groups" => "Grupper",
"Group Admin" => "Gruppe Administrator",
-"Delete" => "Slet",
"never" => "aldrig",
"deleted {userName}" => "slettede {userName}",
"add group" => "Tilføj gruppe",
@@ -108,12 +111,16 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion.",
"Your PHP version is outdated" => "Din PHP-version er forældet",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Din PHP-version er forældet. Vi anbefaler at du opgraderer til 5.3.8 eller nyere, fordi ældre versioner har kendte fejl. Det er derfor muligt at installationen ikke fungerer korrekt.",
+"PHP charset is not set to UTF-8" => "PHP-tegnsættet er ikke angivet til UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP-tegnsættet er ikke angivet til UTF-8. Denne kan føre til store problemer med tegn som ikke er af typen ASCII i filnavne. Vi anbefaler kraftigt at ændre værdien for 'default_charset' i php.ini til 'UTF-8'.",
"Locale not working" => "Landestandard fungerer ikke",
"System locale can not be set to a one which supports UTF-8." => "Systemets locale kan ikke sættes til et der bruger UTF-8.",
"This means that there might be problems with certain characters in file names." => "Det betyder at der kan være problemer med visse tegn i filnavne.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Vi anbefaler at du installerer den krævede pakke på dit system, for at understøtte følgende locales: %s.",
"Internet connection not working" => "Internetforbindelse fungerer ikke",
"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." => "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af 3.-parts applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informationsemails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner.",
+"URL generation in notification emails" => "URL-oprettelse i email-notifikationer.",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Hvis din installation ikke er installeret i roden af domænet, og bruger systemets cron, så kan der være problemer med URL-oprettelsen. For at undgå disse problemer, så angiv tilvalget \"overwritewebroot\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
"Cron" => "Cron",
"Last cron was executed at %s." => "Seneste 'cron' blev kørt %s.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Seneste 'cron' blev kørt %s. Dette er over en time siden - noget må være galt.",
@@ -195,12 +202,20 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Vælg som profilbillede",
"Language" => "Sprog",
"Help translate" => "Hjælp med oversættelsen",
+"SSL root certificates" => "SSL-rodcertifikater",
+"Common Name" => "Almindeligt navn",
+"Valid until" => "Gyldig indtil",
+"Issued By" => "Udstedt af",
+"Valid until %s" => "Gyldig indtil %s",
+"Import Root Certificate" => "Importer rodcertifikat",
"The encryption app is no longer enabled, please decrypt all your files" => "Krypteringsprogrammet er ikke længere aktiveret. Dekrypter venligst alle dine filer",
"Log-in password" => "Log-in kodeord",
"Decrypt all Files" => "Dekrypter alle Filer ",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Din krypteringsmøgler er flyttet til en backup lokation . hvis noget gik galt kan du genskabe nøglerne. Slet kun nøgler permanent hvis du er sikker på at alle filer er dekrypteret korrekt.",
"Restore Encryption Keys" => "Genopret Krypteringsnøgler",
"Delete Encryption Keys" => "Slet Krypteringsnøgler",
+"Show storage location" => "Vis placering af lageret",
+"Show last log in" => "Vis seneste login",
"Login Name" => "Loginnavn",
"Create" => "Ny",
"Admin Recovery Password" => "Administrator gendannelse kodeord",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 00c47a913df..29a5ff4239e 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
"Unable to change password" => "Passwort konnte nicht geändert werden",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Bist Du dir wirklich sicher, dass Du \"{domain}\" als vertrauenswürdige Domain hinzufügen möchtest?",
+"Add trusted domain" => "Vertrauenswürdige Domain hinzufügen",
"Sending..." => "Sende...",
"User Documentation" => "Dokumentation für Benutzer",
"Admin Documentation" => "Admin-Dokumentation",
@@ -64,6 +66,8 @@ $TRANSLATIONS = array(
"So-so password" => "Durchschnittliches Passwort",
"Good password" => "Gutes Passwort",
"Strong password" => "Starkes Passwort",
+"Valid until {date}" => "Gültig bis {date}",
+"Delete" => "Löschen",
"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
"Delete encryption keys permanently." => "Verschlüsselungsschlüssel dauerhaft löschen.",
"Restore encryption keys." => "Verschlüsselungsschlüssel wiederherstellen.",
@@ -74,7 +78,6 @@ $TRANSLATIONS = array(
"undo" => "rückgängig machen",
"Groups" => "Gruppen",
"Group Admin" => "Gruppenadministrator",
-"Delete" => "Löschen",
"never" => "niemals",
"deleted {userName}" => "{userName} gelöscht",
"add group" => "Gruppe hinzufügen",
@@ -108,12 +111,16 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.",
"Your PHP version is outdated" => "Deine PHP-Version ist veraltet",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Deine PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert.",
+"PHP charset is not set to UTF-8" => "PHP-Zeichensatz ist nicht auf UTF-8 gesetzt",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP-Zeichensatz ist nicht auf UTF-8 gesetzt. Dies kann Fehler mit Nicht-ASCII Zeichen in Dateinamen verursachen. Wir empfehlen daher den Wert von 'default_charset' in der php.ini auf 'UTF-8' zu ändern.",
"Locale not working" => "Ländereinstellung funktioniert nicht",
"System locale can not be set to a one which supports UTF-8." => "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
"This means that there might be problems with certain characters in file names." => "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
"Internet connection not working" => "Keine Netzwerkverbindung",
"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, dass 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.",
+"URL generation in notification emails" => "URL-Generierung in Mail-Benachrichtungen",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die \"overwritewebroot\"-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: \"%s\").",
"Cron" => "Cron",
"Last cron was executed at %s." => "Letzter Cron wurde um %s ausgeführt.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
@@ -195,12 +202,20 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Als Profilbild wählen",
"Language" => "Sprache",
"Help translate" => "Hilf bei der Übersetzung",
+"SSL root certificates" => "SSL-Root-Zertifikate",
+"Common Name" => "Zuname",
+"Valid until" => "Gültig bis",
+"Issued By" => "Ausgestellt von:",
+"Valid until %s" => "Gültig bis %s",
+"Import Root Certificate" => "Root-Zertifikate importieren",
"The encryption app is no longer enabled, please decrypt all your files" => "Die Verschlüsselungsanwendung ist nicht länger aktiviert, bitte entschlüsseln Sie alle ihre Daten.",
"Log-in password" => "Login-Passwort",
"Decrypt all Files" => "Alle Dateien entschlüsseln",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Deine Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Lösche diese nur dann dauerhaft, wenn Du dir sicher bist, dass alle Dateien korrekt entschlüsselt wurden.",
"Restore Encryption Keys" => "Verschlüsselungsschlüssel wiederherstellen",
"Delete Encryption Keys" => "Verschlüsselungsschlüssel löschen",
+"Show storage location" => "Speicherort anzeigen",
+"Show last log in" => "Letzte Anmeldung anzeigen",
"Login Name" => "Loginname",
"Create" => "Anlegen",
"Admin Recovery Password" => "Admin-Wiederherstellungspasswort",
diff --git a/settings/l10n/de_AT.php b/settings/l10n/de_AT.php
index c1542941577..34177f8053c 100644
--- a/settings/l10n/de_AT.php
+++ b/settings/l10n/de_AT.php
@@ -1,10 +1,12 @@
<?php
$TRANSLATIONS = array(
"Invalid request" => "Fehlerhafte Anfrage",
+"Error" => "Fehler",
"Delete" => "Löschen",
"never" => "niemals",
"__language_name__" => "Deutsch (Österreich)",
"Server address" => "Adresse des Servers",
+"Port" => "Port",
"Password" => "Passwort",
"Email" => "E-Mail",
"Cancel" => "Abbrechen",
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
index 6e84e68c48e..841446a3e59 100644
--- a/settings/l10n/de_CH.php
+++ b/settings/l10n/de_CH.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Saved" => "Gespeichert",
"Email sent" => "Email gesendet",
"Encryption" => "Verschlüsselung",
"Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
@@ -28,11 +29,11 @@ $TRANSLATIONS = array(
"Error" => "Fehler",
"Update" => "Update durchführen",
"Updated" => "Aktualisiert",
+"Delete" => "Löschen",
"Decrypting files... Please wait, this can take some time." => "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
"undo" => "rückgängig machen",
"Groups" => "Gruppen",
"Group Admin" => "Gruppenadministrator",
-"Delete" => "Löschen",
"never" => "niemals",
"add group" => "Gruppe hinzufügen",
"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
@@ -93,6 +94,8 @@ $TRANSLATIONS = array(
"Cancel" => "Abbrechen",
"Language" => "Sprache",
"Help translate" => "Helfen Sie bei der Übersetzung",
+"SSL root certificates" => "SSL-Root-Zertifikate",
+"Import Root Certificate" => "Root-Zertifikate importieren",
"Log-in password" => "Login-Passwort",
"Decrypt all Files" => "Alle Dateien entschlüsseln",
"Login Name" => "Loginname",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 654699b3cc5..9c84403794c 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -5,9 +5,9 @@ $TRANSLATIONS = array(
"test email settings" => "E-Mail-Einstellungen testen",
"If you received this email, the settings seem to be correct." => "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt.",
"A problem occurred while sending the e-mail. Please revisit your settings." => "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfen Sie Ihre Einstellungen.",
-"Email sent" => "Email gesendet",
-"You need to set your user email before being able to send test emails." => "Sie müssen Ihre Benutzer-E-Mail-Adresse setzen, bevor Sie Test-E-Mails versenden können.",
-"Send mode" => "Sende-Modus",
+"Email sent" => "E-Mail gesendet",
+"You need to set your user email before being able to send test emails." => "Sie müssen Ihre Benutzer-E-Mail-Adresse einstellen, bevor Sie Test-E-Mails versenden können.",
+"Send mode" => "Sendemodus",
"Encryption" => "Verschlüsselung",
"Authentication method" => "Authentifizierungsmethode",
"Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
@@ -26,7 +26,7 @@ $TRANSLATIONS = array(
"Invalid email" => "Ungültige E-Mail-Adresse",
"Unable to delete group" => "Die Gruppe konnte nicht gelöscht werden",
"Unable to delete user" => "Der Benutzer konnte nicht gelöscht werden",
-"Backups restored successfully" => "Backups erfolgreich wiederhergestellt",
+"Backups restored successfully" => "Sicherungen erfolgreich wiederhergestellt",
"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
"Language changed" => "Sprache geändert",
"Invalid request" => "Ungültige Anforderung",
@@ -40,7 +40,9 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
"Unable to change password" => "Passwort konnte nicht geändert werden",
-"Sending..." => "Sende...",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Sind Sie sich wirklich sicher, dass Sie \"{domain}\" als vertrauenswürdige Domain hinzufügen möchten?",
+"Add trusted domain" => "Vertrauenswürdige Domain hinzufügen",
+"Sending..." => "Wird gesendet …",
"User Documentation" => "Dokumentation für Benutzer",
"Admin Documentation" => "Dokumentation für Administratoren",
"Update to {appversion}" => "Update zu {appversion}",
@@ -55,7 +57,7 @@ $TRANSLATIONS = array(
"Error" => "Fehler",
"Update" => "Update durchführen",
"Updated" => "Aktualisiert",
-"Uninstalling ...." => "Deinstalliere ....",
+"Uninstalling ...." => "Wird deinstalliert …",
"Error while uninstalling app" => "Fehler beim Deinstallieren der App",
"Uninstall" => "Deinstallieren",
"Select a profile picture" => "Wählen Sie ein Profilbild",
@@ -64,6 +66,8 @@ $TRANSLATIONS = array(
"So-so password" => "Passables Passwort",
"Good password" => "Gutes Passwort",
"Strong password" => "Starkes Passwort",
+"Valid until {date}" => "Gültig bis {date}",
+"Delete" => "Löschen",
"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
"Delete encryption keys permanently." => "Verschlüsselungsschlüssel dauerhaft löschen.",
"Restore encryption keys." => "Verschlüsselungsschlüssel wiederherstellen.",
@@ -74,7 +78,6 @@ $TRANSLATIONS = array(
"undo" => "rückgängig machen",
"Groups" => "Gruppen",
"Group Admin" => "Gruppenadministrator",
-"Delete" => "Löschen",
"never" => "niemals",
"deleted {userName}" => "{userName} gelöscht",
"add group" => "Gruppe hinzufügen",
@@ -83,7 +86,7 @@ $TRANSLATIONS = array(
"A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
"Warning: Home directory for user \"{user}\" already exists" => "Warnung: Das Benutzerverzeichnis für den Benutzer \"{user}\" existiert bereits",
"__language_name__" => "Deutsch (Förmlich: Sie)",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Alles (fatale Probleme, Fehler, Warnungen, Infos, Debug-Meldungen)",
+"Everything (fatal issues, errors, warnings, info, debug)" => "Alles (fatale Probleme, Fehler, Warnungen, Infos, Fehlerdiagnose)",
"Info, warnings, errors and fatal issues" => "Infos, Warnungen, Fehler und fatale Probleme",
"Warnings, errors and fatal issues" => "Warnungen, Fehler und fatale Probleme",
"Errors and fatal issues" => "Fehler und fatale Probleme",
@@ -102,18 +105,22 @@ $TRANSLATIONS = array(
"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte prüfen Sie nochmals die <a href=\"%s\">Installationsanleitungen</a>.",
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie z.B. OPcache oder eAccelerator verursacht.",
-"Database Performance Info" => "Info zur Datenbankperformance",
+"Database Performance Info" => "Info zur Datenbankleistung",
"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite wird als Datenbank verwendet. Für größere Installationen muss dies geändert werden. Zur Migration in eine andere Datenbank muss der Komandozeilenbefehl: 'occ db:convert-type' verwendet werden.",
"Module 'fileinfo' missing" => "Das Modul 'fileinfo' fehlt",
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
"Your PHP version is outdated" => "Ihre PHP-Version ist veraltet",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Ihre PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert.",
+"PHP charset is not set to UTF-8" => "PHP-Zeichensatz ist nicht auf UTF-8 eingestellt",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP-Zeichensatz ist nicht auf UTF-8 gesetzt. Dies kann Fehler mit Nicht-ASCII Zeichen in Dateinamen verursachen. Wir empfehlen daher den Wert von 'default_charset' in der php.ini auf 'UTF-8' zu ändern.",
"Locale not working" => "Die Lokalisierung funktioniert nicht",
"System locale can not be set to a one which supports UTF-8." => "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
-"This means that there might be problems with certain characters in file names." => "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
+"This means that there might be problems with certain characters in file names." => "Dieses bedeutet, dass es Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
"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, dass 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 Versenden von Mail-Benachrichtigungen funktionieren eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen.",
+"URL generation in notification emails" => "URL-Generierung in Mail-Benachrichtungen",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setzen Sie bitte die \"overwritewebroot\"-Option in Ihrer config.php auf das Web-Wurzelverzeichnis Ihrer Installation (Vorschlag: \"%s\").",
"Cron" => "Cron",
"Last cron was executed at %s." => "Letzter Cron wurde um %s ausgeführt.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
@@ -126,7 +133,7 @@ $TRANSLATIONS = array(
"Allow users to share via link" => "Erlaube Nutzern, mithilfe von Links zu teilen",
"Enforce password protection" => "Passwortschutz erzwingen",
"Allow public uploads" => "Öffentliches Hochladen erlauben",
-"Set default expiration date" => "Setze Ablaufdatum",
+"Set default expiration date" => "Standardablaufdatum einstellen",
"Expire after " => "Ablauf nach ",
"days" => "Tagen",
"Enforce expiration date" => "Ablaufdatum erzwingen",
@@ -195,27 +202,35 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Als Profilbild wählen",
"Language" => "Sprache",
"Help translate" => "Helfen Sie bei der Übersetzung",
+"SSL root certificates" => "SSL-Root-Zertifikate",
+"Common Name" => "Zuname",
+"Valid until" => "Gültig bis",
+"Issued By" => "Ausgestellt von:",
+"Valid until %s" => "Gültig bis %s",
+"Import Root Certificate" => "Root-Zertifikate importieren",
"The encryption app is no longer enabled, please decrypt all your files" => "Die Verschlüsselungsanwendung ist nicht länger aktiv, bitte entschlüsseln Sie alle ihre Daten",
"Log-in password" => "Login-Passwort",
"Decrypt all Files" => "Alle Dateien entschlüsseln",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Ihre Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Löschen Sie diese nur dann dauerhaft, wenn Sie sich sicher sind, dass alle Dateien korrekt entschlüsselt wurden.",
"Restore Encryption Keys" => "Verschlüsselungsschlüssel wiederherstellen",
"Delete Encryption Keys" => "Verschlüsselungsschlüssel löschen",
+"Show storage location" => "Speicherort anzeigen",
+"Show last log in" => "Letzte Anmeldung anzeigen",
"Login Name" => "Loginname",
"Create" => "Erstellen",
"Admin Recovery Password" => "Admin-Passwort-Wiederherstellung",
"Enter the recovery password in order to recover the users files during password change" => "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
-"Search Users and Groups" => "Nutzer und Gruppen suchen",
+"Search Users and Groups" => "Benutzer und Gruppen suchen",
"Add Group" => "Gruppe hinzufügen",
"Group" => "Gruppe",
"Everyone" => "Jeder",
"Admins" => "Administratoren",
-"Default Quota" => "Standard-Quota",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Bitte Speicherkontingent eingeben (z.B.: \"512 MB\" oder \"12 GB\")",
+"Default Quota" => "Standardkontingent",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Bitte Speicherkontingent eingeben (z.B.: „512 MB“ oder „12 GB“)",
"Unlimited" => "Unbegrenzt",
"Other" => "Andere",
"Username" => "Benutzername",
-"Quota" => "Quota",
+"Quota" => "Kontingent",
"Storage Location" => "Speicherort",
"Last Login" => "Letzte Anmeldung",
"change full name" => "Vollständigen Namen ändern",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index ab9ef049df3..4ed7b0f9b83 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Λάθος κωδικός ανάκτησης διαχειριστή. Παρακαλώ ελέγξτε τον κωδικό και δοκιμάστε ξανά.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Το βασικό πλαίσιο δεν υποστηρίζει αλλαγή κωδικού, αλλά το κλειδί κρυπτογράφησης των χρηστών ενημερώθηκε επιτυχώς.",
"Unable to change password" => "Αδυναμία αλλαγής συνθηματικού",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Είστε πραγματικά σίγουροι ότι θέλετε να προσθέσετε το \"{domain}\" σαν αξιόπιστη περιοχή;",
+"Add trusted domain" => "Προσθέστε αξιόπιστη περιοχή",
"Sending..." => "Αποστέλεται...",
"User Documentation" => "Τεκμηρίωση Χρήστη",
"Admin Documentation" => "Τεκμηρίωση Διαχειριστή",
@@ -64,6 +66,7 @@ $TRANSLATIONS = array(
"So-so password" => "Μέτριο συνθηματικό",
"Good password" => "Καλό συνθηματικό",
"Strong password" => "Δυνατό συνθηματικό",
+"Delete" => "Διαγραφή",
"Decrypting files... Please wait, this can take some time." => "Αποκρυπτογράφηση αρχείων... Παρακαλώ περιμένετε, αυτό μπορεί να πάρει κάποιο χρόνο.",
"Delete encryption keys permanently." => "Οριστική διαγραφή των κλειδιων κρυπτογράφησης.",
"Restore encryption keys." => "Επαναφορά των κλειδιών κρυπτογράφησης.",
@@ -74,7 +77,6 @@ $TRANSLATIONS = array(
"undo" => "αναίρεση",
"Groups" => "Ομάδες",
"Group Admin" => "Ομάδα Διαχειριστών",
-"Delete" => "Διαγραφή",
"never" => "ποτέ",
"deleted {userName}" => "διαγραφή {userName}",
"add group" => "προσθήκη ομάδας",
@@ -108,12 +110,16 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Η PHP ενοτητα 'fileinfo' λειπει. Σας συνιστούμε να ενεργοποιήσετε αυτή την ενότητα για να έχετε καλύτερα αποτελέσματα με τον εντοπισμό τύπου MIME. ",
"Your PHP version is outdated" => "Η έκδοση PHP είναι απαρχαιωμένη",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Η έκδοση PHP είναι απαρχαιωμένη. Συνιστούμε ανεπιφύλακτα να ενημερώσετε στην 5.3.8 ή νεώτερη καθώς παλαιότερες εκδόσεις είναι γνωστό πως περιέχουν σφάλματα. Είναι πιθανόν ότι αυτή η εγκατάσταση δεν λειτουργεί σωστά.",
+"PHP charset is not set to UTF-8" => "Το σύνολο χαρακτήρων PHP δεν έχει οριστεί στο UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Το σύνολο χαρακτήρων PHP δεν έχει οριστεί στο UTF-8. Αυτό μπορεί να προκαλέσει τεράστια ζητήματα με χωρίς-ASCII χαρακτήρες στα ονόματα των αρχείων. Συνιστούμε ανεπιφύλακτα να αλλάξετε την αξία του 'default_charset' php.ini στο 'UTF-8'.",
"Locale not working" => "Η μετάφραση δεν δουλεύει",
"System locale can not be set to a one which supports UTF-8." => "Οι ρυθμίσεις τοποθεσίας συστήματος δεν μπορούν να οριστούν σε κάποιες που δεν υποστηρίζουν UTF-8.",
"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 one of the following locales: %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." => "Αυτός ο διακομιστής δεν έχει ενεργή σύνδεση στο διαδίκτυο. Αυτό σημαίνει ότι κάποιες υπηρεσίες όπως η σύνδεση με εξωτερικούς αποθηκευτικούς χώρους, ειδοποιήσεις περί ενημερώσεων ή η εγκατάσταση 3ων εφαρμογών δεν θα είναι διαθέσιμες. Η πρόσβαση απομακρυσμένων αρχείων και η αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου μπορεί επίσης να μην είναι διαθέσιμες. Προτείνουμε να ενεργοποιήσετε την πρόσβαση στο διαδίκτυο για αυτόν το διακομιστή εάν θέλετε να χρησιμοποιήσετε όλες τις υπηρεσίες.",
+"URL generation in notification emails" => "Δημιουργία URL στις ειδοποιήσεις ηλεκτρονικού ταχυδρομείου",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Αν η εγκατάστασή σας δεν είναι εγκατεστημένη στη ρίζα της περιοχής και χρησιμοποιεί το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή \"overwritewebroot\" στον config.php φάκελό σας στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
"Cron" => "Cron",
"Last cron was executed at %s." => "Η τελευταία εκτέλεση του cron ήταν στις %s",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Η τελευταία εκτέλεση του cron ήταν στις %s. Αυτό είναι πάνω από μια ώρα πριν, ίσως κάτι δεν πάει καλά.",
@@ -195,12 +201,15 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Επιλογή εικόνας προφίλ",
"Language" => "Γλώσσα",
"Help translate" => "Βοηθήστε στη μετάφραση",
+"SSL root certificates" => "Πιστοποιητικά SSL root",
+"Import Root Certificate" => "Εισαγωγή Πιστοποιητικού Root",
"The encryption app is no longer enabled, please decrypt all your files" => "Η εφαρμογή κρυπτογράφησης δεν είναι πλέον ενεργοποιημένη, παρακαλώ αποκρυπτογραφήστε όλα τα αρχεία σας",
"Log-in password" => "Συνθηματικό εισόδου",
"Decrypt all Files" => "Αποκρυπτογράφηση όλων των Αρχείων",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Τα κλειδιά κρυπτογράφησής σας μεταφέρονται σε θέση αντιγράφου ασφαλείας. Αν κάτι πάει στραβά, μπορείτε να τα επαναφέρετε. Διαγράψτε τα οριστικά μόνο αν είστε βέβαιοι ότι όλα τα αρχεία αποκρυπτογραφήθηκαν σωστά.",
"Restore Encryption Keys" => "Επαναφορά κλειδιών κρυπτογράφησης",
"Delete Encryption Keys" => "Διαγραφή κλειδιών κρυπτογράφησης",
+"Show last log in" => "Εμφάνιση τελευταίας εισόδου",
"Login Name" => "Όνομα Σύνδεσης",
"Create" => "Δημιουργία",
"Admin Recovery Password" => "Κωδικός Επαναφοράς Διαχειριστή ",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index 398746ee3a7..128c68237a6 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Incorrect admin recovery password. Please check the password and try again.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end doesn't support password change, but the user's encryption key was successfully updated.",
"Unable to change password" => "Unable to change password",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Are you really sure you want add \"{domain}\" as a trusted domain?",
+"Add trusted domain" => "Add trusted domain",
"Sending..." => "Sending...",
"User Documentation" => "User Documentation",
"Admin Documentation" => "Admin Documentation",
@@ -64,6 +66,8 @@ $TRANSLATIONS = array(
"So-so password" => "So-so password",
"Good password" => "Good password",
"Strong password" => "Strong password",
+"Valid until {date}" => "Valid until {date}",
+"Delete" => "Delete",
"Decrypting files... Please wait, this can take some time." => "Decrypting files... Please wait, this can take some time.",
"Delete encryption keys permanently." => "Delete encryption keys permanently.",
"Restore encryption keys." => "Restore encryption keys.",
@@ -74,7 +78,6 @@ $TRANSLATIONS = array(
"undo" => "undo",
"Groups" => "Groups",
"Group Admin" => "Group Admin",
-"Delete" => "Delete",
"never" => "never",
"deleted {userName}" => "deleted {userName}",
"add group" => "add group",
@@ -108,12 +111,16 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection.",
"Your PHP version is outdated" => "Your PHP version is outdated",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly.",
+"PHP charset is not set to UTF-8" => "PHP charset is not set to UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'.",
"Locale not working" => "Locale not working",
"System locale can not be set to a one which supports UTF-8." => "System locale can not be set to a one which supports UTF-8.",
"This means that there might be problems with certain characters in file names." => "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 one of the following locales: %s." => "We strongly suggest installing the required packages on your system to support one of the following locales: %s.",
"Internet connection not working" => "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." => "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.",
+"URL generation in notification emails" => "URL generation in notification emails",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
"Cron" => "Cron",
"Last cron was executed at %s." => "Last cron was executed at %s.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Last cron was executed at %s. This is more than an hour ago, something seems wrong.",
@@ -195,12 +202,20 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Choose as profile image",
"Language" => "Language",
"Help translate" => "Help translate",
+"SSL root certificates" => "SSL root certificates",
+"Common Name" => "Common Name",
+"Valid until" => "Valid until",
+"Issued By" => "Issued By",
+"Valid until %s" => "Valid until %s",
+"Import Root Certificate" => "Import Root Certificate",
"The encryption app is no longer enabled, please decrypt all your files" => "The encryption app is no longer enabled, please decrypt all your files",
"Log-in password" => "Log-in password",
"Decrypt all Files" => "Decrypt all Files",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly.",
"Restore Encryption Keys" => "Restore Encryption Keys",
"Delete Encryption Keys" => "Delete Encryption Keys",
+"Show storage location" => "Show storage location",
+"Show last log in" => "Show last log in",
"Login Name" => "Login Name",
"Create" => "Create",
"Admin Recovery Password" => "Admin Recovery Password",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 56a5e89f4a2..d9f0e5b3f1e 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -50,13 +50,13 @@ $TRANSLATIONS = array(
"So-so password" => "Mezaĉa pasvorto",
"Good password" => "Bona pasvorto",
"Strong password" => "Forta pasvorto",
+"Delete" => "Forigi",
"Delete encryption keys permanently." => "Forigi ĉifroklavojn por ĉiam.",
"Restore encryption keys." => "Restaŭri ĉifroklavojn.",
"deleted {groupName}" => "{groupName} foriĝis",
"undo" => "malfari",
"Groups" => "Grupoj",
"Group Admin" => "Grupadministranto",
-"Delete" => "Forigi",
"never" => "neniam",
"deleted {userName}" => "{userName} foriĝis",
"add group" => "aldoni grupon",
@@ -137,6 +137,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Elekti kiel profilan bildon",
"Language" => "Lingvo",
"Help translate" => "Helpu traduki",
+"SSL root certificates" => "Radikaj SSL-atestoj",
+"Import Root Certificate" => "Enporti radikan ateston",
"Log-in password" => "Ensaluta pasvorto",
"Decrypt all Files" => "Malĉifri ĉiujn dosierojn",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Viaj ĉifroklavoj moviĝis al savokopia loko. Se io malsukcesas, vi povas restaŭri la klavojn. Nur forigu ilin porĉiame se vi certas, ke ĉiuj dosieroj malĉifriĝis korekte.",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 85f4902b2c3..807cab0a712 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
"Unable to change password" => "No se ha podido cambiar la contraseña",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "¿Está seguro de querer agregar \"{domain}\" como un dominio de confianza?",
+"Add trusted domain" => "Agregar dominio de confianza",
"Sending..." => "Enviando...",
"User Documentation" => "Documentación de usuario",
"Admin Documentation" => "Documentación para administradores",
@@ -64,6 +66,8 @@ $TRANSLATIONS = array(
"So-so password" => "Contraseña pasable",
"Good password" => "Contraseña buena",
"Strong password" => "Contraseña muy buena",
+"Valid until {date}" => "Válido hasta {date}",
+"Delete" => "Eliminar",
"Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
"Delete encryption keys permanently." => "Eliminar claves de cifrado permanentemente.",
"Restore encryption keys." => "Restaurar claves de cifrado.",
@@ -74,7 +78,6 @@ $TRANSLATIONS = array(
"undo" => "deshacer",
"Groups" => "Grupos",
"Group Admin" => "Administrador del Grupo",
-"Delete" => "Eliminar",
"never" => "nunca",
"deleted {userName}" => "borrado {userName}",
"add group" => "añadir Grupo",
@@ -108,12 +111,16 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.",
"Your PHP version is outdated" => "Su versión de PHP no está actualizada",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Su versión de PHP ha caducado. Le sugerimos encarecidamente que la actualize a 5.3.8 o a una más nueva porque normalmente las versiones antiguas no funcionan bien. Puede ser que esta instalación no esté funcionando bien por ello.",
+"PHP charset is not set to UTF-8" => "El conjunto de caracteres de PHP no está establecido en UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "El set de caracteres usado por PHP no es UTF-8. Esto puede causar grandes problemas con nombres de archivos que contengan caracteres que no sean ASCII. Recomendamos encarecidamente cambiar el valor de 'default_charset' en php.ini a 'UTF-8'.",
"Locale not working" => "La configuración regional no está funcionando",
"System locale can not be set to a one which supports UTF-8." => "No se puede escoger una configuración regional que soporte UTF-8.",
"This means that there might be problems with certain characters in file names." => "Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
"Internet connection not working" => "La conexión a Internet no está funcionando",
"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." => "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones.",
+"URL generation in notification emails" => "Generación de URL en mensajes de notificación",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Si su instalación no está ubicada en la raíz del dominio y usa el cron del sistema, puede haber problemas al generarse los URL. Para evitarlos, configure la opción \"overwritewebroot\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
"Cron" => "Cron",
"Last cron was executed at %s." => "Cron fue ejecutado por última vez a las %s.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Cron fue ejecutado por última vez a las %s. Esto fue hace más de una hora, algo anda mal.",
@@ -124,7 +131,7 @@ $TRANSLATIONS = array(
"Sharing" => "Compartiendo",
"Allow apps to use the Share API" => "Permitir a las aplicaciones utilizar la API de Compartición",
"Allow users to share via link" => "Permite a los usuarios compartir por medio de enlaces",
-"Enforce password protection" => "Mejora la protección por contraseña.",
+"Enforce password protection" => "Forzar la protección por contraseña.",
"Allow public uploads" => "Permitir subidas públicas",
"Set default expiration date" => "Establecer fecha de caducidad predeterminada",
"Expire after " => "Caduca luego de",
@@ -195,12 +202,20 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Seleccionar como imagen de perfil",
"Language" => "Idioma",
"Help translate" => "Ayúdanos a traducir",
+"SSL root certificates" => "Certificados raíz SSL",
+"Common Name" => "Nombre común",
+"Valid until" => "Válido hasta",
+"Issued By" => "Emitido por",
+"Valid until %s" => "Válido hasta %s",
+"Import Root Certificate" => "Importar certificado raíz",
"The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
"Log-in password" => "Contraseña de acceso",
"Decrypt all Files" => "Descifrar archivos",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Sus claves de cifrado se archivarán en una localización segura. Así en caso de que algo fuese mal podrá recuperan sus claves. Borre sus claves de cifrado permanentemente solamente si esta seguro de que sus archivos han sido descifrados correctamente.",
"Restore Encryption Keys" => "Restaurar claves de cifrado",
"Delete Encryption Keys" => "Eliminar claves de cifrado",
+"Show storage location" => "Mostrar la ubicación del almacenamiento",
+"Show last log in" => "Mostrar el último inicio de sesión",
"Login Name" => "Nombre de usuario",
"Create" => "Crear",
"Admin Recovery Password" => "Recuperación de la contraseña de administración",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index fcd9e43b77e..dfcbe71fba4 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -53,11 +53,11 @@ $TRANSLATIONS = array(
"So-so password" => "Contraseña de nivel medio. ",
"Good password" => "Buena contraseña. ",
"Strong password" => "Contraseña fuerte.",
+"Delete" => "Borrar",
"Decrypting files... Please wait, this can take some time." => "Desencriptando archivos... Por favor espere, esto puede tardar.",
"undo" => "deshacer",
"Groups" => "Grupos",
"Group Admin" => "Grupo Administrador",
-"Delete" => "Borrar",
"never" => "nunca",
"add group" => "agregar grupo",
"A valid username must be provided" => "Debe ingresar un nombre de usuario válido",
@@ -157,6 +157,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Elegir como imagen de perfil",
"Language" => "Idioma",
"Help translate" => "Ayudanos a traducir",
+"SSL root certificates" => "certificados SSL raíz",
+"Import Root Certificate" => "Importar certificado raíz",
"The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos.",
"Log-in password" => "Clave de acceso",
"Decrypt all Files" => "Desencriptar todos los archivos",
diff --git a/settings/l10n/es_MX.php b/settings/l10n/es_MX.php
index f2f1ff1a843..d6037fe057f 100644
--- a/settings/l10n/es_MX.php
+++ b/settings/l10n/es_MX.php
@@ -37,11 +37,11 @@ $TRANSLATIONS = array(
"Update" => "Actualizar",
"Updated" => "Actualizado",
"Select a profile picture" => "Seleccionar una imagen de perfil",
+"Delete" => "Eliminar",
"Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
"undo" => "deshacer",
"Groups" => "Grupos",
"Group Admin" => "Administrador del Grupo",
-"Delete" => "Eliminar",
"never" => "nunca",
"add group" => "añadir Grupo",
"A valid username must be provided" => "Se debe proporcionar un nombre de usuario válido",
@@ -123,6 +123,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Seleccionar como imagen de perfil",
"Language" => "Idioma",
"Help translate" => "Ayúdanos a traducir",
+"SSL root certificates" => "Certificados raíz SSL",
+"Import Root Certificate" => "Importar certificado raíz",
"The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
"Log-in password" => "Contraseña de acceso",
"Decrypt all Files" => "Descifrar archivos",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 2c38d9c201b..55b6586f737 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt.",
"Unable to change password" => "Ei suuda parooli muuta",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Oled sa kindel, et soovid lisada domeeni \"{domain}\" usaldusväärseks domeeniks?",
+"Add trusted domain" => "Lis ausaldusväärne domeen",
"Sending..." => "Saadan...",
"User Documentation" => "Kasutaja dokumentatsioon",
"Admin Documentation" => "Admin dokumentatsioon",
@@ -64,6 +66,8 @@ $TRANSLATIONS = array(
"So-so password" => "Enam-vähem sobiv parool",
"Good password" => "Hea parool",
"Strong password" => "Väga hea parool",
+"Valid until {date}" => "Kehtib kuni {date}",
+"Delete" => "Kustuta",
"Decrypting files... Please wait, this can take some time." => "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.",
"Delete encryption keys permanently." => "Kustuta krüpteerimisvõtmed lõplikult",
"Restore encryption keys." => "Taasta krüpteerimisvõtmed.",
@@ -74,7 +78,6 @@ $TRANSLATIONS = array(
"undo" => "tagasi",
"Groups" => "Grupid",
"Group Admin" => "Grupi admin",
-"Delete" => "Kustuta",
"never" => "mitte kunagi",
"deleted {userName}" => "kustutatud {userName}",
"add group" => "lisa grupp",
@@ -108,12 +111,16 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP moodul 'fileinfo' puudub. Soovitame tungivalt see lisada saavutamaks parimaid tulemusi failitüüpide tuvastamisel.",
"Your PHP version is outdated" => "PHP versioon on aegunud",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Sinu PHP versioon on aegunud. Soovitame tungivalt uuenda versioonile 5.3.8 või uuemale, kuna varasemad versioonid on teadaolevalt vigased. On võimalik, et see käesolev paigaldus ei toimi korrektselt.",
+"PHP charset is not set to UTF-8" => "PHP märgistik pole UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP märgistikuks pole määratud UTF-8. See võib tekitada failinimedes mitte-ASCII märkidega suuri probleeme. Me soovitame tungivalt panna failis php.ini sätte 'default_charset' väärtuseks 'UTF-8'.",
"Locale not working" => "Lokalisatsioon ei toimi",
"System locale can not be set to a one which supports UTF-8." => "Süsteemi lokaliseeringuks ei saa panna sellist, mis toetab UTF-8-t.",
"This means that there might be problems with certain characters in file names." => "See tähendab, et võib esineda probleeme failide nimedes mõnede sümbolitega.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Soovitame tungivalt paigaldada vajalikud paketid oma süsteemi tagamaks tuge järgmistele lokaliseeringutele: %s.",
"Internet connection not working" => "Internetiühendus ei toimi",
"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." => "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti.",
+"URL generation in notification emails" => "URL-ide loomine teavituskirjades",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Kui sinu sait pole paigaldatud domeeni juurkausta ja see kasutab ajastatud tegevusi, siis võib tekkide probleeme URL-ide loomisega. Nende probleemide vältimiseks sisesta palun failis config.php valikusse \"overwritewebroot\" oma veebiserveri juurkaust (Soovituslik: \"%s\")",
"Cron" => "Cron",
"Last cron was executed at %s." => "Cron käivitati viimati %s.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Cron käivitati viimati %s. See on rohkem kui tund tagasi, midagi on valesti.",
@@ -195,12 +202,20 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Vali profiilipildiks",
"Language" => "Keel",
"Help translate" => "Aita tõlkida",
+"SSL root certificates" => "SSL root sertifikaadid",
+"Common Name" => "Üldnimetus",
+"Valid until" => "Kehtib kuni",
+"Issued By" => "isas",
+"Valid until %s" => "Kehtib kuni %s",
+"Import Root Certificate" => "Impordi root sertifikaadid",
"The encryption app is no longer enabled, please decrypt all your files" => "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid",
"Log-in password" => "Sisselogimise parool",
"Decrypt all Files" => "Dekrüpteeri kõik failid",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Sinu krüpteerimisvõtmed on tõstetud varukoopiasse. Kui midagi läheb valesti, siis saad võtmed taastada. Kustuta lõplikult ainult juhul kui oled kindel, et failid on dekrüteeritud korrektselt.",
"Restore Encryption Keys" => "Taasta krüpteerimisvõtmed",
"Delete Encryption Keys" => "Kustuta krüpteerimisvõtmed",
+"Show storage location" => "Näita salvestusruumi asukohta",
+"Show last log in" => "Viimane sisselogimine",
"Login Name" => "Kasutajanimi",
"Create" => "Lisa",
"Admin Recovery Password" => "Admini parooli taastamine",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index b67f83ea156..d7d848ef548 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Administratzailearen berreskuratze pasahitza ez egokia. Mesedez egiaztatu pasahitza eta saiatu berriz.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Atzeko prozesuak ez du pasahitz aldaketa onartzen, baina erabiltzailearen enkriptatze gakoa ongi eguneratu da.",
"Unable to change password" => "Ezin izan da pasahitza aldatu",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Ziur zaude gehitu nahi duzula \"{domain}\" domeinu fidagarri gisa?",
+"Add trusted domain" => "Gehitu domeinu fidagarria",
"Sending..." => "Bidaltzen...",
"User Documentation" => "Erabiltzaile dokumentazioa",
"Admin Documentation" => "Administrazio dokumentazioa",
@@ -64,6 +66,7 @@ $TRANSLATIONS = array(
"So-so password" => "Halamoduzko pasahitza",
"Good password" => "Pasahitz ona",
"Strong password" => "Pasahitz sendoa",
+"Delete" => "Ezabatu",
"Decrypting files... Please wait, this can take some time." => "Fitxategiak deskodetzen... Itxaron, bere denbora eskatzen du.",
"Delete encryption keys permanently." => "Ezabatu enkriptatze gakoak behin betiko",
"Restore encryption keys." => "Leheneratu enkriptatze gakoak",
@@ -74,7 +77,6 @@ $TRANSLATIONS = array(
"undo" => "desegin",
"Groups" => "Taldeak",
"Group Admin" => "Talde administradorea",
-"Delete" => "Ezabatu",
"never" => "inoiz",
"deleted {userName}" => "{userName} ezabatuta",
"add group" => "gehitu taldea",
@@ -108,12 +110,16 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko.",
"Your PHP version is outdated" => "Zure PHP bertsioa zaharkituta dago",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Zure PHP bertsioa zaharkituta dago. Gure aholkua 5.3.8 edo bertsio berriago batera eguneratzea da, bertsio zaharragoak arazoak ematen baitituzte. Posible da instalazio honek ez funtzionatzea ongi.",
+"PHP charset is not set to UTF-8" => "PHP charset ez da UTF-8 gisa ezartzen",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP charset ez da UTF-8 gisa ezartzen. Honek arazo larriak sor ditzake fitxategien izenetan ascii ez diren karaktereekin. Gomendatzen dizugu php.ini-ko 'default_charset'-en ordez 'UTF-8' ezartzea.",
"Locale not working" => "Lokala ez dabil",
"System locale can not be set to a one which supports UTF-8." => "Eskualdeko ezarpena ezin da UTF-8 onartzen duen batera ezarri.",
"This means that there might be problems with certain characters in file names." => "Honek esan nahi du fitxategien izenetako karaktere batzuekin arazoak egon daitezkeela.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Biziki gomendatzen dizugu beharrezkoak diren paketea zure sisteman instalatzea honi euskarria eman ahal izateko: %s.",
"Internet connection not working" => "Interneteko konexioak ez du funtzionatzen",
"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." => "Zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu.",
+"URL generation in notification emails" => "URL sorrera jakinarazpen mezuetan",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Zure instalazioa ez badago domeinuaren sustraian egina eta erabiltzen badu sistemaren cron-a, arazoak izan daitezke URL sorreran. Arazo horiek saihesteko ezarri \"overwritewebroot\" opzioa zure config.php fitxategian zure instalazioaren webroot bidera (Proposatua: \"%s\")",
"Cron" => "Cron",
"Last cron was executed at %s." => "Azken cron-a %s-etan exekutatu da",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Azken cron-a %s-etan exekutatu da. Ordu bat baino gehiago pasa da, zerbait gaizki dabilela dirudi.",
@@ -195,6 +201,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Profil irudi bezala aukeratu",
"Language" => "Hizkuntza",
"Help translate" => "Lagundu itzultzen",
+"SSL root certificates" => "SSL erro ziurtagiriak",
+"Import Root Certificate" => "Inportatu erro ziurtagiria",
"The encryption app is no longer enabled, please decrypt all your files" => "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak.",
"Log-in password" => "Saioa hasteko pasahitza",
"Decrypt all Files" => "Desenkripattu fitxategi guztiak",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index c9790db43c2..eb277c9c26e 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -57,6 +57,7 @@ $TRANSLATIONS = array(
"So-so password" => "رمز عبور متوسط",
"Good password" => "رمز عبور خوب",
"Strong password" => "رمز عبور قوی",
+"Delete" => "حذف",
"Decrypting files... Please wait, this can take some time." => "در حال بازگشایی رمز فایل‌ها... لطفاً صبر نمایید. این امر ممکن است مدتی زمان ببرد.",
"Delete encryption keys permanently." => "کلید های رمزگذاری به طوز کامل حذف شوند.",
"Restore encryption keys." => "بازیابی کلیدهای رمزگذاری.",
@@ -67,7 +68,6 @@ $TRANSLATIONS = array(
"undo" => "بازگشت",
"Groups" => "گروه ها",
"Group Admin" => "گروه مدیران",
-"Delete" => "حذف",
"never" => "هرگز",
"deleted {userName}" => "کاربر {userName} حذف شد",
"add group" => "افزودن گروه",
@@ -100,16 +100,21 @@ $TRANSLATIONS = array(
"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." => "این سرور ارتباط اینترنتی ندارد. این بدین معناست که بعضی از امکانات نظیر مرتبط سازی یک منبع ذخیره‌ی خارجی، اطلاعات رسانی در مورد بروزرسانی‌ها یا نصب برنامه های جانبی کار نمی‌کنند. دسترسی به فایل ها از راه دور و ارسال اطلاع رسانی توسط ایمیل ممکن است همچنان کار نکند. ما پیشنهاد می‌کنیم که ارتباط اینترنتی مربوط به این سرور را فعال کنید تا تمامی امکانات را در اختیار داشته باشید.",
"Cron" => "زمانبند",
+"Last cron was executed at %s." => "کران قبلی در %s اجرا شد.",
+"Cron was not executed yet!" => "کران هنوز اجرا نشده است!",
"Execute one task with each page loaded" => "اجرای یک وظیفه با هر بار بارگذاری صفحه",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php در یک سرویس webcron ثبت شده است که هر 15 دقیقه یک بار بر روی بستر http فراخوانی شود.",
"Sharing" => "اشتراک گذاری",
"Allow apps to use the Share API" => "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
+"Allow users to share via link" => "اجازه دادن به کاربران برای اشتراک گذاری توسط پیوند",
+"Enforce password protection" => "اجبار برای محافظت توسط رمز عبور",
"Allow public uploads" => "اجازه بارگذاری عمومی",
"Set default expiration date" => "اعمال تاریخ اتمام پیش فرض",
"Expire after " => "اتمام اعتبار بعد از",
"days" => "روز",
"Enforce expiration date" => "اعمال تاریخ اتمام اشتراک گذاری",
"Allow resharing" => "مجوز اشتراک گذاری مجدد",
+"Exclude groups from sharing" => "مستثنی شدن گروه ها از اشتراک گذاری",
"Security" => "امنیت",
"Enforce HTTPS" => "وادار کردن HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "کلاینت‌ها را مجبور کن که از یک ارتباط رمزنگاری شده برای اتصال به %s استفاده کنند.",
@@ -167,6 +172,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "یک تصویر پروفایل انتخاب کنید",
"Language" => "زبان",
"Help translate" => "به ترجمه آن کمک کنید",
+"SSL root certificates" => "گواهی های اصلی SSL ",
+"Import Root Certificate" => "وارد کردن گواهی اصلی",
"Log-in password" => "رمز ورود",
"Decrypt all Files" => "تمام فایلها رمزگشایی شود",
"Restore Encryption Keys" => "بازیابی کلید های رمزگذاری",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index c6fb3bee723..b42e77603e5 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Väärä ylläpitäjän salasana. Tarkista salasana ja yritä uudelleen.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Taustaosa ei tue salasanan vaihtamista, mutta käyttäjän salausavain päivitettiin onnistuneesti.",
"Unable to change password" => "Salasanan vaihto ei onnistunut",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Haluatko varmasti liittää kohteen \"{domain}\" luotetuksi toimialueeksi?",
+"Add trusted domain" => "Lisää luotettu toimialue",
"Sending..." => "Lähetetään...",
"User Documentation" => "Käyttäjäohjeistus",
"Admin Documentation" => "Ylläpitäjän ohjeistus",
@@ -64,6 +66,8 @@ $TRANSLATIONS = array(
"So-so password" => "Kohtalainen salasana",
"Good password" => "Hyvä salasana",
"Strong password" => "Vahva salasana",
+"Valid until {date}" => "Kelvollinen {date} asti",
+"Delete" => "Poista",
"Decrypting files... Please wait, this can take some time." => "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.",
"Delete encryption keys permanently." => "Poista salausavaimet pysyvästi.",
"Restore encryption keys." => "Palauta salausavaimet.",
@@ -74,7 +78,6 @@ $TRANSLATIONS = array(
"undo" => "kumoa",
"Groups" => "Ryhmät",
"Group Admin" => "Ryhmän ylläpitäjä",
-"Delete" => "Poista",
"never" => "ei koskaan",
"deleted {userName}" => "poistettu {userName}",
"add group" => "lisää ryhmä",
@@ -104,12 +107,15 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-moduuli \"fileinfo\" puuttuu. Sen käyttö on erittäin suositeltavaa, jotta MIME-tyypin havaitseminen onnistuu parhaalla mahdollisella tavalla.",
"Your PHP version is outdated" => "Käytössä oleva PHP-versio on vanhentunut",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Käytössä oleva PHP on vanhentunut. Päivitä versioon 5.3.8 tai uudempaan, koska aiemmat versiot eivät ole toimivia. On mahdollista, että tämä ownCloud-asennus ei toimi kunnolla.",
+"PHP charset is not set to UTF-8" => "PHP:n merkistöä ei ole asetettu UTF-8:ksi",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP:n merkistöä ei ole asetettu UTF-8:ksi. Tämä saattaa aiheuttaa suuria ongelmia sellaisten tiedostojen kanssa, joiden nimi koostuu muista kuin ASCII-merkeistä. Suosittelemme asettamaan php.ini-tiedoston kohdan 'default_charset' arvoon 'UTF-8'.",
"Locale not working" => "Maa-asetus ei toimi",
"System locale can not be set to a one which supports UTF-8." => "Järjestelmän maa-asetusta ei voi asettaa UTF-8:aa tukevaksi.",
"This means that there might be problems with certain characters in file names." => "Tämä tarkoittaa, että tiettyjen merkkien kanssa tiedostojen nimissä saattaa olla ongelmia.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Suosittelemme vahvasti asentamaan vaaditut paketit järjestelmään, jotta jotain seuraavista maa-asetuksista on mahdollista tukea: %s.",
"Internet connection not working" => "Internet-yhteys ei toimi",
"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." => "Tällä palvelimella ei ole toimivaa internetyhteyttä. Sen seurauksena jotkin ominaisuudet, kuten erillisten tallennustilojen liittäminen, ilmoitukset päivityksistä tai kolmansien osapuolten sovellusten asentaminen eivät toimi. Tiedostojen käyttäminen etäältä ja ilmoitusten lähettäminen sähköpostitse eivät myöskään välttämättä toimi. Jos haluat käyttää kaikkia palvelimen ominaisuuksia, kytke palvelin internetiin.",
+"URL generation in notification emails" => "Verkko-osoitteiden luominen sähköposti-ilmoituksissa",
"Cron" => "Cron",
"Last cron was executed at %s." => "Viimeisin cron suoritettiin %s.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Viimeisin cron suoritettiin %s. Siitä on yli tunti aikaa, joten jokin näyttää olevan pielessä.",
@@ -189,11 +195,18 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Valitse profiilikuvaksi",
"Language" => "Kieli",
"Help translate" => "Auta kääntämisessä",
+"SSL root certificates" => "SSL-juurivarmenteet",
+"Valid until" => "Kelvollinen",
+"Issued By" => " Myöntänyt",
+"Valid until %s" => "Kelvollinen %s asti",
+"Import Root Certificate" => "Tuo juurivarmenne",
"The encryption app is no longer enabled, please decrypt all your files" => "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus",
"Log-in password" => "Kirjautumissalasana",
"Decrypt all Files" => "Pura kaikkien tiedostojen salaus",
"Restore Encryption Keys" => "Palauta salausavaimet",
"Delete Encryption Keys" => "Poista salausavaimet",
+"Show storage location" => "Näytä tallennustilan sijainti",
+"Show last log in" => "Näytä viimeisin sisäänkirjautuminen",
"Login Name" => "Kirjautumisnimi",
"Create" => "Luo",
"Admin Recovery Password" => "Ylläpitäjän palautussalasana",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 9fea1d61543..42cd848597f 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Mot de passe administrateur de récupération de données invalide. Veuillez vérifier le mot de passe et essayer à nouveau.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.",
"Unable to change password" => "Impossible de modifier le mot de passe",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?",
+"Add trusted domain" => "Ajouter un domaine de confiance",
"Sending..." => "Envoi en cours...",
"User Documentation" => "Documentation utilisateur",
"Admin Documentation" => "Documentation administrateur",
@@ -64,6 +66,8 @@ $TRANSLATIONS = array(
"So-so password" => "Mot de passe de sécurité tout juste acceptable",
"Good password" => "Mot de passe de sécurité suffisante",
"Strong password" => "Mot de passe de forte sécurité",
+"Valid until {date}" => "Valide jusqu'au {date}",
+"Delete" => "Supprimer",
"Decrypting files... Please wait, this can take some time." => "Déchiffrement en cours... Cela peut prendre un certain temps.",
"Delete encryption keys permanently." => "Supprimer définitivement les clés de chiffrement",
"Restore encryption keys." => "Restaurer les clés de chiffrement",
@@ -74,7 +78,6 @@ $TRANSLATIONS = array(
"undo" => "annuler",
"Groups" => "Groupes",
"Group Admin" => "Admin Groupe",
-"Delete" => "Supprimer",
"never" => "jamais",
"deleted {userName}" => "{userName} supprimé",
"add group" => "ajouter un groupe",
@@ -108,6 +111,8 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats pour la détection des types de fichiers.",
"Your PHP version is outdated" => "Votre version de PHP est trop ancienne",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Votre version de PHP est trop ancienne. Nous vous recommandons fortement de migrer vers une version 5.3.8 ou plus récente encore, car les versions antérieures sont réputées problématiques. Il est possible que cette installation ne fonctionne pas correctement.",
+"PHP charset is not set to UTF-8" => "Le jeu de caractères PHP n'est pas réglé sur UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Le jeu de caractères PHP n'est pas réglé sur UTF-8. Ceci peut entraîner des problèmes majeurs avec les noms de fichiers contenant des caractère non-ASCII. Nous recommandons fortement de changer la valeur de 'default_charset' dans php.ini par 'UTF-8'.",
"Locale not working" => "Localisation non fonctionnelle",
"System locale can not be set to a one which supports UTF-8." => "Les paramètres régionaux ne peuvent pas être configurés avec un qui supporte UTF-8.",
"This means that there might be problems with certain characters in file names." => "Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichier.",
@@ -195,12 +200,15 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Choisir en temps que photo de profil ",
"Language" => "Langue",
"Help translate" => "Aidez à traduire",
+"SSL root certificates" => "Certificats racine SSL",
+"Import Root Certificate" => "Importer un certificat racine",
"The encryption app is no longer enabled, please decrypt all your files" => "L'app de chiffrement n’est plus activée, veuillez déchiffrer tous vos fichiers",
"Log-in password" => "Mot de passe de connexion",
"Decrypt all Files" => "Déchiffrer tous les fichiers",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vos clés de chiffrement ont été déplacées dans l'emplacement de backup. Si quelque chose devait mal se passer, vous pouvez restaurer les clés. Choisissez la suppression permanente seulement si vous êtes sûr que tous les fichiers ont été déchiffrés correctement.",
"Restore Encryption Keys" => "Restaurer les clés de chiffrement",
"Delete Encryption Keys" => "Supprimer les clés de chiffrement",
+"Show last log in" => "Montrer la dernière identification",
"Login Name" => "Nom d'utilisateur",
"Create" => "Créer",
"Admin Recovery Password" => "Récupération du mot de passe administrateur",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 76613687bd5..5ca6e1f5735 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -21,7 +21,7 @@ $TRANSLATIONS = array(
"Couldn't decrypt your files, check your password and try again" => "Non foi posíbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo",
"Encryption keys deleted permanently" => "As chaves de cifrado foron eliminadas permanentemente",
"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Non foi posíbel eliminar permanentemente as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
-"Couldn't remove app." => "Non foi posíbel retirar o aplicativo.",
+"Couldn't remove app." => "Non foi posíbel retirar a aplicación.",
"Email saved" => "Correo gardado",
"Invalid email" => "Correo incorrecto",
"Unable to delete group" => "Non é posíbel eliminar o grupo.",
@@ -33,7 +33,7 @@ $TRANSLATIONS = array(
"Admins can't remove themself from the admin group" => "Os administradores non poden eliminarse a si mesmos do grupo admin",
"Unable to add user to group %s" => "Non é posíbel engadir o usuario ao grupo %s",
"Unable to remove user from group %s" => "Non é posíbel eliminar o usuario do grupo %s",
-"Couldn't update app." => "Non foi posíbel actualizar o aplicativo.",
+"Couldn't update app." => "Non foi posíbel actualizar a aplicación.",
"Wrong password" => "Contrasinal incorrecto",
"No user supplied" => "Non subministrado polo usuario",
"Please provide an admin recovery password, otherwise all user data will be lost" => "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario",
@@ -44,14 +44,14 @@ $TRANSLATIONS = array(
"User Documentation" => "Documentación do usuario",
"Admin Documentation" => "Documentación do administrador",
"Update to {appversion}" => "Actualizar á {appversion}",
-"Uninstall App" => "Desinstalar un aplicativo",
+"Uninstall App" => "Desinstalar unha aplicación",
"Disable" => "Desactivar",
"Enable" => "Activar",
"Please wait...." => "Agarde...",
-"Error while disabling app" => "Produciuse un erro ao desactivar o aplicativo",
-"Error while enabling app" => "Produciuse un erro ao activar o aplicativo",
+"Error while disabling app" => "Produciuse un erro ao desactivar a aplicación",
+"Error while enabling app" => "Produciuse un erro ao activar a aplicación",
"Updating...." => "Actualizando...",
-"Error while updating app" => "Produciuse un erro mentres actualizaba o aplicativo",
+"Error while updating app" => "Produciuse un erro mentres actualizaba a aplicación",
"Error" => "Erro",
"Update" => "Actualizar",
"Updated" => "Actualizado",
@@ -64,6 +64,7 @@ $TRANSLATIONS = array(
"So-so password" => "Contrasinal non moi aló",
"Good password" => "Bo contrasinal",
"Strong password" => "Contrasinal forte",
+"Delete" => "Eliminar",
"Decrypting files... Please wait, this can take some time." => "Descifrando ficheiros... isto pode levar un anaco.",
"Delete encryption keys permanently." => "Eliminar permanentemente as chaves de cifrado.",
"Restore encryption keys." => "Restaurar as chaves de cifrado.",
@@ -74,7 +75,6 @@ $TRANSLATIONS = array(
"undo" => "desfacer",
"Groups" => "Grupos",
"Group Admin" => "Grupo Admin",
-"Delete" => "Eliminar",
"never" => "nunca",
"deleted {userName}" => "{userName} foi eliminado",
"add group" => "engadir un grupo",
@@ -100,7 +100,7 @@ $TRANSLATIONS = array(
"Setup Warning" => "Configurar os avisos",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
"Please double check the <a href=\"%s\">installation guides</a>." => "Volva comprobar as <a href=\"%s\">guías de instalación</a>",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varios aplicativos sexan inaccesíbeis.",
+"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.",
"Database Performance Info" => "Información do rendemento da base de datos",
"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto. Para migrar a outra base de datos use a ferramenta en liña de ordes: «occ db:convert-type»",
@@ -108,12 +108,16 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME.",
"Your PHP version is outdated" => "A versión de PHP está desactualizada",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "A versión de PHP está desactualizada. Recomendámoslle que a actualice á versión 5.3.8 ou posterior xa que as versións anteriores son coñecidas por estragarse. É probábel que esta instalación no estea a funcionar correctamente.",
+"PHP charset is not set to UTF-8" => "O xogo de caracteres de PHP non está estabelecido a UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "O xogo de caracteres de PHP non está estabelecido a UTF-8. Isto pode causar problemas importantes con caracteres non-ASCII nos nomes de ficheiro. Recomendámoslle que cambie o valor de php.ini «default_charset» a «UTF-8».",
"Locale not working" => "A configuración rexional non funciona",
"System locale can not be set to a one which supports UTF-8." => "Non é posíbel estabelecer a configuración rexional do sistema a unha que admita UTF-8.",
"This means that there might be problems with certain characters in file names." => "Isto significa que pode haber problemas con certos caracteres en nomes de ficheiro.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Recomendamoslle que instale no sistema os paquetes necesarios para admitir unha das seguintes configuracións rexionais: %s.",
"Internet connection not working" => "A conexión á Internet non funciona",
-"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." => "Este servidor non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicativos de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades.",
+"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." => "Este servidor non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicacións de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades.",
+"URL generation in notification emails" => "Xeración dos URL nos correos de notificación",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Se a instalación non foi feita na raíz do dominio e usa o sistema de cron, poden xurdir problemas coa xeración dos URL. Para evitar estes problemas, axuste a opción «overwritewebroot» no ficheiro config.php ás ruta de webroot da súa instalación (suxírese: «%s»)",
"Cron" => "Cron",
"Last cron was executed at %s." => "O último «cron» executouse ás %s.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "O último «cron» executouse ás %s. Isto supón que pasou máis dunha hora. polo que semella que algo vai mal.",
@@ -122,7 +126,7 @@ $TRANSLATIONS = array(
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
"Use system's cron service to call the cron.php file every 15 minutes." => "Use o servizo «cron» do sistema para chamar ao ficheiro cron.php cada 15 minutos.",
"Sharing" => "Compartindo",
-"Allow apps to use the Share API" => "Permitir que os aplicativos empreguen o API para compartir",
+"Allow apps to use the Share API" => "Permitir que as aplicacións empreguen o API para compartir",
"Allow users to share via link" => "Permitir que os usuarios compartan a través de ligazóns",
"Enforce password protection" => "Forzar a protección por contrasinal",
"Allow public uploads" => "Permitir os envíos públicos",
@@ -157,12 +161,12 @@ $TRANSLATIONS = array(
"Less" => "Menos",
"Version" => "Versión",
"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>." => "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <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" => "Engada o seu aplicativo",
-"More Apps" => "Máis aplicativos",
-"Select an App" => "Escolla un aplicativo",
+"Add your App" => "Engada a súa aplicación",
+"More Apps" => "Máis aplicacións",
+"Select an App" => "Escolla unha aplicación",
"Documentation:" => "Documentación:",
-"See application page at apps.owncloud.com" => "Consulte a páxina do aplicativo en apps.owncloud.com",
-"See application website" => "Vexa o sitio web do aplicativo",
+"See application page at apps.owncloud.com" => "Consulte a páxina da aplicación en apps.owncloud.com",
+"See application website" => "Vexa o sitio web da aplicación",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por<span class=\"author\"></span>",
"Enable only for specific groups" => "Activar só para grupos específicos",
"All" => "Todo",
@@ -171,7 +175,7 @@ $TRANSLATIONS = array(
"Forum" => "Foro",
"Bugtracker" => "Seguemento de fallos",
"Commercial Support" => "Asistencia comercial",
-"Get the apps to sync your files" => "Obteña os aplicativos para sincronizar os seus ficheiros",
+"Get the apps to sync your files" => "Obteña as aplicacións para sincronizar os seus ficheiros",
"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Se quere colaborar co proxecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">participar no desenvolvemento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">axudar a difundilo</a>!",
"Show First Run Wizard again" => "Amosar o axudante da primeira execución outra vez",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>",
@@ -195,7 +199,9 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Escolla unha imaxe para o perfil",
"Language" => "Idioma",
"Help translate" => "Axude na tradución",
-"The encryption app is no longer enabled, please decrypt all your files" => "O aplicativo de cifrado non está activado, descifre todos os ficheiros",
+"SSL root certificates" => "Certificados raíz SSL",
+"Import Root Certificate" => "Importar o certificado raíz",
+"The encryption app is no longer enabled, please decrypt all your files" => "A aplicación de cifrado non está activada, descifre todos os ficheiros",
"Log-in password" => "Contrasinal de acceso",
"Decrypt all Files" => "Descifrar todos os ficheiros",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posíbel descifrar correctamente todos os ficheiros.",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 5ff5cd2faa4..00c37c9db89 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -1,5 +1,6 @@
<?php
$TRANSLATIONS = array(
+"Saved" => "נשמר",
"Email sent" => "הודעת הדוא״ל נשלחה",
"Encryption" => "הצפנה",
"Unable to load list from App Store" => "לא ניתן לטעון רשימה מה־App Store",
@@ -26,10 +27,10 @@ $TRANSLATIONS = array(
"Error" => "שגיאה",
"Update" => "עדכון",
"Updated" => "מעודכן",
+"Delete" => "מחיקה",
"undo" => "ביטול",
"Groups" => "קבוצות",
"Group Admin" => "מנהל הקבוצה",
-"Delete" => "מחיקה",
"never" => "לעולם לא",
"add group" => "הוספת קבוצה",
"A valid username must be provided" => "יש לספק שם משתמש תקני",
@@ -85,6 +86,8 @@ $TRANSLATIONS = array(
"Cancel" => "ביטול",
"Language" => "פה",
"Help translate" => "עזרה בתרגום",
+"SSL root certificates" => "שורש אישורי אבטחת SSL ",
+"Import Root Certificate" => "ייבוא אישור אבטחת שורש",
"Login Name" => "שם כניסה",
"Create" => "יצירה",
"Admin Recovery Password" => "ססמת השחזור של המנהל",
diff --git a/settings/l10n/hi.php b/settings/l10n/hi.php
index 67463ef7bd4..c19ac7e1018 100644
--- a/settings/l10n/hi.php
+++ b/settings/l10n/hi.php
@@ -4,8 +4,10 @@ $TRANSLATIONS = array(
"Error" => "त्रुटि",
"Update" => "अद्यतन",
"Security Warning" => "सुरक्षा चेतावनी ",
+"More" => "और अधिक",
"Password" => "पासवर्ड",
"New password" => "नया पासवर्ड",
+"Cancel" => "रद्द करें ",
"Username" => "प्रयोक्ता का नाम"
);
$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index aa3a7fabdc0..a2e3a959f9b 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -1,43 +1,240 @@
<?php
$TRANSLATIONS = array(
-"Unable to load list from App Store" => "Nemogićnost učitavanja liste sa Apps Stora",
-"Authentication error" => "Greška kod autorizacije",
-"Email saved" => "Email spremljen",
-"Invalid email" => "Neispravan email",
-"Language changed" => "Jezik promijenjen",
-"Invalid request" => "Neispravan zahtjev",
-"Disable" => "Isključi",
-"Enable" => "Uključi",
-"Error" => "Greška",
-"undo" => "vrati",
+"Invalid value supplied for %s" => "Neispravna vrijednost dostavljena za %s",
+"Saved" => "Spremljeno",
+"test email settings" => "Postavke za testiranje e-pošte",
+"If you received this email, the settings seem to be correct." => "Ako ste ovu e-poštu primili,čini se da su postavke ispravne.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Za vrijeme slanja e-pošte pojavio se problem. Molimo ponovno posjetite svoje postavke.",
+"Email sent" => "E-pošta je poslana",
+"You need to set your user email before being able to send test emails." => "Prije nego li ste u mogućnosti slati testnu e-poštu trebate postaviti svoj korisnički email.",
+"Send mode" => "Način rada za slanje",
+"Encryption" => "Šifriranje",
+"Authentication method" => "Postupak autentikacije",
+"Unable to load list from App Store" => "Popis iz App Store-a nije moguće učitati.",
+"Authentication error" => "Pogrešna autentikacija",
+"Your full name has been changed." => "Vaše puno ime je promijenjeno.",
+"Unable to change full name" => "Puno ime nije moguće promijeniti.",
+"Group already exists" => "Grupa već postoji",
+"Unable to add group" => "Grupu nije moguće dodati",
+"Files decrypted successfully" => "Datoteke uspješno dešifrirane",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Vaše datoteke nije moguće dešifrirati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
+"Couldn't decrypt your files, check your password and try again" => "Vaše datoteke nije moguće dešifrirati, provjerite svoju lozinku i pokušajte ponovno.",
+"Encryption keys deleted permanently" => "Ključevi za šifriranje trajno izbrisani",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Vaše ključeve za šifriranje nije moguće trajno izbrisati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
+"Couldn't remove app." => "Nije moguće ukloniti app.",
+"Email saved" => "E-pošta spremljena",
+"Invalid email" => "E-pošta neispravna",
+"Unable to delete group" => "Grupu nije moguće izbrisati",
+"Unable to delete user" => "Korisnika nije moguće izbrisati",
+"Backups restored successfully" => "Sigurnosne kopije uspješno obnovljene",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Vaše ključeve za šifriranje nije moguće obnoviti, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
+"Language changed" => "Promjena jezika",
+"Invalid request" => "Zahtjev neispravan",
+"Admins can't remove themself from the admin group" => "Administratori ne mogu sami sebe ukloniti iz admin grupe",
+"Unable to add user to group %s" => "Dodavanje korisnika grupi %s nije moguće",
+"Unable to remove user from group %s" => "Uklanjanje korisnika iz grupe %s nije moguće",
+"Couldn't update app." => "Ažuriranje aplikacija nije moguće",
+"Wrong password" => "Pogrešna lozinka",
+"No user supplied" => "Nijedan korisnik nije dostavljen",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Molimo navedite admin lozinku za oporavak, u protivnom će svi korisnički podaci biti izgubljeni.",
+"Wrong admin recovery password. Please check the password and try again." => "Pogrešna admin lozinka za oporavak. Molimo provjerite lozinku i pokušajte ponovno.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Pozadina ne podržava promjenu lozinke, ali korisnički ključ za šifriranje je uspješno ažuriran.",
+"Unable to change password" => "Promjena lozinke nije moguća",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Jeste li doista sigurni da želite dodati \"{domain}\" kao pouzdanu domenu?",
+"Add trusted domain" => "Dodajte pouzdanu domenu",
+"Sending..." => "Slanje...",
+"User Documentation" => "Korisnička dokumentacija",
+"Admin Documentation" => "Admin dokumentacija",
+"Update to {appversion}" => "Ažurirajte u {appversion}",
+"Uninstall App" => "Deinstalirajte app",
+"Disable" => "Onemogućite",
+"Enable" => "Omogućite",
+"Please wait...." => "Molimo pričekajte...",
+"Error while disabling app" => "Pogreška pri onemogućavanju app",
+"Error while enabling app" => "Pogreška pri omogućavanju app",
+"Updating...." => "Ažuriranje...",
+"Error while updating app" => "Pogreška pri ažuriranju app",
+"Error" => "Pogreška",
+"Update" => "Ažurirajte",
+"Updated" => "Ažurirano",
+"Uninstalling ...." => "Deinstaliranje....",
+"Error while uninstalling app" => "Pogreška pri deinstaliranju app",
+"Uninstall" => "Deinstalirajte",
+"Select a profile picture" => "Odaberite sliku profila",
+"Very weak password" => "Lozinka vrlo slaba",
+"Weak password" => "Lozinka slaba",
+"So-so password" => "Lozinka tako-tako",
+"Good password" => "Lozinka dobra",
+"Strong password" => "Lozinka snažna",
+"Valid until {date}" => "Valid until {date}",
+"Delete" => "Izbrišite",
+"Decrypting files... Please wait, this can take some time." => "Dešifriranje datoteka... Molimo pričekajte, to može potrajati neko vrijeme.",
+"Delete encryption keys permanently." => "Trajno izbrišite ključeve za šifriranje",
+"Restore encryption keys." => "Obnovite ključeve za šifriranje",
+"Unable to delete {objName}" => "Nije moguće izbrisati {objName}",
+"Error creating group" => "Pogrešno kreiranje grupe",
+"A valid group name must be provided" => "Nužno je navesti valjani naziv grupe",
+"deleted {groupName}" => "izbrisana {groupName}",
+"undo" => "poništite",
"Groups" => "Grupe",
-"Group Admin" => "Grupa Admin",
-"Delete" => "Obriši",
+"Group Admin" => "Group Admin",
"never" => "nikad",
-"__language_name__" => "__ime_jezika__",
+"deleted {userName}" => "izbrisano {userName}",
+"add group" => "dodajte grupu",
+"A valid username must be provided" => "Nužno je navesti valjano korisničko ime",
+"Error creating user" => "Pogrešno kreiranje korisnika",
+"A valid password must be provided" => "Nužno je navesti valjanu lozinku",
+"Warning: Home directory for user \"{user}\" already exists" => "Upozorenje: Osnovni direktorij za korisnika \"{user}\" već postoji",
+"__language_name__" => "__jezik_naziv___",
+"Everything (fatal issues, errors, warnings, info, debug)" => "Sve (kobni problemi, pogreške, upozorenja, ispravljanje pogrešaka)",
+"Info, warnings, errors and fatal issues" => "Informacije, upozorenja, pogreške i kobni problemi",
+"Warnings, errors and fatal issues" => "Upozorenja, pogreške i kobni problemi",
+"Errors and fatal issues" => "Pogreške i kobni problemi",
+"Fatal issues only" => "Samo kobni problemi",
+"None" => "Ništa",
"Login" => "Prijava",
+"Plain" => "Čisti tekst",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
+"Security Warning" => "Sigurnosno upozorenje",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Vi %s pristupate putem HTTP. Toplo vam preporučujemo da svoj poslužitelj konfigurirate takoda umjesto HTTP zahtijeva korištenje HTTPS.",
+"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." => "Vašem podatkovnom direktoriju i vašim datotekama pristup je vjerojatno moguć s interneta.Datoteka .htaccess ne radi. Toplo vam preporučujemo da svoj web poslužitelj konfigurirate tako daje pristup podatkovnom direktoriju nemoguć ili pak podatkovni direktorij premjestite izvan korijena dokumentaweb poslužitelja.",
+"Setup Warning" => "Upozorenje programa za postavljanje",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Vaš web poslužitelj još nije propisno postavljen da bi dozvolio sinkronizaciju datotekajer čini se da je sučelje WebDAV neispravno.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Molimo dvostruko provjerite <a href=\"%s\">instalacijske upute</a>.",
+"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP je očigledno postavljen na strip inline doc blocks. To će nekoliko osnovnih aplikacija učiniti nedostupnima.",
+"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Uzrok tome je vjerojatno neki ubrzivač predmemoriranja kao što je Zend OPcache ilieAccelerator.",
+"Database Performance Info" => "Info o performansi baze podataka",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite se koristi kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.Za migraciju na neku drugu bazu podataka koristite naredbeni redak: 'occ db: convert-type'",
+"Module 'fileinfo' missing" => "Nedostaje modul 'fileinfo'",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modul 'fileinfo' nedostaje. Tolo vam preporučjemo da taj modul omogućitekako biste dobili najbolje rezultate u detekciji mime vrste.",
+"Your PHP version is outdated" => "Vaša verzija PHP je zastarjela",
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Vaša verzija PHP je zastarjela. Tolo vam preporučujemo da je ažurirate na 5.3.8.ili još novije jer je poznato da su starije verzije neispravne. Moguće je da ovainstalacija ne radi ispravno.",
+"PHP charset is not set to UTF-8" => "PHP Charset nije postavljen na UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP charset nije postavljen na UTF-8. To može prouzročiti ozbiljne probleme s non-ASCII znakovimau nazivima datoteka. Toplo vam preporučujemo da vrijednost 'default_charset' php.ini promijeniteu 'UTF-8'.",
+"Locale not working" => "Regionalna shema ne radi",
+"System locale can not be set to a one which supports UTF-8." => "Regionalnu shemu sustava nemoguće je postaviti na neku koja podržava UTF-8.",
+"This means that there might be problems with certain characters in file names." => "To znači da se mogu javiti problemi s određenim znakovima u datoteci.",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Toplo preporučpujemo da u svoj sustav instalirate potrebne pakete koji će podržatijednu od sljedećih regionalnih shema: %s.",
+"Internet connection not working" => "Veza s internetom ne radi",
+"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." => "Ovaj poslužitelj nema nikakvu radnu vezu s internetom. To znači da ne rade neke od njegovihfunkcija kao što su spajanje na vanjsku memoriju, notifikacije o ažuriranju ili instalacijiaplikacija treće strane. Također, možda je onemogućen daljinski pristup datotekama i slanjenotifikacijske e-pošte. Savjetujemo vam da, ako želite da sve njegove funkcije rade,omogućite vezuovog poslužitelja s internetom.",
+"URL generation in notification emails" => "Generiranje URL-a u notifikacijskoj e-pošti",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Ako vaša instalacija nije instalirana u korijenu domene i koristi sustav cron,mogu se javiti problemi s generiranjem URL. Da biste takve probleme izbjegli,molimo postavite opciju \"overwritewebroot\" u vašoj datoteci config.php.na webroot path vaše instalacije (Predlažemo: \"%s\").",
"Cron" => "Cron",
-"Log" => "dnevnik",
-"More" => "više",
-"Add your App" => "Dodajte vašu aplikaciju",
-"Select an App" => "Odaberite Aplikaciju",
-"See application page at apps.owncloud.com" => "Pogledajte stranicu s aplikacijama na apps.owncloud.com",
+"Last cron was executed at %s." => "Zadnji cron je izvršen na %s",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Zadnji cron izvršen je na %s. Bilo je to prije više od jednog sata, čini se da nešto nije u redu.",
+"Cron was not executed yet!" => "Cron još nije izvršen!",
+"Execute one task with each page loaded" => "Izvršite jedan zadatak sa svakom učitanom stranicom",
+"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php je registriran na webcron usluzi da poziva cron.php svakih 15 minuta preko http.",
+"Use system's cron service to call the cron.php file every 15 minutes." => "Koristite cron uslugu sustava za pozivanje cron.php datoteke svakih 15 minuta.",
+"Sharing" => "Dijeljenje zajedničkih resursa",
+"Allow apps to use the Share API" => "Dopustite apps korištenje Share API",
+"Allow users to share via link" => "Dopustite korisnicia dijeljenje putem veze",
+"Enforce password protection" => "Nametnite zaštitu lozinki",
+"Allow public uploads" => "Dopustite javno učitavanje sadržaja",
+"Set default expiration date" => "Postavite zadani datum isteka",
+"Expire after " => "Istek nakon",
+"days" => "dana",
+"Enforce expiration date" => "Nametnite datum isteka",
+"Allow resharing" => "Dopustite ponovno dijeljenje zajedničkih resursa",
+"Restrict users to only share with users in their groups" => "Ograničite korisnike na meusobno dijeljenje resursa samo s korisnicima unutar svoje grupe",
+"Allow users to send mail notification for shared files" => "Dopustite korisnicima slanje notifikacijske e-pošte za podijeljene datoteke",
+"Exclude groups from sharing" => "Isključite grupe iz dijeljenja zajedničkih resursa",
+"These groups will still be able to receive shares, but not to initiate them." => "Ove će grupe još uvijek moći primati dijeljene resurse, ali ne i inicirati ih",
+"Security" => "Sigurnost",
+"Enforce HTTPS" => "Nametnite HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Prisiljava klijente da se priključe na %s putem šifrirane konekcije.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Molimo,priključite se na svoj %s putem HTTPS da biste omogućili ili onemogućili SSL",
+"Email Server" => "Poslužitelj e-pošte",
+"This is used for sending out notifications." => "Ovo se koristi za slanje notifikacija.",
+"From address" => "S adrese",
+"mail" => "pošta",
+"Authentication required" => "Potrebna autentikacija",
+"Server address" => "Adresa poslužitelja",
+"Port" => "Priključak",
+"Credentials" => "Vjerodajnice",
+"SMTP Username" => "Korisničko ime SMTP",
+"SMTP Password" => "Lozinka SMPT",
+"Test email settings" => "Postavke za testnu e-poštu",
+"Send email" => "Pošaljite e-poštu",
+"Log" => "Zapisnik",
+"Log level" => "Razina zapisnika",
+"More" => "Više",
+"Less" => "Manje",
+"Version" => "Verzija",
+"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>." => "Razvila <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud zajednica</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">izvorni kod</a> je licenciran <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> licencom.",
+"Add your App" => "Dodajte svoje aplikacije",
+"More Apps" => "Više aplikacija",
+"Select an App" => "Odaberite jednu aplikaciju",
+"Documentation:" => "Dokumentacija:",
+"See application page at apps.owncloud.com" => "Vidite stranicu aplikacija na apps.owncloud.com",
+"See application website" => "Vidite web mjesto aplikacija",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencirano <span class=\"author\"></span>",
+"Enable only for specific groups" => "Omogućite samo za specifične grupe",
+"All" => "Sve",
+"Administrator Documentation" => "Dokumentacija administratora",
+"Online Documentation" => "Online dokumentacija",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Komercijalna podrška",
+"Get the apps to sync your files" => "Koristite aplikacije za sinkronizaciju svojih datoteka",
+"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Ako želite podržati projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">pridružite se razvoju</a>\n\t\tili\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">proširite vijest</a>!",
+"Show First Run Wizard again" => "Opet pokažite First Run Wizard",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Iskoristili ste <strong>%s</strong> od raspoloživog <strong>%s</strong>",
"Password" => "Lozinka",
-"Unable to change your password" => "Nemoguće promijeniti lozinku",
+"Your password was changed" => "Vaša je lozinka promijenjena",
+"Unable to change your password" => "Vašu lozinku nije moguće promijeniti",
"Current password" => "Trenutna lozinka",
"New password" => "Nova lozinka",
-"Change password" => "Izmjena lozinke",
-"Email" => "e-mail adresa",
-"Your email address" => "Vaša e-mail adresa",
-"Cancel" => "Odustani",
+"Change password" => "Promijenite lozinku",
+"Full Name" => "Puno ime",
+"Email" => "E-pošta",
+"Your email address" => "Vaša adresa e-pošte",
+"Fill in an email address to enable password recovery and receive notifications" => "Unesite adresu e-pošte da biste omogućili oporavak lozinke i primili notifikacije",
+"Profile picture" => "Slika profila",
+"Upload new" => "Učitajte novu",
+"Select new from Files" => "Odaberite novu iz datoteka",
+"Remove image" => "Uklonite sliku",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Ili png ili jpg. Idealno bi bilo da je kvadratna, ali moći ćete je obrezati",
+"Your avatar is provided by your original account." => "Vaš avatar je isporučen od strane vašeg izvornog računa",
+"Cancel" => "Odustanite",
+"Choose as profile image" => "Odaberite kao sliku profila",
"Language" => "Jezik",
-"Help translate" => "Pomoć prevesti",
-"Login Name" => "Prijava",
-"Create" => "Izradi",
+"Help translate" => "Pomozite prevesti",
+"SSL root certificates" => "SSL Root certifikati",
+"Common Name" => "Common Name",
+"Valid until" => "Valid until",
+"Issued By" => "Issued By",
+"Valid until %s" => "Valid until %s",
+"Import Root Certificate" => "Uvoz Root certifikata",
+"The encryption app is no longer enabled, please decrypt all your files" => "Aplikacija šifriranja više nije omogćena,molimo dešifrirajte sve svoje datoteke",
+"Log-in password" => "Lozinka za prijavu",
+"Decrypt all Files" => "Dešifrirajte sve datoteke",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vaši ključevi za šifriranje premješteni su na mjesto sigurnosne kopije. Ako neštokrene loše, ključeve možete obnoviti. Iizbrišite ih trajno samo ako ste sigurni da susve datoteke ispravno dešifrirane.",
+"Restore Encryption Keys" => "Obnovite ključeve za šifriranje",
+"Delete Encryption Keys" => "Izbrišite ključeve za šifriranje",
+"Show storage location" => "Prikaži mjesto pohrane",
+"Show last log in" => "Prikaži zadnje spajanje",
+"Login Name" => "Ime za prijavu",
+"Create" => "Kreirajte",
+"Admin Recovery Password" => "Admin lozinka za oporavak",
+"Enter the recovery password in order to recover the users files during password change" => "Unesite lozinku za oporavak da biste oporavili korisničke datoteke tijekom promjene lozinke",
+"Search Users and Groups" => "Pretražite korisnike i grupe",
+"Add Group" => "Dodajte grupu",
"Group" => "Grupa",
-"Default Quota" => "standardni kvota",
-"Other" => "ostali",
+"Everyone" => "Svi",
+"Admins" => "Admins",
+"Default Quota" => "Zadana kvota",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Molimo unesite kvotu za spremanje (npr: \"512 MB\" ili \"12 GB\")",
+"Unlimited" => "Neograničeno",
+"Other" => "Ostalo",
"Username" => "Korisničko ime",
-"Quota" => "kvota"
+"Quota" => "Kvota",
+"Storage Location" => "Mjesto za spremanje",
+"Last Login" => "Zadnja prijava",
+"change full name" => "promijenite puno ime",
+"set new password" => "postavite novu lozinku",
+"Default" => "Zadano"
);
$PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 9982e13d73e..a7feb8fbb9d 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,22 +1,33 @@
<?php
$TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Érvénytelen adatot adott meg erre: %s",
"Saved" => "Elmentve",
-"test email settings" => "Teszt email beállítások",
-"If you received this email, the settings seem to be correct." => "Amennyiben megérkezett ez az email akkor a beállítások megfelelők",
-"Email sent" => "Az emailt elküldtük",
+"test email settings" => "e-mail beállítások ellenőrzése",
+"If you received this email, the settings seem to be correct." => "Amennyiben megérkezett ez az e-mail akkor a beállítások megfelelők.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Hiba történt az e-mail küldésekor. Kérjük ellenőrizze a beállításokat!",
+"Email sent" => "Az e-mailt elküldtük",
+"You need to set your user email before being able to send test emails." => "Előbb meg kell adnia az e-mail címét, mielőtt tesztelni tudná az e-mail küldést.",
"Send mode" => "Küldési mód",
"Encryption" => "Titkosítás",
-"Authentication method" => "Autentikációs metódus",
+"Authentication method" => "A felhasználóazonosítás módszere",
"Unable to load list from App Store" => "Nem tölthető le a lista az App Store-ból",
"Authentication error" => "Azonosítási hiba",
"Your full name has been changed." => "Az Ön teljes nevét módosítottuk.",
"Unable to change full name" => "Nem sikerült megváltoztatni a teljes nevét",
"Group already exists" => "A csoport már létezik",
"Unable to add group" => "A csoport nem hozható létre",
-"Email saved" => "Email mentve",
-"Invalid email" => "Hibás email",
+"Files decrypted successfully" => "A fájlok titkosítását sikeresen megszüntettük.",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Fájljainak titkosítását nem sikerült megszüntetni, kérjük forduljon a rendszergazdához!",
+"Couldn't decrypt your files, check your password and try again" => "Fájljainak titkosítását nem sikerült megszüntetni, ellenőrizze a jelszavát, és próbálja újra!",
+"Encryption keys deleted permanently" => "A titkosítási kulcsait véglegesen töröltük.",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "A titkosítási kulcsait nem sikerült véglegesen törölni, kérjük ellenőrizze az owncloud.log naplófájlt, vagy forduljon a rendszergazdához!",
+"Couldn't remove app." => "Az alkalmazást nem sikerült eltávolítani.",
+"Email saved" => "Elmentettük az e-mail címet",
+"Invalid email" => "Hibás e-mail",
"Unable to delete group" => "A csoport nem törölhető",
"Unable to delete user" => "A felhasználó nem törölhető",
+"Backups restored successfully" => "A kulcsokat sikereresen visszaállítottuk a mentésekből.",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "A titkosítási kulcsok visszaállítása nem sikerült. Kérjük ellenőrizze az owncloud.log naplófájlt vagy forduljon a rendszergazdához!",
"Language changed" => "A nyelv megváltozott",
"Invalid request" => "Érvénytelen kérés",
"Admins can't remove themself from the admin group" => "Adminisztrátorok nem távolíthatják el magukat az admin csoportból.",
@@ -24,42 +35,55 @@ $TRANSLATIONS = array(
"Unable to remove user from group %s" => "A felhasználó nem távolítható el ebből a csoportból: %s",
"Couldn't update app." => "A program frissítése nem sikerült.",
"Wrong password" => "Hibás jelszó",
-"No user supplied" => "Nincs felhasználó által mellékelve",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Add meg az admin helyreállító jelszót, máskülönben az összes felhasználói adat elveszik.",
-"Wrong admin recovery password. Please check the password and try again." => "Hibás admin helyreállítási jelszó. Ellenörizd a jelszót és próbáld újra.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "A back-end nem támogatja a jelszó módosítást, de felhasználó titkosítási kulcsa sikeresen frissítve lett.",
+"No user supplied" => "Nincs megadva felhasználó",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Adja meg az admin helyreállítási jelszót, máskülönben az összes felhasználói adat elveszik!",
+"Wrong admin recovery password. Please check the password and try again." => "Hibás admin helyreállítási jelszó. Ellenőrizze a jelszót és próbálja újra!",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "A háttér-alrendszer nem támogatja a jelszómódosítást, de felhasználó titkosítási kulcsát sikeresen frissítettük.",
"Unable to change password" => "Nem sikerült megváltoztatni a jelszót",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Biztos abban, hogy hozzá akarja adni \"{domain}\"-t a megbízható tartományokhoz?",
+"Add trusted domain" => "Megbízható tartomány hozzáadása",
"Sending..." => "Küldés...",
"User Documentation" => "Felhasználói leírás",
-"Admin Documentation" => "Adminisztrátori Dokumentáció",
+"Admin Documentation" => "Adminisztrátori leírás",
"Update to {appversion}" => "Frissítés erre a verzióra: {appversion}",
+"Uninstall App" => "Az alkalmazás eltávolítása",
"Disable" => "Letiltás",
-"Enable" => "engedélyezve",
+"Enable" => "Engedélyezés",
"Please wait...." => "Kérem várjon...",
-"Error while disabling app" => "Hiba az alkalmazás kikapcsolása közben",
-"Error while enabling app" => "Hiba az alalmazás engedélyezése közben",
+"Error while disabling app" => "Hiba az alkalmazás letiltása közben",
+"Error while enabling app" => "Hiba az alkalmazás engedélyezése közben",
"Updating...." => "Frissítés folyamatban...",
-"Error while updating app" => "Hiba történt a programfrissítés közben",
+"Error while updating app" => "Hiba történt az alkalmazás frissítése közben",
"Error" => "Hiba",
"Update" => "Frissítés",
"Updated" => "Frissítve",
-"Select a profile picture" => "Válassz profil képet",
+"Uninstalling ...." => "Eltávolítás ...",
+"Error while uninstalling app" => "Hiba történt az alkalmazás eltávolítása közben",
+"Uninstall" => "Eltávolítás",
+"Select a profile picture" => "Válasszon profilképet!",
"Very weak password" => "Nagyon gyenge jelszó",
"Weak password" => "Gyenge jelszó",
"So-so password" => "Nem túl jó jelszó",
"Good password" => "Jó jelszó",
"Strong password" => "Erős jelszó",
-"Decrypting files... Please wait, this can take some time." => "File-ok kititkosítása folyamatban... Kérlek várj, ez hosszabb ideig is eltarthat ...",
+"Delete" => "Törlés",
+"Decrypting files... Please wait, this can take some time." => "A fájlok titkosításának megszüntetése folyamatban. van... Kérem várjon, ez hosszabb ideig is eltarthat ...",
+"Delete encryption keys permanently." => "A tikosítási kulcsok végleges törlése.",
+"Restore encryption keys." => "A titkosítási kulcsok visszaállítása.",
+"Unable to delete {objName}" => "Ezt nem sikerült törölni: {objName}",
+"Error creating group" => "Hiba történt a csoport létrehozása közben",
+"A valid group name must be provided" => "Érvényes csoportnevet kell megadni",
+"deleted {groupName}" => "törölve: {groupName}",
"undo" => "visszavonás",
"Groups" => "Csoportok",
"Group Admin" => "Csoportadminisztrátor",
-"Delete" => "Törlés",
"never" => "soha",
+"deleted {userName}" => "törölve: {userName}",
"add group" => "csoport hozzáadása",
"A valid username must be provided" => "Érvényes felhasználónevet kell megadnia",
"Error creating user" => "A felhasználó nem hozható létre",
"A valid password must be provided" => "Érvényes jelszót kell megadnia",
-"Warning: Home directory for user \"{user}\" already exists" => "Figyelmeztetés: A felhasználó \"{user}\" kezdő könyvtára már létezett",
+"Warning: Home directory for user \"{user}\" already exists" => "Figyelmeztetés: A felhasználó \"{user}\" kezdő könyvtára már létezik",
"__language_name__" => "__language_name__",
"Everything (fatal issues, errors, warnings, info, debug)" => "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)",
"Info, warnings, errors and fatal issues" => "Információk, figyelmeztetések, hibák és végzetes hibák",
@@ -67,37 +91,72 @@ $TRANSLATIONS = array(
"Errors and fatal issues" => "Hibák és végzetes hibák",
"Fatal issues only" => "Csak a végzetes hibák",
"None" => "Egyik sem",
-"Login" => "Bejelentkezés",
+"Login" => "Login",
+"Plain" => "Plain",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
"Security Warning" => "Biztonsági figyelmeztetés",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Jelenlegi elérése a következőnek '%s' jelenleg HTTP-n keresztül történik. Nagyon ajánlott, hogy a kiszolgálot úgy állitsd be, hogy HTTPS-t tudjál használni.",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "A %s szolgáltatás elérése jelenleg HTTP-n keresztül történik. Nagyon ajánlott, hogy a kiszolgálót úgy állítsa be, hogy az elérés HTTPS-en keresztül történjék.",
"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." => "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 erősen ajánlott, 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>.",
+"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Úgy tűnik, hogy a PHP úgy van beállítva, hogy eltávolítja programok belsejében elhelyezett szövegblokkokat. Emiatt a rendszer több alapvető fontosságú eleme működésképtelen lesz.",
+"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Ezt valószínűleg egy gyorsítótár ill. kódgyorsító, mint pl, a Zend, OPcache vagy eAccelererator okozza.",
+"Database Performance Info" => "Információ az adatbázis teljesítményéről",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "A kiválasztott adatbázis az SQLite. Nagyobb telepítések esetén ezt érdemes megváltoztatni. Másik adatbázisra való áttéréshez használja a következő parancssori eszközt: 'occ db:convert-type'",
"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 a telepítése a MIME-típusok felismerésének eredményessé tételéhez.",
+"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, mert ezzel lényegesen jobb a MIME-típusok felismerése.",
"Your PHP version is outdated" => "A PHP verzió túl régi",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "A PHP verzió túl régi. Nagyon ajánlott legalább az 5.3.8-as vagy újabb verzióra frissíteni, mert a régebbi verziónál léteznek ismert hibák. Ezért lehet a telepítésed elkézelhető, hogy nem müködik majd megfelelően.",
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "A PHP verzió túl régi. Nagyon ajánlott legalább az 5.3.8-as vagy újabb verzióra frissíteni, mert a régebbi verziónál léteznek ismert hibák. Ezért lehetséges, hogy ez a telepítés majd nem működik megfelelően.",
+"PHP charset is not set to UTF-8" => "A PHP-karakterkészlet nem UTF-8-ra van állítva",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "A PHP-karakterkészlet nem UTF-8-ra van állítva. Ez komoly problémákat okozhat, ha valaki olyan fájlnevet használ, amiben nem csupán ASCII karakterek fordulnak elő. Feltétlenül javasoljuk, hogy a php.ini-ben a 'default_charset' paramétert állítsa 'UTF-8'-ra!",
"Locale not working" => "A nyelvi lokalizáció nem működik",
-"System locale can not be set to a one which supports UTF-8." => "A rendszer lokálok nem lehetett olyat beállítani ami támogatja az UTF-8-at.",
-"This means that there might be problems with certain characters in file names." => "Ez arra utal, hogy probléma lehet néhány karakterrel a file neveiben.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Erősen ajánlott telepíteni a szükséges csomagokat a rendszeredbe amely támogat egyet a következő helyi beállítások közül: %s",
+"System locale can not be set to a one which supports UTF-8." => "A rendszer lokalizációs állományai között nem sikerült olyat beállítani, ami támogatja az UTF-8-at.",
+"This means that there might be problems with certain characters in file names." => "Ez azt jelenti, hogy probléma lehet bizonyos karakterekkel a fájlnevekben.",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Feltétlenül javasoljuk, hogy telepítse a szükséges csomagokat ahhoz, hogy a rendszere támogassa a következő lokalizációk valamelyikét: %s",
"Internet connection not working" => "Az internet kapcsolat nem működik",
-"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." => "A kiszolgálónak nincs müködő internet kapcsolata. Ez azt jelenti, hogy néhány képességét a kiszolgálónak mint például becsatolni egy külső tárolót, értesítések külső gyártók programjának frissítéséről nem fog müködni. A távolról való elérése a fileoknak és email értesítések küldése szintén nem fog müködni. Ha használni szeretnéd mindezeket a képességeit a szervernek, ahoz javasoljuk, hogy engedélyezzed az internet elérését a szervernek.",
+"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." => "A kiszolgálónak nem működik az internetkapcsolata. Ez azt jelenti, hogy bizonyos funkciók nem fognak működni, mint pl. külső tárolók becsatolása, automatikus frissítési értesítések vagy más fejlesztők /3rd party/ által írt alkalmazások telepítése. Az állományok távolról történő elérése valamint e-mail értesítések küldése szintén lehet, hogy nem fog működni. Javasoljuk, hogy engedélyezze a kiszolgáló internetelérését, ha az összes funkciót szeretné használni.",
+"URL generation in notification emails" => "URL-képzés az értesítő e-mailekben",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Ha a telepítése nem a webkiszolgáló gyökerében van, és a rendszer cron szolgáltatását használja, akkor problémák lehetnek az URL-ek képzésével. Ezek elkerülése érdekében állítsa be a config.php-ban az \"overwritewebroot\" paramétert a telepítés által használt webútvonalra. (Javasolt beállítás: \"%s\")",
"Cron" => "Ütemezett feladatok",
+"Last cron was executed at %s." => "Az utolsó cron feladat ekkor futott le: %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Az utolsó cron feladat ekkor futott le: %s. Ez több, mint 1 órája történt, valami nincs rendben.",
+"Cron was not executed yet!" => "A cron feladat még nem futott le!",
"Execute one task with each page loaded" => "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
+"Use system's cron service to call the cron.php file every 15 minutes." => "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
"Sharing" => "Megosztás",
"Allow apps to use the Share API" => "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást",
-"Allow public uploads" => "Feltöltést engedélyezése mindenki számára",
-"Allow resharing" => "A továbbosztás engedélyezése",
+"Allow users to share via link" => "Engedjük meg az állományok linkekkel történő megosztását",
+"Enforce password protection" => "Legyen kötelező a linkek jelszóval való védelme",
+"Allow public uploads" => "Nyilvános feltöltés engedélyezése",
+"Set default expiration date" => "Alapértelmezett lejárati idő beállítása",
+"Expire after " => "A lejárat legyen",
+"days" => "nap",
+"Enforce expiration date" => "A beállított lejárati idő legyen kötelezően érvényes",
+"Allow resharing" => "A megosztás továbbadásának engedélyezése",
+"Restrict users to only share with users in their groups" => "A csoporttagok csak a saját csoportjukon belül oszthassanak meg anyagokat",
+"Allow users to send mail notification for shared files" => "A felhasználók küldhessenek e-mail értesítést a megosztás létrejöttéről",
+"Exclude groups from sharing" => "Csoportok megosztási jogának tiltása",
+"These groups will still be able to receive shares, but not to initiate them." => "E csoportok tagjaival meg lehet osztani anyagokat, de ők nem hozhatnak létre megosztást.",
"Security" => "Biztonság",
"Enforce HTTPS" => "Kötelező HTTPS",
"Forces the clients to connect to %s via an encrypted connection." => "Kötelezővé teszi, hogy a böngészőprogramok titkosított csatornán kapcsolódjanak a %s szolgáltatáshoz.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Kérjük kapcsolodjon a %s rendszerhez HTTPS protokollon keresztül, hogy be vagy ki kapcsoljaa kötelező SSL beállítást.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Kérjük, hogy HTTPS protokollon keresztül kapcsolódjon a %s rendszerhez, ha be- vagy ki akarja kapcsolni a kötelező SSL-beállítást!",
+"Email Server" => "E-mail kiszolgáló",
+"This is used for sending out notifications." => "Ezt használjuk a jelentések kiküldésére.",
+"From address" => "A feladó címe",
+"mail" => "mail",
+"Authentication required" => "Felhasználóazonosítás szükséges",
"Server address" => "A kiszolgáló címe",
"Port" => "Port",
"Credentials" => "Azonosítók",
+"SMTP Username" => "SMTP felhasználónév",
+"SMTP Password" => "SMTP jelszó",
+"Test email settings" => "Az e-mail beállítások ellenőrzése",
+"Send email" => "E-mail küldése",
"Log" => "Naplózás",
"Log level" => "Naplózási szint",
"More" => "Több",
@@ -107,15 +166,19 @@ $TRANSLATIONS = array(
"Add your App" => "Az alkalmazás hozzáadása",
"More Apps" => "További alkalmazások",
"Select an App" => "Válasszon egy alkalmazást",
+"Documentation:" => "Leírások:",
"See application page at apps.owncloud.com" => "Lásd apps.owncloud.com, alkalmazások oldal",
+"See application website" => "Lásd az alkalmazások weboldalát",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-a jogtuladonos <span class=\"author\"></span>",
+"Enable only for specific groups" => "Csak bizonyos csoportok számára tegyük elérhetővé",
"All" => "Mind",
"Administrator Documentation" => "Üzemeltetői leírás",
"Online Documentation" => "Online leírás",
"Forum" => "Fórum",
"Bugtracker" => "Hibabejelentések",
"Commercial Support" => "Megvásárolható támogatás",
-"Get the apps to sync your files" => "Töltse le az állományok szinkronizációjához szükséges programokat",
+"Get the apps to sync your files" => "Töltse le az állományok szinkronizációjához szükséges programokat!",
+"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Ha támogatni kívánja a projektet\n <a href=\"https://owncloud.org/contribute\"\n target=\"_blank\">csatlakozzon a fejlesztőkhöz</a>\n vagy\n <a href=\"https://owncloud.org/promote\"\n target=\"_blank\">terjessze a program hírét</a>!",
"Show First Run Wizard again" => "Nézzük meg újra az első bejelentkezéskori segítséget!",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>",
"Password" => "Jelszó",
@@ -125,32 +188,44 @@ $TRANSLATIONS = array(
"New password" => "Az új jelszó",
"Change password" => "A jelszó megváltoztatása",
"Full Name" => "Teljes név",
-"Email" => "Email",
-"Your email address" => "Az Ön email címe",
+"Email" => "E-mail",
+"Your email address" => "Az Ön e-mail címe",
+"Fill in an email address to enable password recovery and receive notifications" => "Adja meg az e-mail címét, hogy vissza tudja állítani a jelszavát, illetve, hogy rendszeres jelentéseket kaphasson!",
"Profile picture" => "Profilkép",
"Upload new" => "Új feltöltése",
-"Select new from Files" => "Új kiválasztása Fileokból",
-"Remove image" => "Kép eltávolítása",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Egyaránt png vagy jpg. Az ideális ha négyzet alaku, de késöbb még átszabható",
-"Your avatar is provided by your original account." => "Az avatarod az eredeti fiókod alapján van beállítva.",
+"Select new from Files" => "Új kiválasztása a Fájlokból",
+"Remove image" => "A kép eltávolítása",
+"Either png or jpg. Ideally square but you will be able to crop it." => "A kép png vagy jpg formátumban legyen. Legjobb, ha négyzet alakú, de később még átszabható.",
+"Your avatar is provided by your original account." => "A kép az eredeti bejelentkezési adatai alapján lett beállítva.",
"Cancel" => "Mégsem",
-"Choose as profile image" => "Válassz profil képet",
+"Choose as profile image" => "Válasszuk ki profilképnek",
"Language" => "Nyelv",
"Help translate" => "Segítsen a fordításban!",
-"The encryption app is no longer enabled, please decrypt all your files" => "A titkosító alkalmazás továbbiakban nem lesz engedélyezve, szüntesd meg a titkosítását a file-jaidnak.",
+"SSL root certificates" => "SSL tanúsítványok",
+"Import Root Certificate" => "SSL tanúsítványok importálása",
+"The encryption app is no longer enabled, please decrypt all your files" => "A titkosító alkalmazás a továbbiakban nincs engedélyezve, kérem állítsa vissza az állományait titkostásmentes állapotba!",
"Log-in password" => "Bejelentkezési jelszó",
-"Decrypt all Files" => "Kititkosítja az összes file-t",
+"Decrypt all Files" => "Mentesíti a titkosítástól az összes fájlt",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "A titkosító kulcsai egy mentési területre kerültek. Ha valami hiba történik, még vissza tudja állítani a titkosító kulcsait. Csak akkor törölje őket véglegesen, ha biztos benne, hogy minden állományt sikerült a visszaállítani a titkosított állapotából.",
+"Restore Encryption Keys" => "A titkosító kulcsok visszaállítása",
+"Delete Encryption Keys" => "A titkosító kulcsok törlése",
"Login Name" => "Bejelentkezési név",
"Create" => "Létrehozás",
-"Admin Recovery Password" => "A jelszóvisszaállítás adminisztrációja",
+"Admin Recovery Password" => "Adminisztrátori jelszó az állományok visszanyerésére",
"Enter the recovery password in order to recover the users files during password change" => "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat",
+"Search Users and Groups" => "Keresés a felhasználók és a csoportok között",
+"Add Group" => "Csoport létrehozása",
"Group" => "Csoport",
+"Everyone" => "Mindenki",
+"Admins" => "Adminok",
"Default Quota" => "Alapértelmezett kvóta",
"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Kérjük adja meg a tárolási kvótát (pl. \"512 MB\" vagy \"12 GB\")",
"Unlimited" => "Korlátlan",
"Other" => "Más",
"Username" => "Felhasználónév",
"Quota" => "Kvóta",
+"Storage Location" => "A háttértár helye",
+"Last Login" => "Utolsó bejelentkezés",
"change full name" => "a teljes név megváltoztatása",
"set new password" => "új jelszó beállítása",
"Default" => "Alapértelmezett"
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index 99d08df7b8f..68da624b95e 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -10,8 +10,8 @@ $TRANSLATIONS = array(
"So-so password" => "Contrasigno passabile",
"Good password" => "Contrasigno bon",
"Strong password" => "Contrasigno forte",
-"Groups" => "Gruppos",
"Delete" => "Deler",
+"Groups" => "Gruppos",
"never" => "nunquam",
"__language_name__" => "Interlingua",
"Security Warning" => "Aviso de securitate",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 2819105cdba..6763c0899e6 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -50,11 +50,11 @@ $TRANSLATIONS = array(
"So-so password" => "Sandi lumayan",
"Good password" => "Sandi baik",
"Strong password" => "Sandi kuat",
+"Delete" => "Hapus",
"Decrypting files... Please wait, this can take some time." => "Mendeskripsi berkas... Modon tunggu, ini memerlukan beberapa saat.",
"undo" => "urungkan",
"Groups" => "Grup",
"Group Admin" => "Admin Grup",
-"Delete" => "Hapus",
"never" => "tidak pernah",
"add group" => "tambah grup",
"A valid username must be provided" => "Tuliskan nama pengguna yang valid",
@@ -153,6 +153,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Pilih sebagai gambar profil",
"Language" => "Bahasa",
"Help translate" => "Bantu menerjemahkan",
+"SSL root certificates" => "Sertifikat root SSL",
+"Import Root Certificate" => "Impor Sertifikat Root",
"The encryption app is no longer enabled, please decrypt all your files" => "Aplikasi enkripsi tidak lagi diaktifkan, silahkan mendekripsi semua file Anda",
"Log-in password" => "Sandi masuk",
"Decrypt all Files" => "Deskripsi semua Berkas",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index 2d5b6c0f5e9..7b6e5deea21 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -23,10 +23,10 @@ $TRANSLATIONS = array(
"Error" => "Villa",
"Update" => "Uppfæra",
"Updated" => "Uppfært",
+"Delete" => "Eyða",
"undo" => "afturkalla",
"Groups" => "Hópar",
"Group Admin" => "Hópstjóri",
-"Delete" => "Eyða",
"never" => "aldrei",
"__language_name__" => "__nafn_tungumáls__",
"None" => "Ekkert",
@@ -58,6 +58,8 @@ $TRANSLATIONS = array(
"Cancel" => "Hætta við",
"Language" => "Tungumál",
"Help translate" => "Hjálpa við þýðingu",
+"SSL root certificates" => "SSL rótar skilríki",
+"Import Root Certificate" => "Flytja inn rótar skilríki",
"Create" => "Búa til",
"Unlimited" => "Ótakmarkað",
"Other" => "Annað",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index a8425eb2cd9..89d22d20b4e 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Password amministrativa di ripristino errata. Controlla la password e prova ancora.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente.",
"Unable to change password" => "Impossibile cambiare la password",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Sei sicuro di voler aggiungere \"{domain}\" come dominio attendibile?",
+"Add trusted domain" => "Aggiungi dominio attendibile",
"Sending..." => "Invio in corso...",
"User Documentation" => "Documentazione utente",
"Admin Documentation" => "Documentazione di amministrazione",
@@ -64,6 +66,8 @@ $TRANSLATIONS = array(
"So-so password" => "Password così-così",
"Good password" => "Password buona",
"Strong password" => "Password forte",
+"Valid until {date}" => "Valido fino al {date}",
+"Delete" => "Elimina",
"Decrypting files... Please wait, this can take some time." => "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.",
"Delete encryption keys permanently." => "Elimina definitivamente le chiavi di cifratura.",
"Restore encryption keys." => "Ripristina le chiavi di cifratura.",
@@ -74,7 +78,6 @@ $TRANSLATIONS = array(
"undo" => "annulla",
"Groups" => "Gruppi",
"Group Admin" => "Gruppi amministrati",
-"Delete" => "Elimina",
"never" => "mai",
"deleted {userName}" => "{userName} eliminato",
"add group" => "aggiungi gruppo",
@@ -108,12 +111,16 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME.",
"Your PHP version is outdated" => "La tua versione di PHP è obsoleta",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "La tua versione di PHP è obsoleta. Ti consigliamo vivamente di aggiornare alla versione 5.3.8 o successiva poiché sono noti problemi con le vecchie versioni. L'installazione attuale potrebbe non funzionare correttamente.",
+"PHP charset is not set to UTF-8" => "Il set di caratteri di PHP non è impostato a UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Il set di caratteri di PHP non è impostato a UTF-8. Ciò può essere causa di problemi con i caratteri non ASCII nei nomi dei file. Consigliamo vivamente di cambiare il valore di 'default_charset' nel file php.ini a 'UTF-8'.",
"Locale not working" => "Locale non funzionante",
"System locale can not be set to a one which supports UTF-8." => "La localizzazione di sistema non può essere impostata a una che supporta UTF-8.",
"This means that there might be problems with certain characters in file names." => "Ciò significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Consigliamo vivamente di installare i pacchetti richiesti sul tuo sistema per supportare una delle\nlocalizzazioni seguenti: %s.",
"Internet connection not working" => "Connessione Internet non funzionante",
"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." => "Questo server ownCloud non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. L'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità.",
+"URL generation in notification emails" => "Generazione di URL nelle email di notifica",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Se la tua installazione non si trova nella radice del dominio e utilizza il cron di sistema, potrebbero esserci problemi con la generazione degli URL. Per evitare questi problemi, imposta l'opzione \"overwritewebroot\" nel file config.php al percorso della radice del sito della tua installazione (Suggerito: \"%s\")",
"Cron" => "Cron",
"Last cron was executed at %s." => "L'ultimo cron è stato eseguito alle %s.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "L'ultimo cron è stato eseguito alle %s. È più di un'ora fa, potrebbe esserci qualche problema.",
@@ -195,12 +202,20 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Scegli come immagine del profilo",
"Language" => "Lingua",
"Help translate" => "Migliora la traduzione",
+"SSL root certificates" => "Certificati SSL radice",
+"Common Name" => "Nome comune",
+"Valid until" => "Valido fino al",
+"Issued By" => "Emesso da",
+"Valid until %s" => "Valido fino al %s",
+"Import Root Certificate" => "Importa certificato radice",
"The encryption app is no longer enabled, please decrypt all your files" => "L'applicazione di cifratura non è più abilitata, decifra tutti i tuoi file",
"Log-in password" => "Password di accesso",
"Decrypt all Files" => "Decifra tutti i file",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Le tue chiavi di cifratura sono state spostate in una posizione sicura. Se qualcosa non dovesse funzionare, potrai ripristinare le chiavi. Eliminale definitivamente solo se sei sicuro che tutti i file siano stati decifrati.",
"Restore Encryption Keys" => "Ripristina chiavi di cifratura",
"Delete Encryption Keys" => "Elimina chiavi di cifratura",
+"Show storage location" => "Mostra posizione di archiviazione",
+"Show last log in" => "Mostra ultimo accesso",
"Login Name" => "Nome utente",
"Create" => "Crea",
"Admin Recovery Password" => "Password di ripristino amministrativa",
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
index 2d941e8a483..3f4348d22a9 100644
--- a/settings/l10n/ja.php
+++ b/settings/l10n/ja.php
@@ -17,7 +17,7 @@ $TRANSLATIONS = array(
"Group already exists" => "グループはすでに存在します",
"Unable to add group" => "グループを追加できません",
"Files decrypted successfully" => "ファイルの復号化に成功しました",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "ファイルを復号化することができませんでした。owncloud のログを調査するか、管理者に連絡してください。",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "ファイルを復号化することができませんでした。owncloud.logを調査するか、管理者に連絡してください。",
"Couldn't decrypt your files, check your password and try again" => "ファイルを復号化することができませんでした。パスワードを確認のうえ再試行してください。",
"Encryption keys deleted permanently" => "暗号化キーは完全に削除されます",
"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "暗号化キーを完全に削除できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "バックエンドはパスワード変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。",
"Unable to change password" => "パスワードを変更できません",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "\"{domain}\" を信頼するドメインに追加してもよろしいでしょうか?",
+"Add trusted domain" => "信頼するドメイン名に追加",
"Sending..." => "送信中…",
"User Documentation" => "ユーザードキュメント",
"Admin Documentation" => "管理者ドキュメント",
@@ -64,6 +66,8 @@ $TRANSLATIONS = array(
"So-so password" => "まずまずのパスワード",
"Good password" => "良好なパスワード",
"Strong password" => "強いパスワード",
+"Valid until {date}" => "{date} まで有効",
+"Delete" => "削除",
"Decrypting files... Please wait, this can take some time." => "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
"Delete encryption keys permanently." => "暗号化キーを永久に削除する。",
"Restore encryption keys." => "暗号化キーを復元する。",
@@ -74,7 +78,6 @@ $TRANSLATIONS = array(
"undo" => "元に戻す",
"Groups" => "グループ",
"Group Admin" => "グループ管理者",
-"Delete" => "削除",
"never" => "なし",
"deleted {userName}" => "{userName} を削除しました",
"add group" => "グループを追加",
@@ -96,27 +99,31 @@ $TRANSLATIONS = array(
"TLS" => "TLS",
"Security Warning" => "セキュリティ警告",
"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "HTTP経由で %s にアクセスしています。HTTPSを使用するようサーバーを設定することを強くおすすめします。",
-"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." => "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリがアクセスされないようにウェブサーバーを設定するか、ウェブサーバーのドキュメントルートからデータディレクトリを移動するように強くお勧めします。",
+"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." => "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリにアクセスできないようWebサーバーを設定するか、データディレクトリをWebサーバーのドキュメントルートから移動するよう強く提案します。",
"Setup Warning" => "セットアップ警告",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
"Please double check the <a href=\"%s\">installation guides</a>." => "<a href=\"%s\">installation guides</a>をもう一度チェックするようにお願いいたします。",
"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHPでインラインドキュメントブロックを取り除く設定になっています。これによりコアアプリで利用できないものがいくつかあります。",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "これは、Zend OPcacheやeAccelerator 等のキャッシュ/アクセラレータが原因かもしれません。",
"Database Performance Info" => "データベースパフォーマンス情報",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite をデータベースとして利用します。大規模な運用では、利用しないことをお勧めします。別のデータベースへ移行する場合は、コマンドラインツール: 'occ db:convert-type'を使ってください。",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite をデータベースとして利用しています。大規模な運用では、利用しないことをお勧めします。別のデータベースへ移行する場合は、コマンドラインツール: 'occ db:convert-type'を使ってください。",
"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' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。",
"Your PHP version is outdated" => "PHPバーションが古くなっています。",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "PHPバーションが古くなっています。古いバージョンには既知の問題があるため、5.3.8以降のバージョンにアップデートすることを強く推奨します。このインストール状態では正常に動作しない可能性があります。",
+"PHP charset is not set to UTF-8" => "PHP の文字コードは UTF-8 に設定されていません",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP の文字コードは UTF-8 に設定されていません。ファイル名に非アスキー文字が含まれる場合は、大きな問題となる可能性があります。php.ini の 'default_charset' の値を 'UTF-8' に変更することを強くお勧めします。",
"Locale not working" => "ロケールが動作していません",
"System locale can not be set to a one which supports UTF-8." => "システムロケールを UTF-8 をサポートするロケールに設定できません。",
"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 one of the following locales: %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." => "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。全ての機能を利用したいのであれば、このサーバーからインターネットに接続できるようにすることをお勧めします。",
+"URL generation in notification emails" => "通知メールにURLを生成",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwritewebroot\" オプションをインストールしたパスに設定してください。(推奨: \"%s\")",
"Cron" => "Cron",
-"Last cron was executed at %s." => "直近では %s に cron が実行されました。",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "直近では %s に cron が実行されました。これは今から1時間以上前なので、なんらかの問題が発生しているようです。",
+"Last cron was executed at %s." => "直近では%sにcronが実行されました。",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "直近では%sにcronが実行されました。これは1時間以上前になるので、何かおかしいです。",
"Cron was not executed yet!" => "cron は未だ実行されていません!",
"Execute one task with each page loaded" => "各ページの読み込み時にタスクを実行する",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています",
@@ -126,7 +133,7 @@ $TRANSLATIONS = array(
"Allow users to share via link" => "URLリンクで共有を許可する",
"Enforce password protection" => "常にパスワード保護を有効にする",
"Allow public uploads" => "パブリックなアップロードを許可する",
-"Set default expiration date" => "有効期限の既定値を設定",
+"Set default expiration date" => "有効期限のデフォルト値を設定",
"Expire after " => "無効になるまで",
"days" => "日",
"Enforce expiration date" => "有効期限を反映させる",
@@ -134,16 +141,16 @@ $TRANSLATIONS = array(
"Restrict users to only share with users in their groups" => "グループ内のユーザーでのみ共有するように制限する",
"Allow users to send mail notification for shared files" => "共有ファイルに関するメール通知の送信をユーザーに許可する",
"Exclude groups from sharing" => "共有可能なグループから除外",
-"These groups will still be able to receive shares, but not to initiate them." => "このグループでは、フォルダ共有を開始することはできませんが、共有されたフォルダを参照することはできます。",
+"These groups will still be able to receive shares, but not to initiate them." => "このグループでは、フォルダー共有を開始することはできませんが、共有されたフォルダーを参照することはできます。",
"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." => "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。",
"Email Server" => "メールサーバー",
"This is used for sending out notifications." => "これは通知の送信に使われます。",
-"From address" => "アドレスから",
+"From address" => "送信元アドレス",
"mail" => "メール",
-"Authentication required" => "要求される認証",
+"Authentication required" => "認証を必要とする",
"Server address" => "サーバーアドレス",
"Port" => "ポート",
"Credentials" => "資格情報",
@@ -174,7 +181,7 @@ $TRANSLATIONS = array(
"Get the apps to sync your files" => "ファイルを同期するためのアプリを取得",
"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "もしプロジェクトをサポートしていただけるなら、\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">開発に参加する</a>\n\t\t、もしくは\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">プロジェクトを広く伝えてください</a>!",
"Show First Run Wizard again" => "初回ウィザードを再表示する",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています",
+"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" => "パスワードを変更することができません",
@@ -186,8 +193,8 @@ $TRANSLATIONS = array(
"Your email address" => "あなたのメールアドレス",
"Fill in an email address to enable password recovery and receive notifications" => "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください",
"Profile picture" => "プロフィール写真",
-"Upload new" => "新規にアップロード",
-"Select new from Files" => "ファイルから新規に選択",
+"Upload new" => "新たにアップロード",
+"Select new from Files" => "新しいファイルを選択",
"Remove image" => "画像を削除",
"Either png or jpg. Ideally square but you will be able to crop it." => "pngまたはjpg形式。正方形が理想ですが、切り取って加工することもできます。",
"Your avatar is provided by your original account." => "あなたのアバターは、あなたのオリジナルのアカウントで提供されています。",
@@ -195,12 +202,20 @@ $TRANSLATIONS = array(
"Choose as profile image" => "プロファイル画像として選択",
"Language" => "言語",
"Help translate" => "翻訳に協力する",
+"SSL root certificates" => "SSLルート証明書",
+"Common Name" => "コモンネーム",
+"Valid until" => "有効期限",
+"Issued By" => "発行元",
+"Valid until %s" => "%s まで有効",
+"Import Root Certificate" => "ルート証明書をインポート",
"The encryption app is no longer enabled, please decrypt all your files" => "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
"Log-in password" => "ログインパスワード",
"Decrypt all Files" => "すべてのファイルを複合する",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "暗号化キーはバックアップ場所に移動されました。何か問題があった場合は、キーを復元することができます。すべてのファイルが正しく復号化されたことが確信できる場合にのみ、キーを完全に削除してください。",
"Restore Encryption Keys" => "暗号化キーを復元する",
"Delete Encryption Keys" => "暗号化キーを削除する",
+"Show storage location" => "データの保存場所を表示",
+"Show last log in" => "最終ログインを表示",
"Login Name" => "ログイン名",
"Create" => "作成",
"Admin Recovery Password" => "管理者リカバリパスワード",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
deleted file mode 100644
index 7a2802d588a..00000000000
--- a/settings/l10n/ja_JP.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Invalid value supplied for %s" => "%s に提供された無効な値",
-"Saved" => "保存されました",
-"test email settings" => "eメール設定をテスト",
-"If you received this email, the settings seem to be correct." => "このメールを受け取ったら、設定は正しいはずです。",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "メールの送信中に問題が発生しました。設定を再考してください。",
-"Email sent" => "メールを送信しました",
-"You need to set your user email before being able to send test emails." => "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
-"Send mode" => "送信モード",
-"Encryption" => "暗号化",
-"Authentication method" => "認証方法",
-"Unable to load list from App Store" => "アプリストアからリストをロードできません",
-"Authentication error" => "認証エラー",
-"Your full name has been changed." => "フルネームを変更しました。",
-"Unable to change full name" => "フルネームを変更できません",
-"Group already exists" => "グループはすでに存在します",
-"Unable to add group" => "グループを追加できません",
-"Email saved" => "メールアドレスを保存しました",
-"Invalid 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." => "アプリをアップデートできませんでした。",
-"Wrong password" => "無効なパスワード",
-"No user supplied" => "ユーザーが指定されていません",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "リカバリ用の管理者パスワードを入力してください。そうでない場合は、全ユーザーのデータが失われます。",
-"Wrong admin recovery password. Please check the password and try again." => "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "バックエンドはパスワード変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。",
-"Unable to change password" => "パスワードを変更できません",
-"Sending..." => "送信中…",
-"User Documentation" => "ユーザードキュメント",
-"Admin Documentation" => "管理者ドキュメント",
-"Update to {appversion}" => "{appversion} にアップデート",
-"Disable" => "無効",
-"Enable" => "有効にする",
-"Please wait...." => "しばらくお待ちください。",
-"Error while disabling app" => "アプリ無効化中にエラーが発生",
-"Error while enabling app" => "アプリを有効にする際にエラーが発生",
-"Updating...." => "更新中....",
-"Error while updating app" => "アプリの更新中にエラーが発生",
-"Error" => "エラー",
-"Update" => "アップデート",
-"Updated" => "アップデート済み",
-"Select a profile picture" => "プロファイル画像を選択",
-"Very weak password" => "非常に弱いパスワード",
-"Weak password" => "弱いパスワード",
-"So-so password" => "まずまずのパスワード",
-"Good password" => "良好なパスワード",
-"Strong password" => "強いパスワード",
-"Decrypting files... Please wait, this can take some time." => "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
-"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" => "有効なパスワードを指定する必要があります",
-"Warning: Home directory for user \"{user}\" already exists" => "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します",
-"__language_name__" => "Japanese (日本語)",
-"Everything (fatal issues, errors, warnings, info, debug)" => "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
-"Info, warnings, errors and fatal issues" => "情報、警告、エラー、致命的な問題",
-"Warnings, errors and fatal issues" => "警告、エラー、致命的な問題",
-"Errors and fatal issues" => "エラー、致命的な問題",
-"Fatal issues only" => "致命的な問題のみ",
-"None" => "なし",
-"Login" => "ログイン",
-"Plain" => "平文",
-"NT LAN Manager" => "NT LAN マネージャー",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "セキュリティ警告",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "HTTP経由で %s にアクセスしています。HTTPSを使用するようサーバーを設定することを強くおすすめします。",
-"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." => "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリがアクセスされないようにウェブサーバーを設定するか、ウェブサーバーのドキュメントルートからデータディレクトリを移動するように強くお勧めします。",
-"Setup Warning" => "セットアップ警告",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
-"Please double check the <a href=\"%s\">installation guides</a>." => "<a href=\"%s\">installation guides</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' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。",
-"Your PHP version is outdated" => "PHPバーションが古くなっています。",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "PHPバーションが古くなっています。古いバージョンには既知の問題があるため、5.3.8以降のバージョンにアップデートすることを強く推奨します。このインストール状態では正常に動作しない可能性があります。",
-"Locale not working" => "ロケールが動作していません",
-"System locale can not be set to a one which supports UTF-8." => "システムロケールを UTF-8 をサポートするロケールに設定できません。",
-"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 one of the following locales: %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." => "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。全ての機能を利用したいのであれば、このサーバーからインターネットに接続できるようにすることをお勧めします。",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "各ページの読み込み時にタスクを実行する",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています",
-"Use systems cron service to call the cron.php file every 15 minutes." => "システムのcronサービスを利用して15分ごとに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" => "ユーザーにグループ内のユーザーとのみ共有を許可する",
-"Allow mail notification" => "メール通知を許可",
-"Allow user to send mail notification for shared files" => "共有ファイルに関するメール通知の送信をユーザーに許可する",
-"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." => "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。",
-"Email Server" => "メールサーバー",
-"This is used for sending out notifications." => "これは通知の送信に使われます。",
-"From address" => "アドレスから",
-"Authentication required" => "要求される認証",
-"Server address" => "サーバーアドレス",
-"Port" => "ポート",
-"Credentials" => "資格情報",
-"SMTP Username" => "SMTP ユーザー名",
-"SMTP Password" => "SMTP パスワード",
-"Test email settings" => "メールテスト設定",
-"Send email" => "メールを送信",
-"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\">ソースコード</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" => "アプリを選択してください",
-"Documentation:" => "ドキュメント:",
-"See application page at apps.owncloud.com" => "apps.owncloud.com でアプリケーションのページを見てください",
-"See application website" => "アプリケーションのウェブサイトを見る",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>",
-"Administrator Documentation" => "管理者ドキュメント",
-"Online Documentation" => "オンラインドキュメント",
-"Forum" => "フォーラム",
-"Bugtracker" => "バグトラッカー",
-"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" => "Current password",
-"New password" => "新しいパスワードを入力",
-"Change password" => "パスワードを変更",
-"Full Name" => "名前",
-"Email" => "メール",
-"Your email address" => "あなたのメールアドレス",
-"Fill in an email address to enable password recovery and receive notifications" => "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください",
-"Profile picture" => "プロフィール写真",
-"Upload new" => "新規にアップロード",
-"Select new from Files" => "ファイルから新規に選択",
-"Remove image" => "画像を削除",
-"Either png or jpg. Ideally square but you will be able to crop it." => "png と jpg のいずれか。正方形が理想ですが、切り取って加工することも可能です。",
-"Your avatar is provided by your original account." => "あなたのアバターは、あなたのオリジナルのアカウントで提供されています。",
-"Cancel" => "キャンセル",
-"Choose as profile image" => "プロファイル画像として選択",
-"Language" => "言語",
-"Help translate" => "翻訳に協力する",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">WebDAV 経由でファイルにアクセス</a> するにはこのアドレスを利用してください",
-"The encryption app is no longer enabled, please decrypt all your files" => "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
-"Log-in password" => "ログインパスワード",
-"Decrypt all Files" => "すべてのファイルを複合する",
-"Login Name" => "ログイン名",
-"Create" => "作成",
-"Admin Recovery Password" => "管理者リカバリパスワード",
-"Enter the recovery password in order to recover the users files during password change" => "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
-"Default Storage" => "デフォルトストレージ",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "ストレージの割り当てを入力してください (例: \"512MB\" や \"12 GB\")",
-"Unlimited" => "無制限",
-"Other" => "その他",
-"Username" => "ユーザー名",
-"Storage" => "ストレージ",
-"change full name" => "フルネームを変更",
-"set new password" => "新しいパスワードを設定",
-"Default" => "デフォルト"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ka.php b/settings/l10n/ka.php
deleted file mode 100644
index e9024a3c1c9..00000000000
--- a/settings/l10n/ka.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Password" => "პაროლი"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index 64bb4eda964..93d68d77a33 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -26,10 +26,10 @@ $TRANSLATIONS = array(
"Error" => "შეცდომა",
"Update" => "განახლება",
"Updated" => "განახლებულია",
+"Delete" => "წაშლა",
"undo" => "დაბრუნება",
"Groups" => "ჯგუფები",
"Group Admin" => "ჯგუფის ადმინისტრატორი",
-"Delete" => "წაშლა",
"never" => "არასდროს",
"add group" => "ჯგუფის დამატება",
"A valid username must be provided" => "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
@@ -86,6 +86,8 @@ $TRANSLATIONS = array(
"Cancel" => "უარყოფა",
"Language" => "ენა",
"Help translate" => "თარგმნის დახმარება",
+"SSL root certificates" => "SSL root სერთიფიკატები",
+"Import Root Certificate" => "Root სერთიფიკატის იმპორტირება",
"Login Name" => "მომხმარებლის სახელი",
"Create" => "შექმნა",
"Default Quota" => "საწყისი ქვოტა",
diff --git a/settings/l10n/km.php b/settings/l10n/km.php
index c32a6375ebb..9fad5affe41 100644
--- a/settings/l10n/km.php
+++ b/settings/l10n/km.php
@@ -41,11 +41,11 @@ $TRANSLATIONS = array(
"So-so password" => "ពាក្យ​សម្ងាត់​ធម្មតា",
"Good password" => "ពាក្យ​សម្ងាត់​ល្អ",
"Strong password" => "ពាក្យ​សម្ងាត់​ខ្លាំង",
+"Delete" => "លុប",
"Decrypting files... Please wait, this can take some time." => "កំពុង Decrypt​ ឯកសារ... សូម​រង​ចាំ វា​អាច​ត្រូវការ​ពេល​មួយ​ចំនួន។",
"undo" => "មិន​ធ្វើ​វិញ",
"Groups" => "ក្រុ",
"Group Admin" => "ក្រុម​អ្នក​គ្រប់គ្រង",
-"Delete" => "លុប",
"never" => "មិនដែរ",
"add group" => "បន្ថែម​ក្រុម",
"A valid username must be provided" => "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 015d2c7125c..3c7e4e2eb36 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -52,13 +52,13 @@ $TRANSLATIONS = array(
"So-so password" => "그저 그런 암호",
"Good password" => "좋은 암호",
"Strong password" => "강력한 암호",
+"Delete" => "삭제",
"Decrypting files... Please wait, this can take some time." => "파일 복호화 중... 시간이 걸릴 수도 있으니 기다려 주십시오.",
"Error creating group" => "그룹을 생성하던 중 오류가 발생하였습니다",
"deleted {groupName}" => "{groupName} 삭제됨",
"undo" => "실행 취소",
"Groups" => "그룹",
"Group Admin" => "그룹 관리자",
-"Delete" => "삭제",
"never" => "없음",
"deleted {userName}" => "{userName} 삭제됨",
"add group" => "그룹 추가",
@@ -157,6 +157,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "프로필 이미지로 사용",
"Language" => "언어",
"Help translate" => "번역 돕기",
+"SSL root certificates" => "SSL 루트 인증서",
+"Import Root Certificate" => "루트 인증서 가져오기",
"The encryption app is no longer enabled, please decrypt all your files" => "암호화 앱이 비활성화되었습니다. 모든 파일을 복호화해야 합니다.",
"Log-in password" => "로그인 암호",
"Decrypt all Files" => "모든 파일 복호화",
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index ee771a400d5..b52dc1df073 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -17,10 +17,10 @@ $TRANSLATIONS = array(
"Enable" => "Aschalten",
"Error" => "Fehler",
"Update" => "Update",
+"Delete" => "Läschen",
"undo" => "réckgängeg man",
"Groups" => "Gruppen",
"Group Admin" => "Gruppen Admin",
-"Delete" => "Läschen",
"never" => "ni",
"__language_name__" => "__language_name__",
"Login" => "Login",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index c36ac57b76b..600221cb57f 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -35,11 +35,11 @@ $TRANSLATIONS = array(
"Update" => "Atnaujinti",
"Updated" => "Atnaujinta",
"Select a profile picture" => "Pažymėkite profilio paveikslėlį",
+"Delete" => "Ištrinti",
"Decrypting files... Please wait, this can take some time." => "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.",
"undo" => "anuliuoti",
"Groups" => "Grupės",
"Group Admin" => "Grupės administratorius",
-"Delete" => "Ištrinti",
"never" => "niekada",
"add group" => "pridėti grupę",
"A valid username must be provided" => "Vartotojo vardas turi būti tinkamas",
@@ -111,6 +111,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Pasirinkite profilio paveiksliuką",
"Language" => "Kalba",
"Help translate" => "Padėkite išversti",
+"SSL root certificates" => "SSL sertifikatas",
+"Import Root Certificate" => "Įkelti pagrindinį sertifikatą",
"Log-in password" => "Prisijungimo slaptažodis",
"Decrypt all Files" => "Iššifruoti visus failus",
"Login Name" => "Vartotojo vardas",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 1aa8bd049cf..78a49ad86c1 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -26,11 +26,11 @@ $TRANSLATIONS = array(
"Error" => "Kļūda",
"Update" => "Atjaunināt",
"Updated" => "Atjaunināta",
+"Delete" => "Dzēst",
"Decrypting files... Please wait, this can take some time." => "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku.",
"undo" => "atsaukt",
"Groups" => "Grupas",
"Group Admin" => "Grupas administrators",
-"Delete" => "Dzēst",
"never" => "nekad",
"add group" => "pievienot grupu",
"A valid username must be provided" => "Jānorāda derīgs lietotājvārds",
@@ -93,6 +93,8 @@ $TRANSLATIONS = array(
"Cancel" => "Atcelt",
"Language" => "Valoda",
"Help translate" => "Palīdzi tulkot",
+"SSL root certificates" => "SSL saknes sertifikāti",
+"Import Root Certificate" => "Importēt saknes sertifikātus",
"Log-in password" => "Pieslēgšanās parole",
"Decrypt all Files" => "Atšifrēt visus failus",
"Login Name" => "Ierakstīšanās vārds",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index f5748bc6f2a..0da1474ef76 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -49,6 +49,7 @@ $TRANSLATIONS = array(
"So-so password" => "Така така лозинка",
"Good password" => "Добра лозинка",
"Strong password" => "Јака лозинка",
+"Delete" => "Избриши",
"Delete encryption keys permanently." => "Трајно бришење на енкрипциските клучеви.",
"Restore encryption keys." => "Поврати ги енкрипцисиките клучеви.",
"Error creating group" => "Грешка при креирање на група",
@@ -56,7 +57,6 @@ $TRANSLATIONS = array(
"undo" => "врати",
"Groups" => "Групи",
"Group Admin" => "Администратор на група",
-"Delete" => "Избриши",
"never" => "никогаш",
"add group" => "додади група",
"A valid username must be provided" => "Мора да се обезбеди валидно корисничко име ",
@@ -149,6 +149,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Одбери фотографија за профилот",
"Language" => "Јазик",
"Help translate" => "Помогни во преводот",
+"SSL root certificates" => "SSL root сертификати",
+"Import Root Certificate" => "Увези",
"Log-in password" => "Лозинка за најавување",
"Decrypt all Files" => "Дешифрирај ги сите датотеки",
"Restore Encryption Keys" => "Обнови ги енкрипциските клучеви",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 131930bf1c8..690b92bc732 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -9,8 +9,8 @@ $TRANSLATIONS = array(
"Enable" => "Aktif",
"Error" => "Ralat",
"Update" => "Kemaskini",
-"Groups" => "Kumpulan",
"Delete" => "Padam",
+"Groups" => "Kumpulan",
"never" => "jangan",
"__language_name__" => "_nama_bahasa_",
"Login" => "Log masuk",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index a3bbadafcb7..4aec3ed4cd9 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Feil administrativt gjenopprettingspassord. Sjekk passordet og prøv igjen.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Serveren støtter ikke endring av passord, men oppdatering av brukerens krypteringsnøkkel var vellykket.",
"Unable to change password" => "Kunne ikke endre passord",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Ønsker du virkelig å legge til \"{domain}\" som tiltrodd domene?",
+"Add trusted domain" => "Legg til et tiltrodd domene",
"Sending..." => "Sender...",
"User Documentation" => "Brukerdokumentasjon",
"Admin Documentation" => "Admin-dokumentasjon",
@@ -64,6 +66,7 @@ $TRANSLATIONS = array(
"So-so password" => "So-so-passord",
"Good password" => "Bra passord",
"Strong password" => "Sterkt passord",
+"Delete" => "Slett",
"Decrypting files... Please wait, this can take some time." => "Dekrypterer filer... Vennligst vent, dette kan ta litt tid.",
"Delete encryption keys permanently." => "Slett krypteringsnøkler permanent.",
"Restore encryption keys." => "Gjenopprett krypteringsnøkler.",
@@ -74,7 +77,6 @@ $TRANSLATIONS = array(
"undo" => "angre",
"Groups" => "Grupper",
"Group Admin" => "Gruppeadministrator",
-"Delete" => "Slett",
"never" => "aldri",
"deleted {userName}" => "slettet {userName}",
"add group" => "legg til gruppe",
@@ -108,12 +110,16 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.",
"Your PHP version is outdated" => "Din PHP-versjon er udatert",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "PHP-versjonen din er utdatert. Vi anbefaler på det sterkeste at du oppdaterer til 5.3.8 eller nyere fordi eldre versjoner ikke vil virke. Det er mulig at denne installasjoner ikke fungerer korrekt.",
+"PHP charset is not set to UTF-8" => "PHP-tegnsett er ikke satt til UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP-tegnsett er ikke satt til UTF-8. Dette kan forårsake store problemer med tegn som ikke er ASCII i filnavn. Vi anbefaler på det sterkeste å endre verdien av 'default_charset' i php.ini til 'UTF-8'.",
"Locale not working" => "Nasjonale innstillinger virker ikke",
"System locale can not be set to a one which supports UTF-8." => "Kan ikke sette systemets nasjonale innstillinger til en som støtter UTF-8.",
"This means that there might be problems with certain characters in file names." => "Dette betyr at det kan forekomme problemer med visse tegn i filnavn.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Vi anbefaler på det sterkeste å installere pakkene som er nødvendig for at systemet skal støtte en av følgende nasjonale innstillinger: %s.",
"Internet connection not working" => "Ingen internettilkopling",
"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." => "Denne serveren har ikke en fungerende Internett-tilkobling. Dette betyr at noen av funksjonene, f.eks. å koble opp ekstern lagring, påminnelser om oppdatering eller installering av 3-parts apper ikke fungerer. Fjerntilgang til filer og utsending av påminnelser i e-post virker kanskje ikke heller. Vi anbefaler at Internett-forbindelsen for denne serveren aktiveres hvis du vil ha full funksjonalitet.",
+"URL generation in notification emails" => "URL-generering i varsel-eposter",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Hvis installasjonen din ikke er installert i roten av domenet og bruker system cron, kan det bli problemer med URL-generering. For å forhindre disse problemene, sett \"overwritewebroot\" i filen config.php til webroot-stien for installasjonen din (Forslag: \"%s\")",
"Cron" => "Cron",
"Last cron was executed at %s." => "Siste cron ble utført %s.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Siste cron ble utført %s. Dette er mer enn en time siden. Noe ser ut til å være galt.",
@@ -195,6 +201,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Velg som profilbilde",
"Language" => "Språk",
"Help translate" => "Bidra til oversettelsen",
+"SSL root certificates" => "SSL rotsertifikater",
+"Import Root Certificate" => "Importer rotsertifikat",
"The encryption app is no longer enabled, please decrypt all your files" => "Krypterings-appen er ikke aktiv lenger. Vennligst dekrypter alle filene dine",
"Log-in password" => "Innloggingspassord",
"Decrypt all Files" => "Dekrypter alle filer",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 40f2e4c5410..e2f33e96e91 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -6,7 +6,7 @@ $TRANSLATIONS = array(
"If you received this email, the settings seem to be correct." => "Als u dit e-mailbericht ontvangt, lijken de instellingen juist.",
"A problem occurred while sending the e-mail. Please revisit your settings." => "Er ontstond een probleem bij het versturen van de e-mail. Controleer uw instellingen.",
"Email sent" => "E-mail verzonden",
-"You need to set your user email before being able to send test emails." => "U moet uw e-mailadres instellen voordat u testberichten kunt versturen.",
+"You need to set your user email before being able to send test emails." => "U moet uw e-mailadres invoeren voordat u testberichten kunt versturen.",
"Send mode" => "Verstuurmodus",
"Encryption" => "Versleuteling",
"Authentication method" => "Authenticatiemethode",
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Onjuist beheerdersherstelwachtwoord. Controleer het wachtwoord en probeer het opnieuw.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt.",
"Unable to change password" => "Kan wachtwoord niet wijzigen",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Weet u zeker dat u \"{domain}\" als een vertrouwd domein wilt toevoegen?",
+"Add trusted domain" => "Vertrouwd domein toevoegen",
"Sending..." => "Versturen...",
"User Documentation" => "Gebruikersdocumentatie",
"Admin Documentation" => "Beheerdocumentatie",
@@ -64,6 +66,8 @@ $TRANSLATIONS = array(
"So-so password" => "Matig wachtwoord",
"Good password" => "Goed wachtwoord",
"Strong password" => "Sterk wachtwoord",
+"Valid until {date}" => "Geldig tot {date}",
+"Delete" => "Verwijder",
"Decrypting files... Please wait, this can take some time." => "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.",
"Delete encryption keys permanently." => "Verwijder de encryptiesleutels permanent",
"Restore encryption keys." => "Herstel de encryptiesleutels",
@@ -74,7 +78,6 @@ $TRANSLATIONS = array(
"undo" => "ongedaan maken",
"Groups" => "Groepen",
"Group Admin" => "Groep beheerder",
-"Delete" => "Verwijder",
"never" => "geen",
"deleted {userName}" => "verwijderd {userName}",
"add group" => "toevoegen groep",
@@ -108,12 +111,16 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie.",
"Your PHP version is outdated" => "Uw PHP versie is verouderd",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Uw PHP versie is verouderd. We adviseren met klem om bij te werken naar versie 5.3.8 of later, omdat oudere versies corrupt kunnen zijn. Het is mogelijk dat deze installatie niet goed werkt.",
+"PHP charset is not set to UTF-8" => "PHP characterset is niet ingesteld op UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP characterset is niet ingesteld op UTF-8. Dit kan flinke problemen opleveren met niet-ASCII tekens in bestandsnamen. We adviseren om de waarde van 'default_charset' in php.ini te wijzigen in 'UTF-8'.",
"Locale not working" => "Taalbestand werkt niet",
"System locale can not be set to a one which supports UTF-8." => "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt.",
"This means that there might be problems with certain characters in file names." => "Dat betekent dat er problemen kunnen optreden met bepaalde tekens in bestandsnamen.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "We adviseren met klem om de noodzakelijke pakketten op uw systeem te installeren om een van de volgende talen te ondersteunen: %s.",
"Internet connection not working" => "Internet verbinding werkt niet",
"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." => "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.",
+"URL generation in notification emails" => "URL genereren in notificatie e-mails",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Als uw installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou u de \"overwritewebroot\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
"Cron" => "Cron",
"Last cron was executed at %s." => "Laatst uitgevoerde cron op %s.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Laatst uitgevoerde cron op %s. Dat is langer dan een uur geleden, er is iets fout gegaan.",
@@ -156,7 +163,7 @@ $TRANSLATIONS = array(
"More" => "Meer",
"Less" => "Minder",
"Version" => "Versie",
-"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>." => "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">bron code</a> is gelicenseerd onder de <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>." => "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">broncode</a> is gelicenseerd onder de <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" => "App toevoegen",
"More Apps" => "Meer apps",
"Select an App" => "Selecteer een app",
@@ -171,10 +178,10 @@ $TRANSLATIONS = array(
"Forum" => "Forum",
"Bugtracker" => "Bugtracker",
"Commercial Support" => "Commerciële ondersteuning",
-"Get the apps to sync your files" => "Download de apps om bestanden te syncen",
+"Get the apps to sync your files" => "Download de apps om bestanden te synchroniseren",
"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Als u het project wilt ondersteunen\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">ontwikkel mee</a>\n\t\tof\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">verkondig het nieuws</a>!",
"Show First Run Wizard again" => "Toon de Eerste start Wizard opnieuw",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "U heeft <strong>%s</strong> gebruikt van de beschikbare <strong>%s</strong>",
"Password" => "Wachtwoord",
"Your password was changed" => "Je wachtwoord is veranderd",
"Unable to change your password" => "Niet in staat om uw wachtwoord te wijzigen",
@@ -184,23 +191,31 @@ $TRANSLATIONS = array(
"Full Name" => "Volledige naam",
"Email" => "E-mailadres",
"Your email address" => "Uw e-mailadres",
-"Fill in an email address to enable password recovery and receive notifications" => "Vul een e-mailbericht in om wachtwoordherstel mogelijk te maken en meldingen te ontvangen",
+"Fill in an email address to enable password recovery and receive notifications" => "Vul een e-mailadres in om wachtwoordherstel mogelijk te maken en meldingen te ontvangen",
"Profile picture" => "Profielafbeelding",
"Upload new" => "Upload een nieuwe",
"Select new from Files" => "Selecteer een nieuwe vanuit bestanden",
"Remove image" => "Verwijder afbeelding",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Of png, of jpg. Bij voorkeur vierkant, maar u kunt bijsnijden.",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Of png, of jpg. Bij voorkeur vierkant, maar u kunt de afbeelding bijsnijden.",
"Your avatar is provided by your original account." => "Uw avatar is verstrekt door uw originele account.",
"Cancel" => "Annuleer",
"Choose as profile image" => "Kies als profielafbeelding",
"Language" => "Taal",
"Help translate" => "Help met vertalen",
+"SSL root certificates" => "SSL root certificaten",
+"Common Name" => "Common Name",
+"Valid until" => "Geldig tot",
+"Issued By" => "Uitgegeven door",
+"Valid until %s" => "Geldig tot %s",
+"Import Root Certificate" => "Importeer root certificaat",
"The encryption app is no longer enabled, please decrypt all your files" => "De crypto app is niet langer geactiveerd, u moet alle bestanden decrypten.",
"Log-in password" => "Inlog-wachtwoord",
"Decrypt all Files" => "Decodeer alle bestanden",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Uw cryptosleutels zijn verplaatst naar een backup locatie. Als iets iets verkeerd ging, kunt u de sleutels herstellen. Verwijder ze alleen permanent als u zeker weet dat de bestanden goed zijn versleuteld.",
"Restore Encryption Keys" => "Herstel cryptosleutels",
"Delete Encryption Keys" => "Verwijder cryptosleutels",
+"Show storage location" => "Toon opslaglocatie",
+"Show last log in" => "Toon laatste inlog",
"Login Name" => "Inlognaam",
"Create" => "Aanmaken",
"Admin Recovery Password" => "Beheer herstel wachtwoord",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 025472aff99..264a1da64cb 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -35,11 +35,13 @@ $TRANSLATIONS = array(
"Update" => "Oppdater",
"Updated" => "Oppdatert",
"Select a profile picture" => "Vel eit profilbilete",
+"Very weak password" => "Veldig svakt passord",
+"Weak password" => "Svakt passord",
+"Delete" => "Slett",
"Decrypting files... Please wait, this can take some time." => "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.",
"undo" => "angra",
"Groups" => "Grupper",
"Group Admin" => "Gruppestyrar",
-"Delete" => "Slett",
"never" => "aldri",
"add group" => "legg til gruppe",
"A valid username must be provided" => "Du må oppgje eit gyldig brukarnamn",
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index 5f503dc5c15..bdec607c164 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -15,10 +15,10 @@ $TRANSLATIONS = array(
"Disable" => "Desactiva",
"Enable" => "Activa",
"Error" => "Error",
+"Delete" => "Escafa",
"undo" => "defar",
"Groups" => "Grops",
"Group Admin" => "Grop Admin",
-"Delete" => "Escafa",
"never" => "jamai",
"__language_name__" => "__language_name__",
"Login" => "Login",
diff --git a/settings/l10n/pa.php b/settings/l10n/pa.php
index f746f1f4caf..d65309c9dd1 100644
--- a/settings/l10n/pa.php
+++ b/settings/l10n/pa.php
@@ -7,10 +7,10 @@ $TRANSLATIONS = array(
"Updating...." => "...ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
"Error" => "ਗਲਤੀ",
"Updated" => "ਅੱਪਡੇਟ ਕੀਤਾ",
+"Delete" => "ਹਟਾਓ",
"undo" => "ਵਾਪਸ",
"Groups" => "ਗਰੁੱਪ",
"Group Admin" => "ਗਰੁੱਪ ਐਡਮਿਨ",
-"Delete" => "ਹਟਾਓ",
"add group" => "ਗਰੁੱਪ ਸ਼ਾਮਲ",
"__language_name__" => "__ਭਾਸ਼ਾ_ਨਾਂ__",
"Login" => "ਲਾਗਇਨ",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index ad6a2ee3ffc..7994fcd893d 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Błędne hasło odzyskiwania. Sprawdź hasło i spróbuj ponownie.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownika został pomyślnie zaktualizowany.",
"Unable to change password" => "Nie można zmienić hasła",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Czy jesteś pewien/pewna że chcesz dodać \"{domain}\" jako zaufaną domenę?",
+"Add trusted domain" => "Dodaj zaufaną domenę",
"Sending..." => "Wysyłam...",
"User Documentation" => "Dokumentacja użytkownika",
"Admin Documentation" => "Dokumentacja Administratora",
@@ -64,6 +66,7 @@ $TRANSLATIONS = array(
"So-so password" => "Mało skomplikowane hasło",
"Good password" => "Dobre hasło",
"Strong password" => "Mocne hasło",
+"Delete" => "Usuń",
"Decrypting files... Please wait, this can take some time." => "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.",
"Delete encryption keys permanently." => "Usuń trwale klucze szyfrujące.",
"Restore encryption keys." => "Przywróć klucze szyfrujące.",
@@ -74,7 +77,6 @@ $TRANSLATIONS = array(
"undo" => "cofnij",
"Groups" => "Grupy",
"Group Admin" => "Administrator grupy",
-"Delete" => "Usuń",
"never" => "nigdy",
"deleted {userName}" => "usunięto {userName}",
"add group" => "dodaj grupę",
@@ -108,12 +110,16 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.",
"Your PHP version is outdated" => "Twoja wersja PHP jest za stara",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Twoja wersja PHP jest za stara. Rekomendujemy przynajmniej wersje 5.3.8. Jeśli masz starsza wersję ownCloud może nie działać poprawnie.",
+"PHP charset is not set to UTF-8" => "Kodowanie PHP nie jest ustawione na UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Zestaw znaków PHP nie jest ustawiony na UTF-8. Może to spowodować poważne problemy ze znakami non-ASCII w nazwach plików. Gorąco doradzamy zmianę wartości 'default_charset' w php.ini na 'UTF-8'.",
"Locale not working" => "Lokalizacja nie działa",
"System locale can not be set to a one which supports UTF-8." => "Ustawienia regionalne systemu nie można ustawić na jeden, który obsługuje UTF-8.",
"This means that there might be problems with certain characters in file names." => "Oznacza to, że mogą być problemy z niektórymi znakami w nazwach plików.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Zalecamy, aby zainstalować wymagane pakiety w systemie, jeden z następujących języków: %s.",
"Internet connection not working" => "Połączenie internetowe nie działa",
"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." => "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub 3-cie aplikacje mogą nie działać. Dostęp do plików z zewnątrz i wysyłanie powiadomienia e-mail nie może również działać. Sugerujemy, aby włączyć połączenia internetowego dla tego serwera, jeśli chcesz mieć wszystkie opcje.",
+"URL generation in notification emails" => "Generowanie URL w powiadomieniach email",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Jeśli Twoja instalacja nie jest zainstalowana w katalogu głównym serwera www, a system używa cron-a, mogą występować problemy z generowaniem URL-i. Aby uniknąć tych problemów, proszę ustawić opcję \"overwritewebroot\" w pliku config.php na ścieżkę z adresu www Twojej instalacji (Sugerowane: \"%s\")",
"Cron" => "Cron",
"Last cron was executed at %s." => "Ostatni cron był uruchomiony %s.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Ostatni cron był uruchomiony %s. To jest więcej niż godzinę temu, wygląda na to, że coś jest nie tak.",
@@ -195,6 +201,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Wybierz zdjęcie profilu",
"Language" => "Język",
"Help translate" => "Pomóż w tłumaczeniu",
+"SSL root certificates" => "Główny certyfikat SSL",
+"Import Root Certificate" => "Importuj główny certyfikat",
"The encryption app is no longer enabled, please decrypt all your files" => "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik",
"Log-in password" => "Hasło logowania",
"Decrypt all Files" => "Odszyfruj wszystkie pliki",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 62b5116a4c2..c70b6c10986 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso....",
"Unable to change password" => "Impossível modificar senha",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Você tem certeza que você quer adicionar \"{domain}\" como domínio confiável?",
+"Add trusted domain" => "Adicionar domínio confiável",
"Sending..." => "Enviando...",
"User Documentation" => "Documentação de Usuário",
"Admin Documentation" => "Documentação de Administrador",
@@ -64,6 +66,8 @@ $TRANSLATIONS = array(
"So-so password" => "Senha mais ou menos",
"Good password" => "Boa senha",
"Strong password" => "Senha forte",
+"Valid until {date}" => "Vádido até {date}",
+"Delete" => "Excluir",
"Decrypting files... Please wait, this can take some time." => "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
"Delete encryption keys permanently." => "Eliminando a chave de criptografia permanentemente.",
"Restore encryption keys." => "Restaurar chave de criptografia.",
@@ -74,7 +78,6 @@ $TRANSLATIONS = array(
"undo" => "desfazer",
"Groups" => "Grupos",
"Group Admin" => "Grupo Administrativo",
-"Delete" => "Excluir",
"never" => "nunca",
"deleted {userName}" => "eliminado {userName}",
"add group" => "adicionar grupo",
@@ -108,12 +111,16 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).",
"Your PHP version is outdated" => "Sua versão de PHP está desatualizada",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "A sua versão do PHP está desatualizada. Recomendamos a atualização para 5.3.8 ou mais recente, pois as versões mais antigas são conhecidas por serem quebradas. É possível que esta instalação não esteja funcionando corretamente.",
+"PHP charset is not set to UTF-8" => "A configuração de caracteres no PHP não está definida para UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "A configuração de caracteres para o PHP não está definida para UTF-8. Isto pode causar problemas com caracteres não-ASCII em nomes de arquivos. Nós fortemente recomendamos a troca da definição de caracteres de 'default_charset' no arquivo de configuração php.ini para 'UTF-8'.",
"Locale not working" => "Localização não funcionando",
"System locale can not be set to a one which supports UTF-8." => "Localidade do sistema não pode ser definido como um que suporta UTF-8.",
"This means that there might be problems with certain characters in file names." => "Isso significa que pode haver problemas com certos caracteres nos nomes de arquivo.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Nós fortemente sugerimos instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s.",
"Internet connection not working" => "Sem conexão com a internet",
"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." => "Este servidor não tem conexão com a internet. Isso significa que algumas das características como a montagem de armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de 3ºs terceiros não funcionam. Acessar arquivos remotamente e envio de e-mails de notificação também não podem funcionar. Sugerimos permitir conexão com a internet para esse servidor, se você deseja ter todas as funcionalidades.",
+"URL generation in notification emails" => "Geração de URL em e-mails de notificação",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Se a sua instalação não estiver instalada na raiz do domínio e usa cron do sistema, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
"Cron" => "Cron",
"Last cron was executed at %s." => "Último cron foi executado em %s.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Última cron foi executado em %s. Isso é, mais de uma hora atrás, algo parece errado.",
@@ -195,12 +202,20 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Escolha como imagem para o perfil",
"Language" => "Idioma",
"Help translate" => "Ajude a traduzir",
+"SSL root certificates" => "Certificados SSL raíz",
+"Common Name" => "Nome",
+"Valid until" => "Válido até",
+"Issued By" => "Emitido Por",
+"Valid until %s" => "Válido até %s",
+"Import Root Certificate" => "Importar Certificado Raíz",
"The encryption app is no longer enabled, please decrypt all your files" => "O aplicativo de criptografia não está habilitado, por favor descriptar todos os seus arquivos",
"Log-in password" => "Senha de login",
"Decrypt all Files" => "Descriptografar todos os Arquivos",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Suas chaves de criptografia forão movidas para o local de backup. Se alguma coisa deu errado, você pode salvar as chaves. Só excluí-las permanentemente se você tiver certeza de que todos os arquivos forão descriptografados corretamente.",
"Restore Encryption Keys" => "Restaurar Chaves de Criptografia",
"Delete Encryption Keys" => "Eliminar Chaves de Criptografia",
+"Show storage location" => "Mostrar localização de armazenamento",
+"Show last log in" => "Mostrar o último acesso",
"Login Name" => "Nome de Login",
"Create" => "Criar",
"Admin Recovery Password" => "Recuperação da Senha do Administrador",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 9f0d5228633..49bfdf3ba72 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Não foi possível alterar a sua palavra-passe, mas a chave de encriptação foi atualizada.",
"Unable to change password" => "Não foi possível alterar a sua password",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
+"Add trusted domain" => "Adicionar domínio confiável ",
"Sending..." => "A enviar...",
"User Documentation" => "Documentação de Utilizador",
"Admin Documentation" => "Documentação de administrador.",
@@ -64,6 +66,7 @@ $TRANSLATIONS = array(
"So-so password" => "Password aceitável",
"Good password" => "Password Forte",
"Strong password" => "Password muito forte",
+"Delete" => "Eliminar",
"Decrypting files... Please wait, this can take some time." => "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
"Delete encryption keys permanently." => "Excluir as chaves encriptadas de forma permanente.",
"Restore encryption keys." => "Restaurar chaves encriptadas.",
@@ -74,7 +77,6 @@ $TRANSLATIONS = array(
"undo" => "desfazer",
"Groups" => "Grupos",
"Group Admin" => "Grupo Administrador",
-"Delete" => "Eliminar",
"never" => "nunca",
"deleted {userName}" => "apagar{utilizador}",
"add group" => "Adicionar grupo",
@@ -108,12 +110,16 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "O Módulo PHP 'fileinfo' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.",
"Your PHP version is outdated" => "A sua versão do PHP está ultrapassada",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "A sua versão do PHP está ultrapassada. Recomendamos que actualize para a versão 5.3.8 ou mais recente, devido às versões anteriores conterem problemas. É também possível que esta instalação não esteja a funcionar correctamente.",
+"PHP charset is not set to UTF-8" => "PHP charset não está definido para UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP charset não está definido como UTF-8. Isso pode causar grandes problemas com caracteres não-ASCII em nomes de arquivo. Recomendamos para alterar o valor de php.ini 'default_charset' para 'UTF-8'.",
"Locale not working" => "Internacionalização não está a funcionar",
"System locale can not be set to a one which supports UTF-8." => "Não é possível pôr as definições de sistema compatíveis com UTF-8.",
"This means that there might be problems with certain characters in file names." => "Isto significa que podem haver problemas com alguns caracteres nos nomes dos ficheiros.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s.",
"Internet connection not working" => "A ligação à internet não está a funcionar",
"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." => "Este servidor ownCloud não tem uma ligação de internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretender obter todas as funcionalidades do ownCloud.",
+"URL generation in notification emails" => "Geração URL em e-mails de notificação",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
"Cron" => "Cron",
"Last cron was executed at %s." => "O ultimo cron foi executado em %s.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "O ultima cron foi executado em %s a mais duma hora. Algo não está certo.",
@@ -195,6 +201,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Escolha uma fotografia de perfil",
"Language" => "Idioma",
"Help translate" => "Ajude a traduzir",
+"SSL root certificates" => "Certificados SSL de raiz",
+"Import Root Certificate" => "Importar Certificado Root",
"The encryption app is no longer enabled, please decrypt all your files" => "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros",
"Log-in password" => "Password de entrada",
"Decrypt all Files" => "Desencriptar todos os ficheiros",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 3b5f5f4c0e1..cf410a45da0 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -47,11 +47,11 @@ $TRANSLATIONS = array(
"Weak password" => "Parolă slabă",
"Good password" => "Parolă bună",
"Strong password" => "Parolă puternică",
+"Delete" => "Șterge",
"Decrypting files... Please wait, this can take some time." => "Decriptare fișiere... Te rog așteaptă, poate dura ceva timp.",
"undo" => "Anulează ultima acțiune",
"Groups" => "Grupuri",
"Group Admin" => "Grupul Admin ",
-"Delete" => "Șterge",
"never" => "niciodată",
"add group" => "adăugaţi grupul",
"A valid username must be provided" => "Trebuie să furnizaţi un nume de utilizator valid",
@@ -124,6 +124,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Alege drept imagine de profil",
"Language" => "Limba",
"Help translate" => "Ajută la traducere",
+"SSL root certificates" => "Certificate SSL root",
+"Import Root Certificate" => "Importă certificat root",
"Log-in password" => "Parolă",
"Decrypt all Files" => "Decriptează toate fișierele",
"Login Name" => "Autentificare",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index e4d1b5a2a37..ebf87025971 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Неправильный пароль восстановления. Проверьте пароль и попробуйте еще раз.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён",
"Unable to change password" => "Невозможно изменить пароль",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Вы действительно хотите добавить домен \"{domain}\" как доверенный?",
+"Add trusted domain" => "Добавить доверенный домен",
"Sending..." => "Отправляется ...",
"User Documentation" => "Пользовательская документация",
"Admin Documentation" => "Документация администратора",
@@ -63,7 +65,8 @@ $TRANSLATIONS = array(
"Weak password" => "Слабый пароль",
"So-so password" => "Так себе пароль",
"Good password" => "Хороший пароль",
-"Strong password" => "Устойчивый к взлому пароль",
+"Strong password" => "Стойкий пароль",
+"Delete" => "Удалить",
"Decrypting files... Please wait, this can take some time." => "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
"Delete encryption keys permanently." => "Перманентно удалить ключи шифрования. ",
"Restore encryption keys." => "Восстановить ключи шифрования.",
@@ -74,7 +77,6 @@ $TRANSLATIONS = array(
"undo" => "отмена",
"Groups" => "Группы",
"Group Admin" => "Администратор группы",
-"Delete" => "Удалить",
"never" => "никогда",
"deleted {userName}" => "удалён {userName}",
"add group" => "добавить группу",
@@ -108,6 +110,7 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-модуль 'fileinfo' отсутствует. Мы настоятельно рекомендуем включить этот модуль для улучшения определения типов (mime-type) файлов.",
"Your PHP version is outdated" => "Ваша версия PHP устарела",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Ваша версия PHP устарела. Мы настоятельно рекомендуем обновиться до 5.3.8 или новее, так как старые версии работают не корректно. Вполне возможно, что эта установка не работает должным образом.",
+"PHP charset is not set to UTF-8" => "Кодировка PHP не совпадает с UTF-8",
"Locale not working" => "Локализация не работает",
"System locale can not be set to a one which supports UTF-8." => "Невозможно установить системную локаль, поддерживающую UTF-8",
"This means that there might be problems with certain characters in file names." => "Это значит, что могут быть проблемы с некоторыми символами в именах файлов.",
@@ -195,6 +198,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Установить как аватар",
"Language" => "Язык",
"Help translate" => "Помочь с переводом",
+"SSL root certificates" => "Корневые сертификаты SSL",
+"Import Root Certificate" => "Импортировать корневые сертификаты",
"The encryption app is no longer enabled, please decrypt all your files" => "Приложение для шифрования выключено, пожалуйста, расшифруйте ваши файлы",
"Log-in password" => "Пароль входа",
"Decrypt all Files" => "Снять шифрование со всех файлов",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 898ff77f6af..83a1393f52d 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -16,10 +16,10 @@ $TRANSLATIONS = array(
"Enable" => "සක්‍රිය කරන්න",
"Error" => "දෝෂයක්",
"Update" => "යාවත්කාල කිරීම",
+"Delete" => "මකා දමන්න",
"undo" => "නිෂ්ප්‍රභ කරන්න",
"Groups" => "කණ්ඩායම්",
"Group Admin" => "කාණ්ඩ පරිපාලක",
-"Delete" => "මකා දමන්න",
"never" => "කවදාවත්",
"None" => "කිසිවක් නැත",
"Login" => "ප්‍රවිශ්ටය",
@@ -46,6 +46,8 @@ $TRANSLATIONS = array(
"Cancel" => "එපා",
"Language" => "භාෂාව",
"Help translate" => "පරිවර්ථන සහය",
+"SSL root certificates" => "SSL මූල සහතිකයන්",
+"Import Root Certificate" => "මූල සහතිකය ආයාත කරන්න",
"Login Name" => "ප්‍රවිශ්ටය",
"Create" => "තනන්න",
"Default Quota" => "සාමාන්‍ය සලාකය",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 99073b16c5b..9743d4d3f70 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -64,6 +64,7 @@ $TRANSLATIONS = array(
"So-so password" => "Priemerné heslo",
"Good password" => "Dobré heslo",
"Strong password" => "Silné heslo",
+"Delete" => "Zmazať",
"Decrypting files... Please wait, this can take some time." => "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať.",
"Delete encryption keys permanently." => "Natrvalo vymazať šifrovacie kľúče.",
"Restore encryption keys." => "Obnoviť šifrovacie kľúče.",
@@ -74,7 +75,6 @@ $TRANSLATIONS = array(
"undo" => "vrátiť",
"Groups" => "Skupiny",
"Group Admin" => "Správca skupiny",
-"Delete" => "Zmazať",
"never" => "nikdy",
"deleted {userName}" => "vymazané {userName}",
"add group" => "pridať skupinu",
@@ -100,6 +100,7 @@ $TRANSLATIONS = array(
"Setup Warning" => "Nastavenia oznámení a upozornení",
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
"Please double check the <a href=\"%s\">installation guides</a>." => "Skontrolujte prosím znovu <a href=\"%s\">inštalačnú príručku</a>.",
+"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP je zjavne nastavené, aby odstraňovalo bloky vloženej dokumentácie. To zneprístupní niekoľko základných aplikácií.",
"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "To je pravdepodobne spôsobené cache/akcelerátorom ako napr. Zend OPcache alebo eAccelerator.",
"Database Performance Info" => "Informácie o výkone databázy",
"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Ako databáza je použitá SQLite. Pre väčšie inštalácie vám to odporúčame zmeniť. Na prenos do inej databázy použite nástroj príkazového riadka: \"occ db:convert-typ\"",
@@ -107,6 +108,8 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnutie najlepších výsledkov zisťovania mime-typu.",
"Your PHP version is outdated" => "Vaša PHP verzia je zastaraná",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Táto verzia PHP je zastaraná. Dôrazne vám odporúčame aktualizovať na verziu 5.3.8 alebo novšiu, lebo staršie verzie sú chybné. Je možné, že táto inštalácia nebude fungovať správne.",
+"PHP charset is not set to UTF-8" => "Znaková sada PHP nie je nastavená na UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Predvolená znaková sada PHP nie je nastavená na UTF-8. To môže spôsobiť veľké problémy v prípade ne-ASCII znakov v názvoch súborov. Dôrazne odporúčame zmeniť hodnotu \"default_charset\" v php.ini na \"UTF-8\".",
"Locale not working" => "Lokalizácia nefunguje",
"System locale can not be set to a one which supports UTF-8." => "Nie je možné nastaviť znakovú sadu, ktorá podporuje UTF-8.",
"This means that there might be problems with certain characters in file names." => "To znamená, že sa môžu vyskytnúť problémy s niektorými znakmi v názvoch súborov.",
@@ -119,6 +122,7 @@ $TRANSLATIONS = array(
"Cron was not executed yet!" => "Cron sa ešte nespustil!",
"Execute one task with each page loaded" => "Vykonať jednu úlohu s každým načítaní stránky",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php je zaregistrovaná v službe WebCron a zavolá cron.php každých 15 minút cez http.",
+"Use system's cron service to call the cron.php file every 15 minutes." => "Použiť systémovú službu cron na spúšťanie súboru cron.php každých 15 minút.",
"Sharing" => "Zdieľanie",
"Allow apps to use the Share API" => "Povoliť aplikáciám používať API na zdieľanie",
"Allow users to share via link" => "Povoliť používateľom zdieľanie pomocou odkazov",
@@ -170,6 +174,7 @@ $TRANSLATIONS = array(
"Bugtracker" => "Bugtracker",
"Commercial Support" => "Komerčná podpora",
"Get the apps to sync your files" => "Získať aplikácie na synchronizáciu vašich súborov",
+"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Ak chcete podporiť projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">pridajte sa do vývoja</a>\n\t\talebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">pomáhajte šíriť povedomie</a>!",
"Show First Run Wizard again" => "Znovu zobraziť sprievodcu prvým spustením",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných ",
"Password" => "Heslo",
@@ -192,6 +197,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Vybrať ako avatara",
"Language" => "Jazyk",
"Help translate" => "Pomôcť s prekladom",
+"SSL root certificates" => "Koreňové SSL certifikáty",
+"Import Root Certificate" => "Importovať koreňový certifikát",
"The encryption app is no longer enabled, please decrypt all your files" => "Šifrovacia aplikácia už nie je spustená, dešifrujte všetky svoje súbory.",
"Log-in password" => "Prihlasovacie heslo",
"Decrypt all Files" => "Dešifrovať všetky súbory",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 95c59e00232..ad61e242f52 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
"If you received this email, the settings seem to be correct." => "Če ste prejeli to sporočilo, so nastavitve pravilne.",
"A problem occurred while sending the e-mail. Please revisit your settings." => "Prišlo je do napake med pošiljanjem sporočila na elektronski naslov. Spremeniti je treba nastavitve.",
"Email sent" => "Elektronska pošta je poslana",
+"You need to set your user email before being able to send test emails." => "Pred preizkusnim pošiljanjem sporočil je treba nastaviti elektronski naslov uporabnika.",
"Send mode" => "Način pošiljanja",
"Encryption" => "Šifriranje",
"Authentication method" => "Način overitve",
@@ -36,6 +37,7 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Napačno navedeno skrbniško obnovitveno geslo. Preverite geslo in poskusite znova.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Hrbtišče programa ne podpira spreminjanja gesla, je pa uspešno posodobljeno uporabniško šifriranje.",
"Unable to change password" => "Ni mogoče spremeniti gesla",
+"Add trusted domain" => "Dodaj varno domeno",
"Sending..." => "Poteka pošiljanje ...",
"User Documentation" => "Uporabniška dokumentacija",
"Admin Documentation" => "Skrbniška dokumentacija",
@@ -60,6 +62,7 @@ $TRANSLATIONS = array(
"So-so password" => "Slabo geslo",
"Good password" => "Dobro geslo",
"Strong password" => "Odlično geslo",
+"Delete" => "Izbriši",
"Decrypting files... Please wait, this can take some time." => "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno.",
"Delete encryption keys permanently." => "Trajno izbriše šifrirne ključe",
"Restore encryption keys." => "Obnovi šifrirne ključe.",
@@ -68,7 +71,6 @@ $TRANSLATIONS = array(
"undo" => "razveljavi",
"Groups" => "Skupine",
"Group Admin" => "Skrbnik skupine",
-"Delete" => "Izbriši",
"never" => "nikoli",
"add group" => "dodaj skupino",
"A valid username must be provided" => "Navedeno mora biti veljavno uporabniško ime",
@@ -111,7 +113,10 @@ $TRANSLATIONS = array(
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "Datoteka cron.php je vpisana v storitvi webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
"Sharing" => "Souporaba",
"Allow apps to use the Share API" => "Dovoli programom uporabo vmesnika API souporabe",
+"Enforce password protection" => "Vsili zaščito z geslom",
"Allow public uploads" => "Dovoli javno pošiljanje datotek v oblak",
+"Set default expiration date" => "Nastavitev privzetega datuma poteka",
+"days" => "dni",
"Allow resharing" => "Dovoli nadaljnjo souporabo",
"Allow users to send mail notification for shared files" => "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
"Security" => "Varnost",
@@ -147,6 +152,7 @@ $TRANSLATIONS = array(
"Bugtracker" => "Sledilnik hroščev",
"Commercial Support" => "Podpora strankam",
"Get the apps to sync your files" => "Pridobi programe za usklajevanje datotek",
+"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Če želite podpreti projekt,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">prispevajte k razvoju</a>\n\t\tali pa\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">seznanite druge o zmožnostih oblaka.</a>!",
"Show First Run Wizard again" => "Zaženi čarovnika prvega zagona",
"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora.",
"Password" => "Geslo",
@@ -168,6 +174,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Izberi kot sliko profila",
"Language" => "Jezik",
"Help translate" => "Sodelujte pri prevajanju",
+"SSL root certificates" => "Korenska potrdila SSL",
+"Import Root Certificate" => "Uvozi korensko potrdilo",
"The encryption app is no longer enabled, please decrypt all your files" => "Program za šifriranje ni več omogočen. Odšifrirati je treba vse datoteke.",
"Log-in password" => "Prijavno geslo",
"Decrypt all Files" => "Odšifriraj vse datoteke",
@@ -177,6 +185,7 @@ $TRANSLATIONS = array(
"Create" => "Ustvari",
"Admin Recovery Password" => "Obnovitev skrbniškega gesla",
"Enter the recovery password in order to recover the users files during password change" => "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
+"Search Users and Groups" => "Iskanje uporabnikov in skupin",
"Add Group" => "Dodaj skupino",
"Group" => "Skupina",
"Everyone" => "Vsi",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index 706e95951f4..6e32f6c9693 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -32,11 +32,11 @@ $TRANSLATIONS = array(
"Update" => "Përditësim",
"Updated" => "I përditësuar",
"Select a profile picture" => "Zgjidh një foto profili",
+"Delete" => "Fshi",
"deleted {groupName}" => "u fshi {groupName}",
"undo" => "anullo veprimin",
"Groups" => "Grupet",
"Group Admin" => "Grupi Admin",
-"Delete" => "Fshi",
"never" => "asnjëherë",
"deleted {userName}" => "u fshi {userName}",
"add group" => "shto grup",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 9511926ec02..b8036ad3831 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -26,10 +26,10 @@ $TRANSLATIONS = array(
"Error" => "Грешка",
"Update" => "Ажурирај",
"Updated" => "Ажурирано",
+"Delete" => "Обриши",
"undo" => "опозови",
"Groups" => "Групе",
"Group Admin" => "Управник групе",
-"Delete" => "Обриши",
"never" => "никада",
"add group" => "додај групу",
"A valid username must be provided" => "Морате унети исправно корисничко име",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 3e26ecdc423..4246180575a 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -5,8 +5,13 @@ $TRANSLATIONS = array(
"Language changed" => "Jezik je izmenjen",
"Invalid request" => "Neispravan zahtev",
"Error" => "Greška",
-"Groups" => "Grupe",
+"Very weak password" => "Veoma slaba lozinka",
+"Weak password" => "Slaba lozinka",
+"So-so password" => "Osrednja lozinka",
+"Good password" => "Dobra lozinka",
+"Strong password" => "Jaka lozinka",
"Delete" => "Obriši",
+"Groups" => "Grupe",
"Security Warning" => "Bezbednosno upozorenje",
"Select an App" => "Izaberite program",
"Password" => "Lozinka",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index ef15c3992cc..12bc56640e5 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -64,6 +64,7 @@ $TRANSLATIONS = array(
"So-so password" => "Okej lösenord",
"Good password" => "Bra lösenord",
"Strong password" => "Starkt lösenord",
+"Delete" => "Radera",
"Decrypting files... Please wait, this can take some time." => "Dekrypterar filer... Vänligen vänta, detta kan ta en stund.",
"Delete encryption keys permanently." => "Radera krypteringsnycklar permanent",
"Restore encryption keys." => "Återställ krypteringsnycklar",
@@ -74,7 +75,6 @@ $TRANSLATIONS = array(
"undo" => "ångra",
"Groups" => "Grupper",
"Group Admin" => "Gruppadministratör",
-"Delete" => "Radera",
"never" => "aldrig",
"deleted {userName}" => "raderade {userName}",
"add group" => "lägg till grupp",
@@ -191,6 +191,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Välj som profilbild",
"Language" => "Språk",
"Help translate" => "Hjälp att översätta",
+"SSL root certificates" => "SSL rotcertifikat",
+"Import Root Certificate" => "Importera rotcertifikat",
"The encryption app is no longer enabled, please decrypt all your files" => "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer",
"Log-in password" => "Inloggningslösenord",
"Decrypt all Files" => "Dekryptera alla filer",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 48fafcdfdf1..b95f71f73cd 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -17,10 +17,10 @@ $TRANSLATIONS = array(
"Enable" => "இயலுமைப்படுத்துக",
"Error" => "வழு",
"Update" => "இற்றைப்படுத்தல்",
+"Delete" => "நீக்குக",
"undo" => "முன் செயல் நீக்கம் ",
"Groups" => "குழுக்கள்",
"Group Admin" => "குழு நிர்வாகி",
-"Delete" => "நீக்குக",
"never" => "ஒருபோதும்",
"__language_name__" => "_மொழி_பெயர்_",
"None" => "ஒன்றுமில்லை",
@@ -50,6 +50,8 @@ $TRANSLATIONS = array(
"Cancel" => "இரத்து செய்க",
"Language" => "மொழி",
"Help translate" => "மொழிபெயர்க்க உதவி",
+"SSL root certificates" => "SSL வேர் சான்றிதழ்கள்",
+"Import Root Certificate" => "வேர் சான்றிதழை இறக்குமதி செய்க",
"Login Name" => "புகுபதிகை",
"Create" => "உருவாக்குக",
"Default Quota" => "பொது இருப்பு பங்கு",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index dac008ae9ce..754366d6ffd 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -26,10 +26,10 @@ $TRANSLATIONS = array(
"Error" => "ข้อผิดพลาด",
"Update" => "อัพเดท",
"Updated" => "อัพเดทแล้ว",
+"Delete" => "ลบ",
"undo" => "เลิกทำ",
"Groups" => "กลุ่ม",
"Group Admin" => "ผู้ดูแลกลุ่ม",
-"Delete" => "ลบ",
"never" => "ไม่ต้องเลย",
"__language_name__" => "ภาษาไทย",
"None" => "ไม่มี",
@@ -74,6 +74,8 @@ $TRANSLATIONS = array(
"Cancel" => "ยกเลิก",
"Language" => "ภาษา",
"Help translate" => "ช่วยกันแปล",
+"SSL root certificates" => "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
+"Import Root Certificate" => "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root",
"Login Name" => "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
"Create" => "สร้าง",
"Default Quota" => "โควต้าที่กำหนดไว้เริ่มต้น",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 4e724e371f1..fc9b18b30cc 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
"Wrong admin recovery password. Please check the password and try again." => "Hatalı yönetici kurtarma parolası. Lütfen parolayı denetleyip yeniden deneyin.",
"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme anahtarı başarıyla güncellendi.",
"Unable to change password" => "Parola değiştirilemiyor",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "\"{domain}\" alan adını güvenilir alan adı olarak eklemek istediğinizden emin misiniz?",
+"Add trusted domain" => "Güvenilir alan adı ekle",
"Sending..." => "Gönderiliyor...",
"User Documentation" => "Kullanıcı Belgelendirmesi",
"Admin Documentation" => "Yönetici Belgelendirmesi",
@@ -64,6 +66,8 @@ $TRANSLATIONS = array(
"So-so password" => "Normal parola",
"Good password" => "İyi parola",
"Strong password" => "Güçlü parola",
+"Valid until {date}" => "{date} tarihine kadar geçerli",
+"Delete" => "Sil",
"Decrypting files... Please wait, this can take some time." => "Dosyaların şifrelemesi kaldırılıyor... Lütfen bekleyin, bu biraz zaman alabilir.",
"Delete encryption keys permanently." => "Şifreleme anahtarlarını kalıcı olarak sil.",
"Restore encryption keys." => "Şifreleme anahtarlarını geri yükle.",
@@ -74,7 +78,6 @@ $TRANSLATIONS = array(
"undo" => "geri al",
"Groups" => "Gruplar",
"Group Admin" => "Grup Yöneticisi",
-"Delete" => "Sil",
"never" => "hiçbir zaman",
"deleted {userName}" => "{userName} silindi",
"add group" => "grup ekle",
@@ -108,12 +111,16 @@ $TRANSLATIONS = array(
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modülü 'fileinfo' kayıp. MIME türü tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.",
"Your PHP version is outdated" => "PHP sürümünüz eski",
"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "PHP sürümünüz eski. Eski sürümlerde sorun olduğundan 5.3.8 veya daha yeni bir sürüme güncellemenizi şiddetle tavsiye ederiz. Bu kurulumun da doğru çalışmaması da olasıdır.",
+"PHP charset is not set to UTF-8" => "PHP karakter kümesi UTF-8 olarak ayarlı değil",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP karakter kümesi UTF-8 olarak ayarlı değil. Bu, dosya isimlerindeki ASCII olmayan karakterler için büyük sorunlara yol açabilir. php.ini içerisindeki 'default_charset' ayarını 'UTF-8' olarak ayarlamanızı şiddetle tavsiye ediyoruz.",
"Locale not working" => "Yerel çalışmıyor",
"System locale can not be set to a one which supports UTF-8." => "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı.",
"This means that there might be problems with certain characters in file names." => "Bu, dosya adlarında belirli karakterlerde problem olabileceği anlamına gelir.",
"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Şu dillerden birini desteklemesi için sisteminize gerekli paketleri kurmanızı şiddetle tavsiye ederiz: %s.",
"Internet connection not working" => "İnternet bağlantısı çalışmıyor",
"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." => "Bu sunucunun çalışan bir internet bağlantısı yok. Bu, harici depolama alanı bağlama, güncelleştirme bildirimleri veya 3. parti uygulama kurma gibi bazı özellikler çalışmayacağı anlamına gelmektedir. Uzaktan dosyalara erişim ve e-posta ile bildirim gönderme de çalışmayacaktır. Eğer bu özelliklerin tamamını kullanmak istiyorsanız, sunucu için internet bağlantısını etkinleştirmenizi öneriyoruz.",
+"URL generation in notification emails" => "Bildirim e-postalarında URL oluşturulması",
+"If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Eğer kurulumunuz alan adının köküne yapılmamışsa ve sistem cron'u kullanıyorsa, URL oluşturma ile ilgili sorunlar olabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwritewebroot\" seçeneğini ayarlayın (Önerilen: \"%s\")",
"Cron" => "Cron",
"Last cron was executed at %s." => "Son cron %s zamanında çalıştırıldı.",
"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Son cron %s zamanında çalıştırıldı. Bu bir saatten daha uzun bir süre, bir şeyler yanlış gibi görünüyor.",
@@ -195,12 +202,20 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Profil resmi olarak seç",
"Language" => "Dil",
"Help translate" => "Çevirilere yardım edin",
+"SSL root certificates" => "SSL kök sertifikaları",
+"Common Name" => "Ortak Ad",
+"Valid until" => "Geçerlilik",
+"Issued By" => "Veren",
+"Valid until %s" => "%s tarihine kadar geçerli",
+"Import Root Certificate" => "Kök Sertifikalarını İçe Aktar",
"The encryption app is no longer enabled, please decrypt all your files" => "Şifreleme uygulaması artık etkin değil, lütfen tüm dosyalarınızın şifrelemesini kaldırın",
"Log-in password" => "Oturum açma parolası",
"Decrypt all Files" => "Tüm Dosyaların Şifrelemesini Kaldır",
"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın şifrelemelerinin düzgün bir şekilde kaldırıldığından eminseniz kalıcı olarak silin.",
"Restore Encryption Keys" => "Şifreleme Anahtarlarını Geri Yükle",
"Delete Encryption Keys" => "Şifreleme Anahtarlarını Sil",
+"Show storage location" => "Depolama konumunu göster",
+"Show last log in" => "Son oturum açılma zamanını göster",
"Login Name" => "Giriş Adı",
"Create" => "Oluştur",
"Admin Recovery Password" => "Yönetici Kurtarma Parolası",
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index af1385f0fe0..e702efd552a 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -25,10 +25,10 @@ $TRANSLATIONS = array(
"Error" => "خاتالىق",
"Update" => "يېڭىلا",
"Updated" => "يېڭىلاندى",
+"Delete" => "ئۆچۈر",
"undo" => "يېنىۋال",
"Groups" => "گۇرۇپپا",
"Group Admin" => "گۇرۇپپا باشقۇرغۇچى",
-"Delete" => "ئۆچۈر",
"never" => "ھەرگىز",
"add group" => "گۇرۇپپا قوش",
"A valid username must be provided" => "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 1a4d48feb7d..f77f8bddd85 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -30,10 +30,10 @@ $TRANSLATIONS = array(
"Weak password" => "Слабкий пароль",
"Good password" => "Добрий пароль",
"Strong password" => "Надійний пароль",
+"Delete" => "Видалити",
"undo" => "відмінити",
"Groups" => "Групи",
"Group Admin" => "Адміністратор групи",
-"Delete" => "Видалити",
"never" => "ніколи",
"add group" => "додати групу",
"A valid username must be provided" => "Потрібно задати вірне ім'я користувача",
@@ -90,6 +90,8 @@ $TRANSLATIONS = array(
"Cancel" => "Відмінити",
"Language" => "Мова",
"Help translate" => "Допомогти з перекладом",
+"SSL root certificates" => "SSL корневі сертифікати",
+"Import Root Certificate" => "Імпортувати корневі сертифікати",
"Login Name" => "Ім'я Логіну",
"Create" => "Створити",
"Default Quota" => "Квота за замовчуванням",
diff --git a/settings/l10n/ur.php b/settings/l10n/ur.php
new file mode 100644
index 00000000000..1b41db1d679
--- /dev/null
+++ b/settings/l10n/ur.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Error" => "خرابی"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 595d203b227..51a2a880371 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -28,10 +28,10 @@ $TRANSLATIONS = array(
"Error" => "Lỗi",
"Update" => "Cập nhật",
"Updated" => "Đã cập nhật",
+"Delete" => "Xóa",
"undo" => "lùi lại",
"Groups" => "Nhóm",
"Group Admin" => "Nhóm quản trị",
-"Delete" => "Xóa",
"never" => "không thay đổi",
"__language_name__" => "__Ngôn ngữ___",
"None" => "Không gì cả",
@@ -80,6 +80,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "Chọn hình ảnh như hồ sơ cá nhân",
"Language" => "Ngôn ngữ",
"Help translate" => "Hỗ trợ dịch thuật",
+"SSL root certificates" => "Chứng chỉ SSL root",
+"Import Root Certificate" => "Nhập Root Certificate",
"Login Name" => "Tên đăng nhập",
"Create" => "Tạo",
"Group" => "N",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index da33b075b34..73cb5e9fee8 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -64,6 +64,7 @@ $TRANSLATIONS = array(
"So-so password" => "一般强度的密码",
"Good password" => "较强的密码",
"Strong password" => "强密码",
+"Delete" => "删除",
"Decrypting files... Please wait, this can take some time." => "正在解密文件... 请稍等,可能需要一些时间。",
"Delete encryption keys permanently." => "永久删除加密密钥。",
"Restore encryption keys." => "恢复加密密钥。",
@@ -74,7 +75,6 @@ $TRANSLATIONS = array(
"undo" => "撤销",
"Groups" => "组",
"Group Admin" => "组管理员",
-"Delete" => "删除",
"never" => "从不",
"deleted {userName}" => "已删除 {userName}",
"add group" => "增加组",
@@ -195,6 +195,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "用作头像",
"Language" => "语言",
"Help translate" => "帮助翻译",
+"SSL root certificates" => "SSL根证书",
+"Import Root Certificate" => "导入根证书",
"The encryption app is no longer enabled, please decrypt all your files" => "加密 app 不再被启用,请解密您所有的文件",
"Log-in password" => "登录密码",
"Decrypt all Files" => "解密所有文件",
diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php
index e4fd9170994..1ad784d87dd 100644
--- a/settings/l10n/zh_HK.php
+++ b/settings/l10n/zh_HK.php
@@ -11,8 +11,8 @@ $TRANSLATIONS = array(
"Error" => "錯誤",
"Update" => "更新",
"Updated" => "已更新",
-"Groups" => "群組",
"Delete" => "刪除",
+"Groups" => "群組",
"None" => "空",
"Login" => "登入",
"SSL" => "SSL",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 57b039f6147..a5871a2aa95 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -55,11 +55,11 @@ $TRANSLATIONS = array(
"So-so password" => "普通的密碼",
"Good password" => "好的密碼",
"Strong password" => "很強的密碼",
+"Delete" => "刪除",
"Decrypting files... Please wait, this can take some time." => "檔案解密中,請稍候。",
"undo" => "復原",
"Groups" => "群組",
"Group Admin" => "群組管理員",
-"Delete" => "刪除",
"never" => "永不",
"add group" => "新增群組",
"A valid username must be provided" => "必須提供一個有效的用戶名",
@@ -162,6 +162,8 @@ $TRANSLATIONS = array(
"Choose as profile image" => "設定為大頭貼",
"Language" => "語言",
"Help translate" => "幫助翻譯",
+"SSL root certificates" => "SSL 根憑證",
+"Import Root Certificate" => "匯入根憑證",
"The encryption app is no longer enabled, please decrypt all your files" => "加密的軟體不能長時間啟用,請解密所有您的檔案",
"Log-in password" => "登入密碼",
"Decrypt all Files" => "解密所有檔案",
diff --git a/settings/personal.php b/settings/personal.php
index a72b293413a..e6f53d62704 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -8,6 +8,7 @@
OC_Util::checkLoggedIn();
$defaults = new OC_Defaults(); // initialize themable default strings and urls
+$certificateManager = \OC::$server->getCertificateManager();
// Highlight navigation entry
OC_Util::addScript( 'settings', 'personal' );
@@ -46,7 +47,7 @@ $languageNames=include 'languageCodes.php';
$languages=array();
$commonlanguages = array();
foreach($languageCodes as $lang) {
- $l=OC_L10N::get('settings', $lang);
+ $l = \OC::$server->getL10N('settings', $lang);
if(substr($l->t('__language_name__'), 0, 1) !== '_') {//first check if the language name is in the translation file
$ln=array('code'=>$lang, 'name'=> (string)$l->t('__language_name__'));
}elseif(isset($languageNames[$lang])) {
@@ -98,6 +99,7 @@ $tmpl->assign('backupKeysExists' , $backupKeysExists);
$tmpl->assign('filesStillEncrypted' , $filesStillEncrypted);
$tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true));
$tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser()));
+$tmpl->assign('certs', $certificateManager->listCertificates());
$forms=OC_App::getForms('personal');
$tmpl->assign('forms', array());
diff --git a/settings/routes.php b/settings/routes.php
index 1c8ad1b3fe8..86d6049551c 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -27,6 +27,8 @@ $this->create('settings_ajax_userlist', '/settings/ajax/userlist')
->actionInclude('settings/ajax/userlist.php');
$this->create('settings_ajax_grouplist', '/settings/ajax/grouplist')
->actionInclude('settings/ajax/grouplist.php');
+$this->create('settings_ajax_everyonecount', '/settings/ajax/geteveryonecount')
+ ->actionInclude('settings/ajax/geteveryonecount.php');
$this->create('settings_ajax_createuser', '/settings/ajax/createuser.php')
->actionInclude('settings/ajax/createuser.php');
$this->create('settings_ajax_removeuser', '/settings/ajax/removeuser.php')
@@ -62,6 +64,10 @@ $this->create('settings_ajax_restorekeys', '/settings/ajax/restorekeys.php')
->actionInclude('settings/ajax/restorekeys.php');
$this->create('settings_ajax_deletekeys', '/settings/ajax/deletekeys.php')
->actionInclude('settings/ajax/deletekeys.php');
+$this->create('settings_cert_post', '/settings/ajax/addRootCertificate')
+ ->actionInclude('settings/ajax/addRootCertificate.php');
+$this->create('settings_cert_remove', '/settings/ajax/removeRootCertificate')
+ ->actionInclude('settings/ajax/removeRootCertificate.php');
// apps
$this->create('settings_ajax_apps_ocs', '/settings/ajax/apps/ocs.php')
->actionInclude('settings/ajax/apps/ocs.php');
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 03f3efd7aae..0e6cb14bcef 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -1,8 +1,12 @@
-<?php /**
+<?php
+/**
* Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*/
+/**
+ * @var array $_
+ */
$levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal');
$levelLabels = array(
$l->t( 'Everything (fatal issues, errors, warnings, info, debug)' ),
@@ -129,14 +133,28 @@ if (!$_['has_fileinfo']) {
// is PHP at least at 5.3.8?
if ($_['old_php']) {
?>
-<div class="section">
- <h2><?php p($l->t('Your PHP version is outdated'));?></h2>
+ <div class="section">
+ <h2><?php p($l->t('Your PHP version is outdated'));?></h2>
<span class="connectionwarning">
<?php p($l->t('Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly.')); ?>
</span>
-</div>
+ </div>
+<?php
+}
+
+// is PHP charset set to UTF8?
+if (!$_['isPhpCharSetUtf8']) {
+ ?>
+ <div class="section">
+ <h2><?php p($l->t('PHP charset is not set to UTF-8'));?></h2>
+
+ <span class="connectionwarning">
+ <?php p($l->t("PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'.")); ?>
+ </span>
+
+ </div>
<?php
}
@@ -166,16 +184,29 @@ if (!$_['isLocaleWorking']) {
}
// is internet connection working ?
-if (!$_['internetconnectionworking']) {
+if ($_['internetconnectionworking'] === false) {
?>
-<div class="section">
- <h2><?php p($l->t('Internet connection not working'));?></h2>
+ <div class="section">
+ <h2><?php p($l->t('Internet connection not working'));?></h2>
<span class="connectionwarning">
<?php p($l->t('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.')); ?>
</span>
-</div>
+ </div>
+<?php
+}
+
+if ($_['suggestedOverwriteWebroot']) {
+ ?>
+ <div class="section">
+ <h2><?php p($l->t('URL generation in notification emails'));?></h2>
+
+ <span class="connectionwarning">
+ <?php p($l->t('If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the "overwritewebroot" option in your config.php file to the webroot path of your installation (Suggested: "%s")', $_['suggestedOverwriteWebroot'])); ?>
+ </span>
+
+ </div>
<?php
}
?>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index ecdd6dad24a..871a0ec9e39 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -2,7 +2,10 @@
* Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
- */?>
+ */
+
+/** @var $_ array */
+?>
<div class="clientsbox center">
<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
@@ -34,7 +37,8 @@
<div id="quota" class="section">
- <div style="width:<?php p($_['usage_relative']);?>%;">
+ <div style="width:<?php p($_['usage_relative']);?>%"
+ <?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
<p id="quotatext">
<?php print_unescaped($l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>',
array($_['usage'], $_['total_space'])));?>
@@ -86,7 +90,7 @@ if($_['passwordChangeSupported']) {
?>
<form id="lostpassword" class="section">
<h2><?php p($l->t('Email'));?></h2>
- <input type="text" name="email" id="email" value="<?php p($_['email']); ?>"
+ <input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
placeholder="<?php p($l->t('Your email address'));?>"
autocomplete="on" autocapitalize="off" autocorrect="off" />
<span class="msg"></span><br />
@@ -149,6 +153,44 @@ if($_['passwordChangeSupported']) {
print_unescaped($form);
};?>
+<div class="section">
+ <h2><?php p($l->t('SSL root certificates')); ?></h2>
+ <table id="sslCertificate" class="grid">
+ <thead>
+ <th><?php p($l->t('Common Name')); ?></th>
+ <th><?php p($l->t('Valid until')); ?></th>
+ <th><?php p($l->t('Issued By')); ?></th>
+ <th/>
+ </thead>
+ <tbody>
+ <?php foreach ($_['certs'] as $rootCert): /**@var \OCP\ICertificate $rootCert*/ ?>
+ <tr class="<?php echo ($rootCert->isExpired()) ? 'expired' : 'valid' ?>" data-name="<?php p($rootCert->getName()) ?>">
+ <td class="rootCert" title="<?php p($rootCert->getOrganization())?>">
+ <?php p($rootCert->getCommonName()) ?>
+ </td>
+ <td title="<?php p($l->t('Valid until %s', $l->l('date', $rootCert->getExpireDate()))) ?>">
+ <?php echo $l->l('date', $rootCert->getExpireDate()) ?>
+ </td>
+ <td title="<?php p($rootCert->getIssuerOrganization()) ?>">
+ <?php p($rootCert->getIssuerName()) ?>
+ </td>
+ <td <?php if ($rootCert != ''): ?>class="remove"
+ <?php else: ?>style="visibility:hidden;"
+ <?php endif; ?>><img alt="<?php p($l->t('Delete')); ?>"
+ title="<?php p($l->t('Delete')); ?>"
+ class="svg action"
+ src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>"/>
+ </td>
+ </tr>
+ <?php endforeach; ?>
+ </tbody>
+ </table>
+ <form class="uploadButton" method="post" action="<?php p(\OC_Helper::linkToRoute('settings_cert_post')); ?>" target="certUploadFrame">
+ <input type="file" id="rootcert_import" name="rootcert_import" class="hidden">
+ <input type="button" id="rootcert_import_button" value="<?php p($l->t('Import Root Certificate')); ?>"/>
+ </form>
+</div>
+
<?php if($_['enableDecryptAll']): ?>
<div class="section">
@@ -176,11 +218,8 @@ if($_['passwordChangeSupported']) {
</p>
<br />
</div>
-
<?php endif; ?>
-
-
<div id="restoreBackupKeys" <?php $_['backupKeysExists'] ? '' : print_unescaped("class='hidden'") ?>>
<?php p($l->t( "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." )); ?>
diff --git a/settings/templates/users/main.php b/settings/templates/users/main.php
index c5805d53476..59284eaabd3 100644
--- a/settings/templates/users/main.php
+++ b/settings/templates/users/main.php
@@ -22,7 +22,23 @@ $userlistParams['subadmingroups'] = array_flip($items);
<div id="app-navigation">
<?php print_unescaped($this->inc('users/part.grouplist')); ?>
<div id="app-settings">
- <?php print_unescaped($this->inc('users/part.setquota')); ?>
+ <div id="app-settings-header">
+ <button class="settings-button" tabindex="0" data-apps-slide-toggle="#app-settings-content"></button>
+ </div>
+ <div id="app-settings-content">
+ <?php print_unescaped($this->inc('users/part.setquota')); ?>
+
+ <div id="userlistoptions">
+ <p><label>
+ <input type="checkbox" name="StorageLocation" value="StorageLocation" id="CheckboxStorageLocation">
+ <?php p($l->t('Show storage location')) ?>
+ </label></p>
+ <p><label>
+ <input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin">
+ <?php p($l->t('Show last log in')) ?>
+ </label></p>
+ </div>
+ </div>
</div>
</div>
diff --git a/settings/templates/users/part.createuser.php b/settings/templates/users/part.createuser.php
index 3dfd27ee52d..edec7587eb5 100644
--- a/settings/templates/users/part.createuser.php
+++ b/settings/templates/users/part.createuser.php
@@ -31,4 +31,4 @@
<form autocomplete="off" id="usersearchform">
<input type="text" class="input userFilter" placeholder="<?php p($l->t('Search Users and Groups')); ?>" />
</form>
-</div> \ No newline at end of file
+</div>
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index 255f2a6cf45..5b516bc0e16 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -12,15 +12,15 @@
</form>
</li>
<!-- Everyone -->
- <li data-gid="_everyone" data-usercount="<?php p($_["usercount"]); ?>" class="isgroup">
+ <li id="everyonegroup" data-gid="_everyone" data-usercount="" class="isgroup">
<a href="#">
<span class="groupname">
<?php p($l->t('Everyone')); ?>
</span>
</a>
<span class="utils">
- <span class="usercount">
- <?php p($_["usercount"]); ?>
+ <span class="usercount" id="everyonecount">
+
</span>
</span>
</li>
diff --git a/settings/templates/users/part.setquota.php b/settings/templates/users/part.setquota.php
index fc5624d069a..b58df49998a 100644
--- a/settings/templates/users/part.setquota.php
+++ b/settings/templates/users/part.setquota.php
@@ -1,39 +1,34 @@
-<div id="app-settings-header">
- <button class="settings-button" tabindex="0"></button>
-</div>
-<div id="app-settings-content">
- <div class="quota">
- <!-- Default storage -->
- <span><?php p($l->t('Default Quota'));?></span>
- <?php if((bool) $_['isAdmin']): ?>
- <select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
- <option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
- <?php p($l->t('Unlimited'));?>
- </option>
- <?php foreach($_['quota_preset'] as $preset):?>
- <?php if($preset !== 'default'):?>
- <option <?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?> value='<?php p($preset);?>'>
- <?php p($preset);?>
- </option>
- <?php endif;?>
- <?php endforeach;?>
- <?php if($_['defaultQuotaIsUserDefined']):?>
- <option selected="selected" value='<?php p($_['default_quota']);?>'>
- <?php p($_['default_quota']);?>
+<div class="quota">
+ <!-- Default storage -->
+ <span><?php p($l->t('Default Quota'));?></span>
+ <?php if((bool) $_['isAdmin']): ?>
+ <select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>" data-tipsy-gravity="s">
+ <option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
+ <?php p($l->t('Unlimited'));?>
+ </option>
+ <?php foreach($_['quota_preset'] as $preset):?>
+ <?php if($preset !== 'default'):?>
+ <option <?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?> value='<?php p($preset);?>'>
+ <?php p($preset);?>
</option>
<?php endif;?>
- <option data-new value='other'>
- <?php p($l->t('Other'));?>
- ...
- </option>
- </select>
- <?php endif; ?>
- <?php if((bool) !$_['isAdmin']): ?>
- <select class='quota' disabled="disabled">
- <option selected="selected">
+ <?php endforeach;?>
+ <?php if($_['defaultQuotaIsUserDefined']):?>
+ <option selected="selected" value='<?php p($_['default_quota']);?>'>
<?php p($_['default_quota']);?>
</option>
- </select>
- <?php endif; ?>
- </div>
-</div> \ No newline at end of file
+ <?php endif;?>
+ <option data-new value='other'>
+ <?php p($l->t('Other'));?>
+ ...
+ </option>
+ </select>
+ <?php endif; ?>
+ <?php if((bool) !$_['isAdmin']): ?>
+ <select class='quota' disabled="disabled">
+ <option selected="selected">
+ <?php p($_['default_quota']);?>
+ </option>
+ </select>
+ <?php endif; ?>
+</div>
diff --git a/settings/tests/js/users/deleteHandlerSpec.js b/settings/tests/js/users/deleteHandlerSpec.js
new file mode 100644
index 00000000000..6b6328be801
--- /dev/null
+++ b/settings/tests/js/users/deleteHandlerSpec.js
@@ -0,0 +1,185 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2014 Vincent Petry <pvince81@owncloud.com>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+describe('DeleteHandler tests', function() {
+ var showNotificationSpy;
+ var hideNotificationSpy;
+ var clock;
+ var removeCallback;
+ var markCallback;
+ var undoCallback;
+
+ function init(markCallback, removeCallback, undoCallback) {
+ var handler = new DeleteHandler('dummyendpoint.php', 'paramid', markCallback, removeCallback);
+ handler.setNotification(OC.Notification, 'dataid', 'removed %oid entry', undoCallback);
+ return handler;
+ }
+
+ beforeEach(function() {
+ showNotificationSpy = sinon.spy(OC.Notification, 'showHtml');
+ hideNotificationSpy = sinon.spy(OC.Notification, 'hide');
+ clock = sinon.useFakeTimers();
+ removeCallback = sinon.stub();
+ markCallback = sinon.stub();
+ undoCallback = sinon.stub();
+
+ $('#testArea').append('<div id="notification"></div>');
+ });
+ afterEach(function() {
+ showNotificationSpy.restore();
+ hideNotificationSpy.restore();
+ clock.restore();
+ });
+ it('shows a notification when marking for delete', function() {
+ var handler = init(markCallback, removeCallback, undoCallback);
+ handler.mark('some_uid');
+
+ expect(showNotificationSpy.calledOnce).toEqual(true);
+ expect(showNotificationSpy.getCall(0).args[0]).toEqual('removed some_uid entry');
+
+ expect(markCallback.calledOnce).toEqual(true);
+ expect(markCallback.getCall(0).args[0]).toEqual('some_uid');
+ expect(removeCallback.notCalled).toEqual(true);
+ expect(undoCallback.notCalled).toEqual(true);
+
+ expect(fakeServer.requests.length).toEqual(0);
+ });
+ it('deletes first entry and reshows notification on second delete', function() {
+ var handler = init(markCallback, removeCallback, undoCallback);
+ handler.mark('some_uid');
+
+ expect(showNotificationSpy.calledOnce).toEqual(true);
+ expect(showNotificationSpy.getCall(0).args[0]).toEqual('removed some_uid entry');
+ showNotificationSpy.reset();
+
+ handler.mark('some_other_uid');
+
+ expect(hideNotificationSpy.calledOnce).toEqual(true);
+ expect(showNotificationSpy.calledOnce).toEqual(true);
+ expect(showNotificationSpy.getCall(0).args[0]).toEqual('removed some_other_uid entry');
+
+ expect(markCallback.calledTwice).toEqual(true);
+ expect(markCallback.getCall(0).args[0]).toEqual('some_uid');
+ expect(markCallback.getCall(1).args[0]).toEqual('some_other_uid');
+ expect(removeCallback.notCalled).toEqual(true);
+ expect(undoCallback.notCalled).toEqual(true);
+
+ // previous one was delete
+ expect(fakeServer.requests.length).toEqual(1);
+ var request = fakeServer.requests[0];
+ expect(request.url).toEqual(OC.webroot + '/index.php/settings/ajax/dummyendpoint.php');
+ });
+ it('automatically deletes after timeout', function() {
+ var handler = init(markCallback, removeCallback, undoCallback);
+ handler.mark('some_uid');
+
+ clock.tick(5000);
+ // nothing happens yet
+ expect(fakeServer.requests.length).toEqual(0);
+
+ clock.tick(3000);
+ expect(fakeServer.requests.length).toEqual(1);
+ var request = fakeServer.requests[0];
+ expect(request.url).toEqual(OC.webroot + '/index.php/settings/ajax/dummyendpoint.php');
+ });
+ it('deletes when deleteEntry is called', function() {
+ var handler = init(markCallback, removeCallback, undoCallback);
+ handler.mark('some_uid');
+
+ handler.deleteEntry();
+ expect(fakeServer.requests.length).toEqual(1);
+ var request = fakeServer.requests[0];
+ expect(request.url).toEqual(OC.webroot + '/index.php/settings/ajax/dummyendpoint.php');
+ });
+ it('cancels deletion when undo is clicked', function() {
+ var handler = init(markCallback, removeCallback, undoCallback);
+ handler.setNotification(OC.Notification, 'dataid', 'removed %oid entry <span class="undo">Undo</span>', undoCallback);
+ handler.mark('some_uid');
+ $('#notification .undo').click();
+
+ expect(undoCallback.calledOnce).toEqual(true);
+
+ // timer was cancelled
+ clock.tick(10000);
+ expect(fakeServer.requests.length).toEqual(0);
+ });
+ it('cancels deletion when cancel method is called', function() {
+ var handler = init(markCallback, removeCallback, undoCallback);
+ handler.setNotification(OC.Notification, 'dataid', 'removed %oid entry <span class="undo">Undo</span>', undoCallback);
+ handler.mark('some_uid');
+ handler.cancel();
+
+ // not sure why, seems to be by design
+ expect(undoCallback.notCalled).toEqual(true);
+
+ // timer was cancelled
+ clock.tick(10000);
+ expect(fakeServer.requests.length).toEqual(0);
+ });
+ it('calls removeCallback after successful server side deletion', function() {
+ fakeServer.respondWith(/\/index\.php\/settings\/ajax\/dummyendpoint.php/, [
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify({status: 'success'})
+ ]);
+
+ var handler = init(markCallback, removeCallback, undoCallback);
+ handler.mark('some_uid');
+ handler.deleteEntry();
+
+ expect(fakeServer.requests.length).toEqual(1);
+ var request = fakeServer.requests[0];
+ var query = OC.parseQueryString(request.requestBody);
+ expect(query.paramid).toEqual('some_uid');
+
+ expect(removeCallback.calledOnce).toEqual(true);
+ expect(undoCallback.notCalled).toEqual(true);
+ expect(removeCallback.getCall(0).args[0]).toEqual('some_uid');
+ });
+ it('calls undoCallback and shows alert after failed server side deletion', function() {
+ // stub t to avoid extra calls
+ var tStub = sinon.stub(window, 't').returns('text');
+ fakeServer.respondWith(/\/index\.php\/settings\/ajax\/dummyendpoint.php/, [
+ 200,
+ { 'Content-Type': 'application/json' },
+ JSON.stringify({status: 'error', data: {message: 'test error'}})
+ ]);
+
+ var alertDialogStub = sinon.stub(OC.dialogs, 'alert');
+ var handler = init(markCallback, removeCallback, undoCallback);
+ handler.mark('some_uid');
+ handler.deleteEntry();
+
+ expect(fakeServer.requests.length).toEqual(1);
+ var request = fakeServer.requests[0];
+ var query = OC.parseQueryString(request.requestBody);
+ expect(query.paramid).toEqual('some_uid');
+
+ expect(removeCallback.notCalled).toEqual(true);
+ expect(undoCallback.calledOnce).toEqual(true);
+ expect(undoCallback.getCall(0).args[0]).toEqual('some_uid');
+
+ expect(alertDialogStub.calledOnce);
+
+ alertDialogStub.restore();
+ tStub.restore();
+ });
+});
diff --git a/settings/users.php b/settings/users.php
index bc6c2ea7e7c..94dda43c523 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -60,13 +60,13 @@ $defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false
// load users and quota
foreach($accessibleUsers as $uid => $displayName) {
- $quota=OC_Preferences::getValue($uid, 'files', 'quota', 'default');
- $isQuotaUserDefined=array_search($quota, $quotaPreset)===false
- && array_search($quota, array('none', 'default'))===false;
+ $quota = OC_Preferences::getValue($uid, 'files', 'quota', 'default');
+ $isQuotaUserDefined = array_search($quota, $quotaPreset) === false
+ && array_search($quota, array('none', 'default')) === false;
$name = $displayName;
- if ( $displayName !== $uid ) {
- $name = $name . ' ('.$uid.')';
+ if ($displayName !== $uid) {
+ $name = $name . ' (' . $uid . ')';
}
$user = $userManager->get($uid);
@@ -82,17 +82,16 @@ foreach($accessibleUsers as $uid => $displayName) {
);
}
-$tmpl = new OC_Template( "settings", "users/main", "user" );
-$tmpl->assign( 'users', $users );
-$tmpl->assign( 'groups', $groups );
-$tmpl->assign( 'adminGroup', $adminGroup );
-$tmpl->assign( 'isAdmin', (int) $isAdmin);
-$tmpl->assign( 'subadmins', $subadmins);
-$tmpl->assign('usercount', count($users));
-$tmpl->assign( 'numofgroups', count($groups) + count($adminGroup));
-$tmpl->assign( 'quota_preset', $quotaPreset);
-$tmpl->assign( 'default_quota', $defaultQuota);
-$tmpl->assign( 'defaultQuotaIsUserDefined', $defaultQuotaIsUserDefined);
-$tmpl->assign( 'recoveryAdminEnabled', $recoveryAdminEnabled);
-$tmpl->assign( 'enableAvatars', \OC_Config::getValue('enable_avatars', true));
+$tmpl = new OC_Template("settings", "users/main", "user");
+$tmpl->assign('users', $users);
+$tmpl->assign('groups', $groups);
+$tmpl->assign('adminGroup', $adminGroup);
+$tmpl->assign('isAdmin', (int)$isAdmin);
+$tmpl->assign('subadmins', $subadmins);
+$tmpl->assign('numofgroups', count($groups) + count($adminGroup));
+$tmpl->assign('quota_preset', $quotaPreset);
+$tmpl->assign('default_quota', $defaultQuota);
+$tmpl->assign('defaultQuotaIsUserDefined', $defaultQuotaIsUserDefined);
+$tmpl->assign('recoveryAdminEnabled', $recoveryAdminEnabled);
+$tmpl->assign('enableAvatars', \OC::$server->getConfig()->getSystemValue('enable_avatars', true));
$tmpl->printPage();