aboutsummaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
Diffstat (limited to 'settings')
-rw-r--r--settings/admin.php12
-rw-r--r--settings/ajax/decryptall.php62
-rw-r--r--settings/ajax/deletekeys.php35
-rw-r--r--settings/ajax/restorekeys.php35
-rw-r--r--settings/application.php1
-rw-r--r--settings/changepassword/controller.php37
-rw-r--r--settings/controller/checksetupcontroller.php7
-rw-r--r--settings/css/settings.css17
-rw-r--r--settings/js/personal.js75
-rw-r--r--settings/l10n/fr.js18
-rw-r--r--settings/l10n/fr.json18
-rw-r--r--settings/l10n/nb_NO.js2
-rw-r--r--settings/l10n/nb_NO.json2
-rw-r--r--settings/l10n/sl.js3
-rw-r--r--settings/l10n/sl.json3
-rw-r--r--settings/l10n/tr.js16
-rw-r--r--settings/l10n/tr.json16
-rw-r--r--settings/personal.php11
-rw-r--r--settings/routes.php6
-rw-r--r--settings/templates/admin.php67
-rw-r--r--settings/templates/personal.php52
-rw-r--r--settings/users.php4
22 files changed, 118 insertions, 381 deletions
diff --git a/settings/admin.php b/settings/admin.php
index 95afaf1ac0a..976d0a5c3f1 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -159,6 +159,7 @@ foreach ($forms as $index => $form) {
if ($filesExternal) {
$formsAndMore[] = array('anchor' => 'files_external', 'section-name' => $l->t('External Storage'));
}
+
$template->assign('fileSharingSettings', $fileSharingSettings);
$template->assign('filesExternal', $filesExternal);
$template->assign('updaterAppPanel', $updaterAppPanel);
@@ -184,12 +185,13 @@ $formsMap = array_map(function ($form) {
$formsAndMore = array_merge($formsAndMore, $formsMap);
// add bottom hardcoded forms from the template
-$formsAndMore[] = array('anchor' => 'backgroundjobs', 'section-name' => $l->t('Cron'));
-$formsAndMore[] = array('anchor' => 'mail_general_settings', 'section-name' => $l->t('Email Server'));
-$formsAndMore[] = array('anchor' => 'log-section', 'section-name' => $l->t('Log'));
-$formsAndMore[] = array('anchor' => 'admin-tips', 'section-name' => $l->t('Tips & tricks'));
+$formsAndMore[] = ['anchor' => 'encryptionAPI', 'section-name' => $l->t('Server Side Encryption')];
+$formsAndMore[] = ['anchor' => 'backgroundjobs', 'section-name' => $l->t('Cron')];
+$formsAndMore[] = ['anchor' => 'mail_general_settings', 'section-name' => $l->t('Email Server')];
+$formsAndMore[] = ['anchor' => 'log-section', 'section-name' => $l->t('Log')];
+$formsAndMore[] = ['anchor' => 'admin-tips', 'section-name' => $l->t('Tips & tricks')];
if ($updaterAppPanel) {
- $formsAndMore[] = array('anchor' => 'updater', 'section-name' => $l->t('Updates'));
+ $formsAndMore[] = ['anchor' => 'updater', 'section-name' => $l->t('Updates')];
}
$template->assign('forms', $formsAndMore);
diff --git a/settings/ajax/decryptall.php b/settings/ajax/decryptall.php
deleted file mode 100644
index 5925cee9dfd..00000000000
--- a/settings/ajax/decryptall.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * @author Björn Schießle <schiessle@owncloud.com>
- * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- * @author Volkan Gezer <volkangezer@gmail.com>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program 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, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-//encryption app needs to be loaded
-OC_App::loadApp('files_encryption');
-
-// init encryption app
-$params = array('uid' => \OCP\User::getUser(),
- 'password' => (string)$_POST['password']);
-
-$view = new OC\Files\View('/');
-$util = new \OCA\Files_Encryption\Util($view, \OCP\User::getUser());
-$l = \OC::$server->getL10N('settings');
-
-$result = $util->initEncryption($params);
-
-if ($result !== false) {
-
- try {
- $successful = $util->decryptAll();
- } catch (\Exception $ex) {
- \OCP\Util::writeLog('encryption library', "Decryption finished unexpected: " . $ex->getMessage(), \OCP\Util::ERROR);
- $successful = false;
- }
-
- $util->closeEncryptionSession();
-
- if ($successful === true) {
- \OCP\JSON::success(array('data' => array('message' => $l->t('Files decrypted successfully'))));
- } else {
- \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t decrypt your files, please check your owncloud.log or ask your administrator'))));
- }
-} else {
- \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t decrypt your files, check your password and try again'))));
-}
-
diff --git a/settings/ajax/deletekeys.php b/settings/ajax/deletekeys.php
deleted file mode 100644
index 2192eb8c725..00000000000
--- a/settings/ajax/deletekeys.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * @author Björn Schießle <schiessle@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program 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, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$l = \OC::$server->getL10N('settings');
-
-$util = new \OCA\Files_Encryption\Util(new \OC\Files\View(), \OC_User::getUser());
-$result = $util->deleteBackup('decryptAll');
-
-if ($result) {
- \OCP\JSON::success(array('data' => array('message' => $l->t('Encryption keys deleted permanently'))));
-} else {
- \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t permanently delete your encryption keys, please check your owncloud.log or ask your administrator'))));
-}
diff --git a/settings/ajax/restorekeys.php b/settings/ajax/restorekeys.php
deleted file mode 100644
index 52c02b3aba4..00000000000
--- a/settings/ajax/restorekeys.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * @author Björn Schießle <schiessle@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program 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, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-$l = \OC::$server->getL10N('settings');
-
-$util = new \OCA\Files_Encryption\Util(new \OC\Files\View(), \OC_User::getUser());
-$result = $util->restoreBackup('decryptAll');
-
-if ($result) {
- \OCP\JSON::success(array('data' => array('message' => $l->t('Backups restored successfully'))));
-} else {
- \OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t restore your encryption keys, please check your owncloud.log or ask your administrator'))));
-}
diff --git a/settings/application.php b/settings/application.php
index 07a458d249f..be127da31ac 100644
--- a/settings/application.php
+++ b/settings/application.php
@@ -127,6 +127,7 @@ class Application extends App {
$c->query('Request'),
$c->query('Config'),
$c->query('ClientService'),
+ $c->query('URLGenerator'),
$c->query('Util')
);
});
diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
index 1be30b725df..f041cb5b29f 100644
--- a/settings/changepassword/controller.php
+++ b/settings/changepassword/controller.php
@@ -77,16 +77,43 @@ class Controller {
exit();
}
- if (\OC_App::isEnabled('files_encryption')) {
+ if (\OC_App::isEnabled('encryption')) {
//handle the recovery case
- $util = new \OCA\Files_Encryption\Util(new \OC\Files\View('/'), $username);
- $recoveryAdminEnabled = \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
+ $crypt = new \OCA\Encryption\Crypto\Crypt(
+ \OC::$server->getLogger(),
+ \OC::$server->getUserSession(),
+ \OC::$server->getConfig());
+ $keyStorage = \OC::$server->getEncryptionKeyStorage(\OCA\Encryption\Crypto\Encryption::ID);
+ $util = new \OCA\Encryption\Util(
+ new \OC\Files\View(),
+ $crypt,
+ \OC::$server->getLogger(),
+ \OC::$server->getUserSession(),
+ \OC::$server->getConfig());
+ $keyManager = new \OCA\Encryption\KeyManager(
+ $keyStorage,
+ $crypt,
+ \OC::$server->getConfig(),
+ \OC::$server->getUserSession(),
+ new \OCA\Encryption\Session(\OC::$server->getSession()),
+ \OC::$server->getLogger(),
+ $util);
+ $recovery = new \OCA\Encryption\Recovery(
+ \OC::$server->getUserSession(),
+ $crypt,
+ \OC::$server->getSecureRandom(),
+ $keyManager,
+ \OC::$server->getConfig(),
+ $keyStorage,
+ \OC::$server->getEncryptionFilesHelper(),
+ new \OC\Files\View());
+ $recoveryAdminEnabled = $recovery->isRecoveryKeyEnabled();
$validRecoveryPassword = false;
$recoveryEnabledForUser = false;
if ($recoveryAdminEnabled) {
- $validRecoveryPassword = $util->checkRecoveryPassword($recoveryPassword);
- $recoveryEnabledForUser = $util->recoveryEnabledForUser();
+ $validRecoveryPassword = $keyManager->checkRecoveryPassword($recoveryPassword);
+ $recoveryEnabledForUser = $recovery->isRecoveryEnabledForUser();
}
if ($recoveryEnabledForUser && $recoveryPassword === '') {
diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php
index ae3f1b99c52..15719ce215f 100644
--- a/settings/controller/checksetupcontroller.php
+++ b/settings/controller/checksetupcontroller.php
@@ -27,6 +27,7 @@ use OCP\Http\Client\IClientService;
use OCP\IConfig;
use OCP\IRequest;
use OC_Util;
+use OCP\IURLGenerator;
/**
* @package OC\Settings\Controller
@@ -38,23 +39,28 @@ class CheckSetupController extends Controller {
private $clientService;
/** @var \OC_Util */
private $util;
+ /** @var IURLGenerator */
+ private $urlGenerator;
/**
* @param string $AppName
* @param IRequest $request
* @param IConfig $config
* @param IClientService $clientService
+ * @param IURLGenerator $urlGenerator
* @param \OC_Util $util
*/
public function __construct($AppName,
IRequest $request,
IConfig $config,
IClientService $clientService,
+ IURLGenerator $urlGenerator,
\OC_Util $util) {
parent::__construct($AppName, $request);
$this->config = $config;
$this->clientService = $clientService;
$this->util = $util;
+ $this->urlGenerator = $urlGenerator;
}
/**
@@ -93,6 +99,7 @@ class CheckSetupController extends Controller {
'serverHasInternetConnection' => $this->isInternetConnectionWorking(),
'dataDirectoryProtected' => $this->util->isHtaccessWorking($this->config),
'isMemcacheConfigured' => $this->isMemcacheConfigured(),
+ 'memcacheDocs' => $this->urlGenerator->linkToDocs('admin-performance'),
]
);
}
diff --git a/settings/css/settings.css b/settings/css/settings.css
index a9c0615885a..426fdbb8b94 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -29,10 +29,19 @@ input#openid, input#webdav { width:20em; }
font-weight: bold;
}
-#displaynameerror { display:none; }
-#displaynamechanged { display:none; }
-input#identity { width:20em; }
-#email { width: 17em; }
+#displaynameerror {
+ display: none;
+}
+#displaynamechanged {
+ display: none;
+}
+input#identity {
+ width: 20em;
+}
+#displayName,
+#email {
+ width: 17em;
+}
#avatar .warning {
width: 350px;
diff --git a/settings/js/personal.js b/settings/js/personal.js
index b269ebae3bc..43f328d2223 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -230,40 +230,6 @@ $(document).ready(function () {
return false;
});
- $('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);
- OC.Encryption.decryptAll(privateKeyPassword);
- });
-
-
- $('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 () {
- $('#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) {
- var privateKeyPassword = $('#decryptAll input:password[id="privateKeyPassword"]').val();
- if (privateKeyPassword !== '') {
- $('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", false);
- if (event.which === 13) {
- $('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", true);
- $('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", true);
- OC.Encryption.decryptAll(privateKeyPassword);
- }
- } else {
- $('#decryptAll button:button[name="submitDecryptAll"]').prop("disabled", true);
- }
- });
-
var uploadparms = {
done: function (e, data) {
avatarResponseHandler(data.result);
@@ -371,47 +337,6 @@ $(document).ready(function () {
});
OC.Encryption = {
- 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) {
- if (data.status === "error") {
- OC.Encryption.msg.finished('#decryptAll .msg', data);
- $('#decryptAll input:password[name="privateKeyPassword"]').prop("disabled", false);
- } else {
- OC.Encryption.msg.finished('#decryptAll .msg', data);
- }
- $('#restoreBackupKeys').removeClass('hidden');
- });
- },
-
- deleteKeys: function () {
- var message = t('settings', 'Delete encryption keys permanently.');
- OC.Encryption.msg.start('#restoreBackupKeys .msg', message);
- $.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);
- $('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", false);
- } else {
- OC.Encryption.msg.finished('#restoreBackupKeys .msg', data);
- }
- });
- },
-
- restoreKeys: function () {
- var message = t('settings', 'Restore encryption keys.');
- OC.Encryption.msg.start('#restoreBackupKeys .msg', message);
- $.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);
- $('#restoreBackupKeys button:button[name="submitRestoreKeys"]').prop("disabled", false);
- } else {
- OC.Encryption.msg.finished('#restoreBackupKeys .msg', data);
- }
- });
- }
};
OC.Encryption.msg = {
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index c9405892cbc..c23848aeb3e 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -64,7 +64,7 @@ OC.L10N.register(
"Error while enabling app" : "Erreur lors de l'activation de l'application",
"Updating...." : "Mise à jour...",
"Error while updating app" : "Erreur lors de la mise à jour de l'application",
- "Updated" : "Mise à jour effectuée avec succès",
+ "Updated" : "Mise à jour effectuée",
"Uninstalling ...." : "Désintallation...",
"Error while uninstalling app" : "Erreur lors de la désinstallation de l'application",
"Uninstall" : "Désinstaller",
@@ -95,7 +95,7 @@ OC.L10N.register(
"A valid password must be provided" : "Un mot de passe valide doit être saisi",
"A valid email must be provided" : "Vous devez fournir une adresse de courriel valide",
"__language_name__" : "Français",
- "Sync clients" : "Clients synchronisé",
+ "Sync clients" : "Clients de synchronisation",
"Personal info" : "Informations personnelles",
"SSL root certificates" : "Certificats racine SSL",
"Encryption" : "Chiffrement",
@@ -121,7 +121,7 @@ OC.L10N.register(
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Nous vous recommandons d'installer sur votre système les paquets requis à la prise en charge de l'un des paramètres régionaux suivants : %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 \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si votre installation n'a pas été effectuée à la racine du domaine et qu'elle utilise le cron du système, il peut y avoir des problèmes avec la génération d'URL. Pour les éviter, veuillez configurer l'option \"overwrite.cli.url\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "La tâche cron n'a pu s'exécuter via CLI. Ces erreurs techniques sont apparues :",
- "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Consultez les <a target=\"_blank\" href=\"%s\">guides d'installation ↗</a>, et cherchez des erreurs dans <a href=\"#log-section\">les logs</a>.",
+ "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Consultez les <a target=\"_blank\" href=\"%s\">guides d'installation ↗</a>, et cherchez des erreurs ou avertissements dans <a href=\"#log-section\">les logs</a>.",
"Allow apps to use the Share API" : "Autoriser les applications à utiliser l'API de partage",
"Allow users to share via link" : "Autoriser les utilisateurs à partager par lien",
"Enforce password protection" : "Obliger la protection par mot de passe",
@@ -140,7 +140,7 @@ OC.L10N.register(
"Last cron job execution: %s. Something seems wrong." : "Dernière tâche cron exécutée : %s. Quelque chose s'est mal passé.",
"Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
"Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
- "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré en tant que service webcron pour appeler cron.php toutes les 15 minutes via http.",
+ "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré auprès d'un service webcron qui l'exécutera toutes les 15 minutes via http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
"Server Side Encryption" : "Chiffrement côté serveur",
"Enable Server-Side-Encryption" : "Activer le chiffrement côté serveur",
@@ -166,10 +166,10 @@ OC.L10N.register(
"SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite est actuellement utilisé comme gestionnaire de base de données. Pour des installations plus volumineuses, nous vous conseillons d'utiliser un autre gestionnaire de base de données.",
"Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "En particulier si vous utilisez le client de bureau pour synchroniser vos données : l'utilisation de SQLite est alors déconseillée.",
"To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Pour migrer vers un autre type de base de données, utilisez la ligne de commande : 'occ db:convert-type' ou consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a>.",
- "How to do backups" : "Comment creer des sauvegardes",
+ "How to do backups" : "Comment faire des sauvegardes",
"Advanced monitoring" : "Surveillance avancée",
- "Performance tuning" : "Ajustements des performances",
- "Improving the config.php" : "Améliorer le config.php ",
+ "Performance tuning" : "Ajustement des performances",
+ "Improving the config.php" : "Amélioration du config.php ",
"Theming" : "Thème",
"Hardening and security guidance" : "Guide pour le renforcement et la sécurité",
"Version" : "Version",
@@ -186,7 +186,7 @@ OC.L10N.register(
"Update to %s" : "Mettre à niveau vers la version %s",
"Enable only for specific groups" : "Activer uniquement pour certains groupes",
"Uninstall App" : "Désinstaller l'application",
- "No apps found for your version" : "Pas d'application pour votre version",
+ "No apps found for your version" : "Pas d'application trouvée pour votre version",
"Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Bonjour,<br><br>Un compte %s a été créé pour vous.<br><br>Votre nom d'utilisateur est : %s<br>Visitez votre compte : <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "À bientôt !",
"Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Bonjour,<br><br>Un compte %s a été créé pour vous.<br><br>Votre nom d'utilisateur est : %s<br>Visitez votre compte : %s<br><br>\n",
@@ -239,7 +239,7 @@ OC.L10N.register(
"Show storage location" : "Afficher l'emplacement du stockage",
"Show last log in" : "Montrer la dernière connexion",
"Show user backend" : "Montrer la source de l'identifiant",
- "Send email to new user" : "Envoyer un courriel au nouvel utilisateur",
+ "Send email to new user" : "Envoyer un courriel aux utilisateurs créés",
"Show email address" : "Afficher l'adresse email",
"Username" : "Nom d'utilisateur",
"E-Mail" : "Courriel",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index e85d827b5ff..78a0ef69e65 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -62,7 +62,7 @@
"Error while enabling app" : "Erreur lors de l'activation de l'application",
"Updating...." : "Mise à jour...",
"Error while updating app" : "Erreur lors de la mise à jour de l'application",
- "Updated" : "Mise à jour effectuée avec succès",
+ "Updated" : "Mise à jour effectuée",
"Uninstalling ...." : "Désintallation...",
"Error while uninstalling app" : "Erreur lors de la désinstallation de l'application",
"Uninstall" : "Désinstaller",
@@ -93,7 +93,7 @@
"A valid password must be provided" : "Un mot de passe valide doit être saisi",
"A valid email must be provided" : "Vous devez fournir une adresse de courriel valide",
"__language_name__" : "Français",
- "Sync clients" : "Clients synchronisé",
+ "Sync clients" : "Clients de synchronisation",
"Personal info" : "Informations personnelles",
"SSL root certificates" : "Certificats racine SSL",
"Encryption" : "Chiffrement",
@@ -119,7 +119,7 @@
"We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Nous vous recommandons d'installer sur votre système les paquets requis à la prise en charge de l'un des paramètres régionaux suivants : %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 \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si votre installation n'a pas été effectuée à la racine du domaine et qu'elle utilise le cron du système, il peut y avoir des problèmes avec la génération d'URL. Pour les éviter, veuillez configurer l'option \"overwrite.cli.url\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "La tâche cron n'a pu s'exécuter via CLI. Ces erreurs techniques sont apparues :",
- "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Consultez les <a target=\"_blank\" href=\"%s\">guides d'installation ↗</a>, et cherchez des erreurs dans <a href=\"#log-section\">les logs</a>.",
+ "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Consultez les <a target=\"_blank\" href=\"%s\">guides d'installation ↗</a>, et cherchez des erreurs ou avertissements dans <a href=\"#log-section\">les logs</a>.",
"Allow apps to use the Share API" : "Autoriser les applications à utiliser l'API de partage",
"Allow users to share via link" : "Autoriser les utilisateurs à partager par lien",
"Enforce password protection" : "Obliger la protection par mot de passe",
@@ -138,7 +138,7 @@
"Last cron job execution: %s. Something seems wrong." : "Dernière tâche cron exécutée : %s. Quelque chose s'est mal passé.",
"Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
"Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
- "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré en tant que service webcron pour appeler cron.php toutes les 15 minutes via http.",
+ "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré auprès d'un service webcron qui l'exécutera toutes les 15 minutes via http.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
"Server Side Encryption" : "Chiffrement côté serveur",
"Enable Server-Side-Encryption" : "Activer le chiffrement côté serveur",
@@ -164,10 +164,10 @@
"SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite est actuellement utilisé comme gestionnaire de base de données. Pour des installations plus volumineuses, nous vous conseillons d'utiliser un autre gestionnaire de base de données.",
"Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "En particulier si vous utilisez le client de bureau pour synchroniser vos données : l'utilisation de SQLite est alors déconseillée.",
"To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Pour migrer vers un autre type de base de données, utilisez la ligne de commande : 'occ db:convert-type' ou consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a>.",
- "How to do backups" : "Comment creer des sauvegardes",
+ "How to do backups" : "Comment faire des sauvegardes",
"Advanced monitoring" : "Surveillance avancée",
- "Performance tuning" : "Ajustements des performances",
- "Improving the config.php" : "Améliorer le config.php ",
+ "Performance tuning" : "Ajustement des performances",
+ "Improving the config.php" : "Amélioration du config.php ",
"Theming" : "Thème",
"Hardening and security guidance" : "Guide pour le renforcement et la sécurité",
"Version" : "Version",
@@ -184,7 +184,7 @@
"Update to %s" : "Mettre à niveau vers la version %s",
"Enable only for specific groups" : "Activer uniquement pour certains groupes",
"Uninstall App" : "Désinstaller l'application",
- "No apps found for your version" : "Pas d'application pour votre version",
+ "No apps found for your version" : "Pas d'application trouvée pour votre version",
"Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Bonjour,<br><br>Un compte %s a été créé pour vous.<br><br>Votre nom d'utilisateur est : %s<br>Visitez votre compte : <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "À bientôt !",
"Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Bonjour,<br><br>Un compte %s a été créé pour vous.<br><br>Votre nom d'utilisateur est : %s<br>Visitez votre compte : %s<br><br>\n",
@@ -237,7 +237,7 @@
"Show storage location" : "Afficher l'emplacement du stockage",
"Show last log in" : "Montrer la dernière connexion",
"Show user backend" : "Montrer la source de l'identifiant",
- "Send email to new user" : "Envoyer un courriel au nouvel utilisateur",
+ "Send email to new user" : "Envoyer un courriel aux utilisateurs créés",
"Show email address" : "Afficher l'adresse email",
"Username" : "Nom d'utilisateur",
"E-Mail" : "Courriel",
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index 37a900790cb..912c072fa2a 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -163,7 +163,7 @@ OC.L10N.register(
"More" : "Mer",
"Less" : "Mindre",
"The logfile is bigger than 100 MB. Downloading it may take some time!" : "Loggfilen er over 100 MB, nedlastingen kan ta en stund!",
- "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite er brukt som database. For større installasjoner anbefaler vi å bytte til en annen database-server.",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite brukes som database. For større installasjoner anbefaler vi å bytte til en annen database-server.",
"Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering",
"To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db:convert-type', eller les i <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a>.",
"How to do backups" : "Hvordan ta sikkerhetskopier",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index 73ba93fd9f6..479bbbe2dbd 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -161,7 +161,7 @@
"More" : "Mer",
"Less" : "Mindre",
"The logfile is bigger than 100 MB. Downloading it may take some time!" : "Loggfilen er over 100 MB, nedlastingen kan ta en stund!",
- "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite er brukt som database. For større installasjoner anbefaler vi å bytte til en annen database-server.",
+ "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite brukes som database. For større installasjoner anbefaler vi å bytte til en annen database-server.",
"Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering",
"To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db:convert-type', eller les i <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a>.",
"How to do backups" : "Hvordan ta sikkerhetskopier",
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
index 6573240f62b..ac99d1f0505 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -88,6 +88,8 @@ OC.L10N.register(
"A valid password must be provided" : "Navedeno mora biti veljavno geslo",
"A valid email must be provided" : "Naveden mora biti veljaven naslov elektronske pošte.",
"__language_name__" : "Slovenščina",
+ "Sync clients" : "Uskladi odjemalce",
+ "Personal info" : "Osebni podatki",
"SSL root certificates" : "Korenska potrdila SSL",
"Encryption" : "Šifriranje",
"Everything (fatal issues, errors, warnings, info, debug)" : "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
@@ -121,6 +123,7 @@ OC.L10N.register(
"Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.",
+ "Server Side Encryption" : "Strežniško šifriranje",
"This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
"Send mode" : "Način pošiljanja",
"From address" : "Naslov pošiljatelja",
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index a57ca128d4e..a09faa741eb 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -86,6 +86,8 @@
"A valid password must be provided" : "Navedeno mora biti veljavno geslo",
"A valid email must be provided" : "Naveden mora biti veljaven naslov elektronske pošte.",
"__language_name__" : "Slovenščina",
+ "Sync clients" : "Uskladi odjemalce",
+ "Personal info" : "Osebni podatki",
"SSL root certificates" : "Korenska potrdila SSL",
"Encryption" : "Šifriranje",
"Everything (fatal issues, errors, warnings, info, debug)" : "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
@@ -119,6 +121,7 @@
"Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.",
+ "Server Side Encryption" : "Strežniško šifriranje",
"This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
"Send mode" : "Način pošiljanja",
"From address" : "Naslov pošiljatelja",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 7fa16f4ac0a..992e8211e8c 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -1,12 +1,13 @@
OC.L10N.register(
"settings",
{
- "Security & setup warnings" : "Guvenlik & kurma uyarı",
+ "Security & setup warnings" : "Güvenlik ve kurulum uyarıları",
"Sharing" : "Paylaşım",
"External Storage" : "Harici Depolama",
"Cron" : "Cron",
"Email Server" : "E-Posta Sunucusu",
"Log" : "Günlük",
+ "Tips & tricks" : "İpuçları ve hileler",
"Updates" : "Güncellemeler",
"Authentication error" : "Kimlik doğrulama hatası",
"Your full name has been changed." : "Tam adınız değiştirildi.",
@@ -94,6 +95,7 @@ OC.L10N.register(
"A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı",
"A valid email must be provided" : "Geçerli bir e-posta belirtilmeli",
"__language_name__" : "Türkçe",
+ "Sync clients" : "Eşitleme istemcileri",
"Personal info" : "Kişisel bilgi",
"SSL root certificates" : "SSL kök sertifikaları",
"Encryption" : "Şifreleme",
@@ -119,6 +121,7 @@ OC.L10N.register(
"We strongly suggest installing 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.",
"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 \"overwrite.cli.url\" 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 oluşabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwrite.cli.url\" seçeneğini ayarlayın (Önerilen: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Bu CLI ile cronjobı çalıştırmak mümkün değildi. Aşağıdaki teknik hatalar ortaya çıkmıştır:",
+ "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lütfen <a target=\"_blank\" href=\"%s\">kurulum rehberlerini ↗</a> iki kez denetleyip <a href=\"#log-section\">günlük</a> içerisindeki hata ve uyarılara bakın.",
"Allow apps to use the Share API" : "Uygulamaların paylaşım API'sini kullanmasına izin ver",
"Allow users to share via link" : "Kullanıcıların bağlantı ile paylaşmasına izin ver",
"Enforce password protection" : "Parola korumasını zorla",
@@ -139,6 +142,8 @@ OC.L10N.register(
"Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
+ "Server Side Encryption" : "Sunucu Taraflı Şifreleme",
+ "Enable Server-Side-Encryption" : "Sunucu Taraflı Şifrelemeyi Etkinleştir",
"This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.",
"Send mode" : "Gönderme kipi",
"From address" : "Kimden adresi",
@@ -160,6 +165,13 @@ OC.L10N.register(
"The logfile is bigger than 100 MB. Downloading it may take some time!" : "Günlük dosyası 100 MB'dan daha büyük. İndirmek zaman alabilir!",
"SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için farklı bir veritabanı arka ucuna geçmenizi öneriyoruz.",
"Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Özellikle dosya eşitleme için masaüstü istemcisi kullanılırken SQLite kullanımı önerilmez.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Başka bir veritabanına geçmek için komut satırı aracını kullanın: 'occ db:convert-type' veya <a target=\"_blank\" href=\"%s\">belgelendirmeye ↗</a> bakın.",
+ "How to do backups" : "Nasıl yedekleme yapılır",
+ "Advanced monitoring" : "Gelişmiş izleme",
+ "Performance tuning" : "Performans ayarlama",
+ "Improving the config.php" : "config.php iyileştirme",
+ "Theming" : "Tema",
+ "Hardening and security guidance" : "Sağlamlaştırma ve güvenlik rehberliği",
"Version" : "Sürüm",
"More apps" : "Daha fazla uygulama",
"Developer documentation" : "Geliştirici belgelendirmesi",
@@ -174,6 +186,7 @@ OC.L10N.register(
"Update to %s" : "%s sürümüne güncelle",
"Enable only for specific groups" : "Sadece belirli gruplar için etkinleştir",
"Uninstall App" : "Uygulamayı Kaldır",
+ "No apps found for your version" : "Sürümünüz için uygulama bulunamadı",
"Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Merhaba,<br><br>Sadece artık bir %s hesabınızın olduğunu söylemek istedim.<br><br>Kullanıcı adınız: %s<br>Şuradan erişin: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Hoşçakalın!",
"Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Merhaba,\n\nSadece, artık bir %s hesabınızın olduğunu söylemek istedim.\n\nKullanıcı adınız: %s\nErişim: %s\n\n",
@@ -215,6 +228,7 @@ OC.L10N.register(
"Valid until" : "Geçerlilik",
"Issued By" : "Veren",
"Valid until %s" : "%s tarihine kadar geçerli",
+ "Import root certificate" : "Kök sertifikalarını iç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",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index f522a160f3a..9accebc4094 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -1,10 +1,11 @@
{ "translations": {
- "Security & setup warnings" : "Guvenlik & kurma uyarı",
+ "Security & setup warnings" : "Güvenlik ve kurulum uyarıları",
"Sharing" : "Paylaşım",
"External Storage" : "Harici Depolama",
"Cron" : "Cron",
"Email Server" : "E-Posta Sunucusu",
"Log" : "Günlük",
+ "Tips & tricks" : "İpuçları ve hileler",
"Updates" : "Güncellemeler",
"Authentication error" : "Kimlik doğrulama hatası",
"Your full name has been changed." : "Tam adınız değiştirildi.",
@@ -92,6 +93,7 @@
"A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı",
"A valid email must be provided" : "Geçerli bir e-posta belirtilmeli",
"__language_name__" : "Türkçe",
+ "Sync clients" : "Eşitleme istemcileri",
"Personal info" : "Kişisel bilgi",
"SSL root certificates" : "SSL kök sertifikaları",
"Encryption" : "Şifreleme",
@@ -117,6 +119,7 @@
"We strongly suggest installing 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.",
"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 \"overwrite.cli.url\" 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 oluşabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwrite.cli.url\" seçeneğini ayarlayın (Önerilen: \"%s\")",
"It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Bu CLI ile cronjobı çalıştırmak mümkün değildi. Aşağıdaki teknik hatalar ortaya çıkmıştır:",
+ "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lütfen <a target=\"_blank\" href=\"%s\">kurulum rehberlerini ↗</a> iki kez denetleyip <a href=\"#log-section\">günlük</a> içerisindeki hata ve uyarılara bakın.",
"Allow apps to use the Share API" : "Uygulamaların paylaşım API'sini kullanmasına izin ver",
"Allow users to share via link" : "Kullanıcıların bağlantı ile paylaşmasına izin ver",
"Enforce password protection" : "Parola korumasını zorla",
@@ -137,6 +140,8 @@
"Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
"Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
+ "Server Side Encryption" : "Sunucu Taraflı Şifreleme",
+ "Enable Server-Side-Encryption" : "Sunucu Taraflı Şifrelemeyi Etkinleştir",
"This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.",
"Send mode" : "Gönderme kipi",
"From address" : "Kimden adresi",
@@ -158,6 +163,13 @@
"The logfile is bigger than 100 MB. Downloading it may take some time!" : "Günlük dosyası 100 MB'dan daha büyük. İndirmek zaman alabilir!",
"SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için farklı bir veritabanı arka ucuna geçmenizi öneriyoruz.",
"Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Özellikle dosya eşitleme için masaüstü istemcisi kullanılırken SQLite kullanımı önerilmez.",
+ "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Başka bir veritabanına geçmek için komut satırı aracını kullanın: 'occ db:convert-type' veya <a target=\"_blank\" href=\"%s\">belgelendirmeye ↗</a> bakın.",
+ "How to do backups" : "Nasıl yedekleme yapılır",
+ "Advanced monitoring" : "Gelişmiş izleme",
+ "Performance tuning" : "Performans ayarlama",
+ "Improving the config.php" : "config.php iyileştirme",
+ "Theming" : "Tema",
+ "Hardening and security guidance" : "Sağlamlaştırma ve güvenlik rehberliği",
"Version" : "Sürüm",
"More apps" : "Daha fazla uygulama",
"Developer documentation" : "Geliştirici belgelendirmesi",
@@ -172,6 +184,7 @@
"Update to %s" : "%s sürümüne güncelle",
"Enable only for specific groups" : "Sadece belirli gruplar için etkinleştir",
"Uninstall App" : "Uygulamayı Kaldır",
+ "No apps found for your version" : "Sürümünüz için uygulama bulunamadı",
"Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Merhaba,<br><br>Sadece artık bir %s hesabınızın olduğunu söylemek istedim.<br><br>Kullanıcı adınız: %s<br>Şuradan erişin: <a href=\"%s\">%s</a><br><br>",
"Cheers!" : "Hoşçakalın!",
"Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Merhaba,\n\nSadece, artık bir %s hesabınızın olduğunu söylemek istedim.\n\nKullanıcı adınız: %s\nErişim: %s\n\n",
@@ -213,6 +226,7 @@
"Valid until" : "Geçerlilik",
"Issued By" : "Veren",
"Valid until %s" : "%s tarihine kadar geçerli",
+ "Import root certificate" : "Kök sertifikalarını iç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",
diff --git a/settings/personal.php b/settings/personal.php
index e4d278d4f28..12b320ac001 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -59,11 +59,6 @@ $email=$config->getUserValue(OC_User::getUser(), 'settings', 'email', '');
$userLang=$config->getUserValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
$languageCodes=OC_L10N::findAvailableLanguages();
-//check if encryption was enabled in the past
-$filesStillEncrypted = OC_Util::encryptedFiles();
-$backupKeysExists = OC_Util::backupKeysExists();
-$enableDecryptAll = $filesStillEncrypted || $backupKeysExists;
-
// array of common languages
$commonlangcodes = array(
'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
@@ -120,9 +115,6 @@ $tmpl->assign('activelanguage', $userLang);
$tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User::getUser()));
$tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
$tmpl->assign('displayName', OC_User::getDisplayName());
-$tmpl->assign('enableDecryptAll' , $enableDecryptAll);
-$tmpl->assign('backupKeysExists' , $backupKeysExists);
-$tmpl->assign('filesStillEncrypted' , $filesStillEncrypted);
$tmpl->assign('enableAvatars', $config->getSystemValue('enable_avatars', true));
$tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser()));
$tmpl->assign('certs', $certificateManager->listCertificates());
@@ -163,9 +155,6 @@ $formsAndMore = array_merge($formsAndMore, $formsMap);
// add bottom hardcoded forms from the template
$formsAndMore[]= array( 'anchor' => 'ssl-root-certificates', 'section-name' => $l->t('SSL root certificates') );
-if($enableDecryptAll) {
- $formsAndMore[]= array( 'anchor' => 'encryption', 'section-name' => $l->t('Encryption') );
-}
$tmpl->assign('forms', $formsAndMore);
$tmpl->printPage();
diff --git a/settings/routes.php b/settings/routes.php
index 86b7fa2375c..1bb14812145 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -89,12 +89,6 @@ $this->create('settings_personal_changepassword', '/settings/personal/changepass
->action('OC\Settings\ChangePassword\Controller', 'changePersonalPassword');
$this->create('settings_ajax_setlanguage', '/settings/ajax/setlanguage.php')
->actionInclude('settings/ajax/setlanguage.php');
-$this->create('settings_ajax_decryptall', '/settings/ajax/decryptall.php')
- ->actionInclude('settings/ajax/decryptall.php');
-$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')
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 1b0ed66563e..1b8ab0e3819 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -295,73 +295,6 @@ if ($_['cronErrors']) {
</p>
</div>
-<div class="section" id="shareAPI">
- <h2><?php p($l->t('Sharing'));?></h2>
- <p id="enable">
- <input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled"
- value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> />
- <label for="shareAPIEnabled"><?php p($l->t('Allow apps to use the Share API'));?></label><br/>
- </p>
- <p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
- <input type="checkbox" name="shareapi_allow_links" id="allowLinks"
- value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> />
- <label for="allowLinks"><?php p($l->t('Allow users to share via link'));?></label><br/>
- </p>
-
- <p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
- <input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword"
- value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> />
- <label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/>
-
- <input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload"
- value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> />
- <label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
-
- <input type="checkbox" name="shareapi_allow_public_notification" id="allowPublicMailNotification"
- value="1" <?php if ($_['allowPublicMailNotification'] == 'yes') print_unescaped('checked="checked"'); ?> />
- <label for="allowPublicMailNotification"><?php p($l->t('Allow users to send mail notification for shared files'));?></label><br/>
-
- <input type="checkbox" name="shareapi_default_expire_date" id="shareapiDefaultExpireDate"
- value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') print_unescaped('checked="checked"'); ?> />
- <label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date'));?></label><br/>
-
- </p>
- <p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden');?>">
- <?php p($l->t( 'Expire after ' )); ?>
- <input type="text" name='shareapi_expire_after_n_days' id="shareapiExpireAfterNDays" placeholder="<?php p('7')?>"
- value='<?php p($_['shareExpireAfterNDays']) ?>' />
- <?php p($l->t( 'days' )); ?>
- <input type="checkbox" name="shareapi_enforce_expire_date" id="shareapiEnforceExpireDate"
- value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') print_unescaped('checked="checked"'); ?> />
- <label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
- </p>
- <p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
- <input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
- value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
- <label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
- </p>
- <p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
- <input type="checkbox" name="shareapi_only_share_with_group_members" id="onlyShareWithGroupMembers"
- value="1" <?php if ($_['onlyShareWithGroupMembers']) print_unescaped('checked="checked"'); ?> />
- <label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups'));?></label><br/>
- </p>
- <p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
- <input type="checkbox" name="shareapi_allow_mail_notification" id="allowMailNotification"
- value="1" <?php if ($_['allowMailNotification'] === 'yes') print_unescaped('checked="checked"'); ?> />
- <label for="allowMailNotification"><?php p($l->t('Allow users to send mail notification for shared files to other users'));?></label><br/>
- </p>
- <p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
- <input type="checkbox" name="shareapi_exclude_groups" id="shareapiExcludeGroups"
- value="1" <?php if ($_['shareExcludeGroups']) print_unescaped('checked="checked"'); ?> />
- <label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing'));?></label><br/>
- </p>
- <p id="selectExcludedGroups" class="indent <?php if (!$_['shareExcludeGroups'] || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
- <input name="shareapi_exclude_groups_list" type="hidden" id="excludedGroups" value="<?php p($_['shareExcludedGroupsList']) ?>" style="width: 400px"/>
- <br />
- <em><?php p($l->t('These groups will still be able to receive shares, but not to initiate them.')); ?></em>
- </p>
-</div>
-
<div class="section" id='encryptionAPI'>
<h2><?php p($l->t('Server Side Encryption'));?></h2>
<p id="enable">
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 2a0b4bb0dc4..dfdc6191805 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -242,58 +242,6 @@ if($_['passwordChangeSupported']) {
</form>
</div>
-<?php if($_['enableDecryptAll']): ?>
-<div id="encryption" class="section">
-
- <h2>
- <?php p( $l->t( 'Encryption' ) ); ?>
- </h2>
-
- <?php if($_['filesStillEncrypted']): ?>
-
- <div id="decryptAll">
- <?php p($l->t( "The encryption app is no longer enabled, please decrypt all your files" )); ?>
- <p>
- <input
- type="password"
- name="privateKeyPassword"
- id="privateKeyPassword" />
- <label for="privateKeyPassword"><?php p($l->t( "Log-in password" )); ?></label>
- <br />
- <button
- type="button"
- disabled
- name="submitDecryptAll"><?php p($l->t( "Decrypt all Files" )); ?>
- </button>
- <span class="msg"></span>
- </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." )); ?>
- <p>
- <button
- type="button"
- name="submitRestoreKeys"><?php p($l->t( "Restore Encryption Keys" )); ?>
- </button>
- <button
- type="button"
- name="submitDeleteKeys"><?php p($l->t( "Delete Encryption Keys" )); ?>
- </button>
- <span class="msg"></span>
-
- </p>
- <br />
-
- </div>
-
-
-</div>
- <?php endif; ?>
-
<div class="section">
<h2><?php p($l->t('Version'));?></h2>
<strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getHumanVersion()) ?><br />
diff --git a/settings/users.php b/settings/users.php
index 08498edec29..0fc9fbeafc2 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -45,8 +45,8 @@ $groupsInfo = new \OC\Group\MetaData(OC_User::getUser(), $isAdmin, $groupManager
$groupsInfo->setSorting($groupsInfo::SORT_USERCOUNT);
list($adminGroup, $groups) = $groupsInfo->get();
-$recoveryAdminEnabled = OC_App::isEnabled('files_encryption') &&
- $config->getAppValue( 'files_encryption', 'recoveryAdminEnabled', null );
+$recoveryAdminEnabled = OC_App::isEnabled('encryption') &&
+ $config->getAppValue( 'encryption', 'recoveryAdminEnabled', null );
if($isAdmin) {
$subadmins = OC_SubAdmin::getAllSubAdmins();
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-07 09:20:50 +0000