diff options
174 files changed, 1467 insertions, 387 deletions
diff --git a/3rdparty b/3rdparty -Subproject 5db359cb710c51747d3fb78b605f8b8cdcd1e60 +Subproject f6d7a519e4dca5189963abb15e5c9858b03bf98 diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php index dc9e4b64c14..866097faba6 100644 --- a/apps/files/l10n/uk.php +++ b/apps/files/l10n/uk.php @@ -1,19 +1,25 @@ <?php $TRANSLATIONS = array( +"Storage not available" => "Сховище не доступне", +"Storage invalid" => "Неправильне сховище", "Unknown error" => "Невідома помилка", "Could not move %s - File with this name already exists" => "Не вдалося перемістити %s - Файл з таким ім'ям вже існує", "Could not move %s" => "Не вдалося перемістити %s", +"Permission denied" => "Доступ заборонено", "File name cannot be empty." => " Ім'я файлу не може бути порожнім.", "\"%s\" is an invalid file name." => "\"%s\" - це некоректне ім'я файлу.", "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.", "The target folder has been moved or deleted." => "Теку призначення було переміщено або видалено.", "The name %s is already used in the folder %s. Please choose a different name." => "Файл з ім'ям %s вже є у теці %s. Оберіть інше ім'я.", +"Not a valid source" => "Недійсне джерело", "Server is not allowed to open URLs, please check the server configuration" => "Серверу заборонено відкривати посилання, перевірте конфігурацію", +"The file exceeds your quota by %s" => "Файл перевищує вашу квоту на %s", "Error while downloading %s to %s" => "Помилка завантаження %s до %s", "Error when creating the file" => "Помилка створення файлу", "Folder name cannot be empty." => "Ім'я теки не може бути порожнім.", "Error when creating the folder" => "Помилка створення теки", "Unable to set upload directory." => "Не вдалося встановити каталог завантаження.", +"Invalid Token" => "Невірний Маркер", "No file was uploaded. Unknown error" => "Не завантажено жодного файлу. Невідома помилка", "There is no error, the file uploaded with success" => "Файл успішно вивантажено без помилок.", "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Розмір звантаження перевищує upload_max_filesize параметра в php.ini: ", @@ -41,6 +47,7 @@ $TRANSLATIONS = array( "Error fetching URL" => "Помилка отримання URL", "Share" => "Поділитися", "Delete" => "Видалити", +"Disconnect storage" => "Від’єднати сховище", "Unshare" => "Закрити доступ", "Delete permanently" => "Видалити назавжди", "Rename" => "Перейменувати", @@ -53,8 +60,8 @@ $TRANSLATIONS = array( "Name" => "Ім'я", "Size" => "Розмір", "Modified" => "Змінено", -"_%n folder_::_%n folders_" => array("%n тека","%n тека","%n теки"), -"_%n file_::_%n files_" => array("%n файл","%n файлів","%n файли"), +"_%n folder_::_%n folders_" => array("%n тека","%n тек","%n тек"), +"_%n file_::_%n files_" => array("%n файл","%n файлів","%n файлів"), "You don’t have permission to upload or create files here" => "У вас недостатньо прав для завантаження або створення файлів тут", "_Uploading %n file_::_Uploading %n files_" => array("Завантаження %n файлу","Завантаження %n файлів","Завантаження %n файлів"), "\"{name}\" is an invalid file name." => "\"{name}\" - некоректне ім'я файлу.", @@ -63,11 +70,13 @@ $TRANSLATIONS = array( "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову", "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Невірний закритий ключ для доданку шифрування. Оновіть пароль до вашого закритого ключа в особистих налаштуваннях.", "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Шифрування було вимкнено, але ваші файли все ще зашифровано. Для розшифрування перейдіть до персональних налаштувань.", +"{dirs} and {files}" => "{dirs} і {files}", +"%s could not be renamed as it has been deleted" => "%s не може бути перейменований, оскільки він видалений", "%s could not be renamed" => "%s не може бути перейменований", "Upload (max. %s)" => "Завантаження (макс. %s)", "File handling" => "Робота з файлами", "Maximum upload size" => "Максимальний розмір відвантажень", -"max. possible: " => "макс.можливе:", +"max. possible: " => "макс. можливе:", "Save" => "Зберегти", "WebDAV" => "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Для доступу до файлів через WebDAV використовуйте <a href=\"%s\" target=\"_blank\">це посилання</a>", diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php index 164db17f4a7..d26aa449b3b 100644 --- a/apps/files_encryption/l10n/es.php +++ b/apps/files_encryption/l10n/es.php @@ -1,9 +1,15 @@ <?php $TRANSLATIONS = array( "Unknown error" => "Error desconocido", +"Missing recovery key password" => "Falta contraseña de recuperacion.", +"Please repeat the recovery key password" => "Por favor repita la contraseña de recuperacion", +"Repeated recovery key password does not match the provided recovery key password" => "la contraseña de recuperacion repetida no es igual a la contraseña de recuperacion", "Recovery key successfully enabled" => "Se ha habilitado la recuperación de archivos", "Could not disable recovery key. Please check your recovery key password!" => "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!", "Recovery key successfully disabled" => "Clave de recuperación deshabilitada", +"Please provide the old recovery password" => "Por favor ingrese su antigua contraseña de recuperacion", +"Please provide a new recovery password" => "Por favor ingrese una nueva contraseña de recuperacion", +"Please repeat the new recovery password" => "Por favor repita su nueva contraseña de recuperacion", "Password successfully changed." => "Su contraseña ha sido cambiada", "Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.", "Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.", diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php index 0d786b6ce7d..7362c61bc71 100644 --- a/apps/files_encryption/l10n/et_EE.php +++ b/apps/files_encryption/l10n/et_EE.php @@ -1,9 +1,15 @@ <?php $TRANSLATIONS = array( "Unknown error" => "Tundmatu viga", +"Missing recovery key password" => "Muuda taastevõtme parool", +"Please repeat the recovery key password" => "Palun korda uut taastevõtme parooli", +"Repeated recovery key password does not match the provided recovery key password" => "Lahtritesse sisestatud taastevõtme paroolid ei kattu", "Recovery key successfully enabled" => "Taastevõtme lubamine õnnestus", "Could not disable recovery key. Please check your recovery key password!" => "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!", "Recovery key successfully disabled" => "Taastevõtme keelamine õnnestus", +"Please provide the old recovery password" => "Palun sisesta vana taastevõtme parool", +"Please provide a new recovery password" => "Palun sisesta uus taastevõtme parool", +"Please repeat the new recovery password" => "Palun korda uut taastevõtme parooli", "Password successfully changed." => "Parool edukalt vahetatud.", "Could not change the password. Maybe the old password was not correct." => "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.", "Private key password successfully updated." => "Privaatse võtme parool edukalt uuendatud.", diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php index 44919fbc0a3..8c3e0ded613 100644 --- a/apps/files_encryption/l10n/fr.php +++ b/apps/files_encryption/l10n/fr.php @@ -1,9 +1,15 @@ <?php $TRANSLATIONS = array( "Unknown error" => "Erreur Inconnue ", +"Missing recovery key password" => "Clef de de récupération de mot de passe manquante", +"Please repeat the recovery key password" => "Répétez le mot de passe de la clé de récupération", +"Repeated recovery key password does not match the provided recovery key password" => "Le mot de passe répété de la clé de récupération ne correspond pas au mot de passe de la clé de récupération donné", "Recovery key successfully enabled" => "Clé de récupération activée avec succès", "Could not disable recovery key. Please check your recovery key password!" => "Impossible de désactiver la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !", "Recovery key successfully disabled" => "Clé de récupération désactivée avec succès", +"Please provide the old recovery password" => "Veuillez entrer l'ancien mot de passe de récupération", +"Please provide a new recovery password" => "Veuillez entrer un nouveau mot de passe de récupération", +"Please repeat the new recovery password" => "Veuillez répéter le nouveau mot de passe de récupération", "Password successfully changed." => "Mot de passe changé avec succès ", "Could not change the password. Maybe the old password was not correct." => "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.", "Private key password successfully updated." => "Mot de passe de la clé privé mis à jour avec succès.", diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php index a2f67ebec75..42c6cd39a61 100644 --- a/apps/files_encryption/l10n/uk.php +++ b/apps/files_encryption/l10n/uk.php @@ -3,6 +3,7 @@ $TRANSLATIONS = array( "Unknown error" => "Невідома помилка", "Encryption" => "Шифрування", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову", +"Enabled" => "Увімкнено", "Change Password" => "Змінити Пароль" ); $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/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index c4fc29db03a..59b191097af 100755 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -24,6 +24,7 @@ */
namespace OCA\Encryption;
+use OCA\Encryption\Exceptions\EncryptionException;
/**
* Class for common cryptography functionality
@@ -289,9 +290,9 @@ class Crypt { $padded = self::addPadding($catfile);
return $padded;
- } catch (OCA\Encryption\Exceptions\EncryptionException $e) {
- $message = 'Could not encrypt file content (code: ' . $e->getCode . '): ';
- \OCP\Util::writeLog('files_encryption', $message . $e->getMessage, \OCP\Util::ERROR);
+ } catch (EncryptionException $e) {
+ $message = 'Could not encrypt file content (code: ' . $e->getCode() . '): ';
+ \OCP\Util::writeLog('files_encryption', $message . $e->getMessage(), \OCP\Util::ERROR);
return false;
}
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php index ab19938d633..6f4eb4aaf3b 100755 --- a/apps/files_encryption/lib/helper.php +++ b/apps/files_encryption/lib/helper.php @@ -461,7 +461,7 @@ class Helper { } else { \OC_Log::write( 'Encryption library', - 'No share key found for user "' . $user . '" for file "' . $pathOld . '"', + 'No share key found for user "' . $user . '" for file "' . $fileName . '"', \OC_Log::WARN ); } diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php index 1bebb3cd36c..a89754d4a14 100755 --- a/apps/files_encryption/tests/crypt.php +++ b/apps/files_encryption/tests/crypt.php @@ -102,6 +102,14 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { public static function tearDownAfterClass() { // cleanup test user \OC_User::deleteUser(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1); + + \OC_Hook::clear(); + \OC_FileProxy::clearProxies(); + + // Delete keys in /data/ + $view = new \OC\Files\View('/'); + $view->rmdir('public-keys'); + $view->rmdir('owncloud_private_key'); } /** diff --git a/apps/files_encryption/tests/helper.php b/apps/files_encryption/tests/helper.php index b94fdeb4d6c..df7ff8cdb11 100644 --- a/apps/files_encryption/tests/helper.php +++ b/apps/files_encryption/tests/helper.php @@ -20,18 +20,27 @@ class Test_Encryption_Helper extends \PHPUnit_Framework_TestCase { const TEST_ENCRYPTION_HELPER_USER1 = "test-helper-user1"; const TEST_ENCRYPTION_HELPER_USER2 = "test-helper-user2"; - public static function setUpBeforeClass() { + public function setUp() { // create test user \Test_Encryption_Util::loginHelper(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER2, true); \Test_Encryption_Util::loginHelper(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER1, true); } - public static function tearDownAfterClass() { + public function tearDown() { // cleanup test user \OC_User::deleteUser(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER1); \OC_User::deleteUser(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER2); + } + + public static function tearDownAfterClass() { + \OC_Hook::clear(); \OC_FileProxy::clearProxies(); + + // Delete keys in /data/ + $view = new \OC\Files\View('/'); + $view->rmdir('public-keys'); + $view->rmdir('owncloud_private_key'); } /** @@ -157,11 +166,6 @@ class Test_Encryption_Helper extends \PHPUnit_Framework_TestCase { $result ); } - - // clean up - $rootView->unlink($baseDir); - \Test_Encryption_Util::logoutHelper(); - \OC_User::deleteUser($userName); } } diff --git a/apps/files_encryption/tests/hooks.php b/apps/files_encryption/tests/hooks.php index 14d44fe5bb3..c7353deee22 100644 --- a/apps/files_encryption/tests/hooks.php +++ b/apps/files_encryption/tests/hooks.php @@ -117,6 +117,14 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase { // cleanup test user \OC_User::deleteUser(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1); \OC_User::deleteUser(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2); + + \OC_Hook::clear(); + \OC_FileProxy::clearProxies(); + + // Delete keys in /data/ + $view = new \OC\Files\View('/'); + $view->rmdir('public-keys'); + $view->rmdir('owncloud_private_key'); } function testDisableHook() { diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php index e8a9d7dda53..ad7d2cfcd45 100644 --- a/apps/files_encryption/tests/keymanager.php +++ b/apps/files_encryption/tests/keymanager.php @@ -98,6 +98,14 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase { if (self::$stateFilesTrashbin) { OC_App::enable('files_trashbin'); } + + \OC_Hook::clear(); + \OC_FileProxy::clearProxies(); + + // Delete keys in /data/ + $view = new \OC\Files\View('/'); + $view->rmdir('public-keys'); + $view->rmdir('owncloud_private_key'); } /** diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php index 42637a52e04..56d6cd2f736 100644 --- a/apps/files_encryption/tests/proxy.php +++ b/apps/files_encryption/tests/proxy.php @@ -89,6 +89,14 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase { public static function tearDownAfterClass() { // cleanup test user \OC_User::deleteUser(\Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1); + + \OC_Hook::clear(); + \OC_FileProxy::clearProxies(); + + // Delete keys in /data/ + $view = new \OC\Files\View('/'); + $view->rmdir('public-keys'); + $view->rmdir('owncloud_private_key'); } /** diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php index 1cd7cfc738b..f4ce94b7ee9 100755 --- a/apps/files_encryption/tests/share.php +++ b/apps/files_encryption/tests/share.php @@ -124,6 +124,14 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { \OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2); \OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3); \OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4); + + \OC_Hook::clear(); + \OC_FileProxy::clearProxies(); + + // Delete keys in /data/ + $view = new \OC\Files\View('/'); + $view->rmdir('public-keys'); + $view->rmdir('owncloud_private_key'); } diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php index 254c5e87ed1..b8c18fbe049 100644 --- a/apps/files_encryption/tests/stream.php +++ b/apps/files_encryption/tests/stream.php @@ -96,6 +96,14 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase { public static function tearDownAfterClass() { // cleanup test user \OC_User::deleteUser(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1); + + \OC_Hook::clear(); + \OC_FileProxy::clearProxies(); + + // Delete keys in /data/ + $view = new \OC\Files\View('/'); + $view->rmdir('public-keys'); + $view->rmdir('owncloud_private_key'); } function testStreamOptions() { diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php index ae0974431be..5890292cd7b 100755 --- a/apps/files_encryption/tests/trashbin.php +++ b/apps/files_encryption/tests/trashbin.php @@ -110,6 +110,14 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase { public static function tearDownAfterClass() { // cleanup test user \OC_User::deleteUser(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1); + + \OC_Hook::clear(); + \OC_FileProxy::clearProxies(); + + // Delete keys in /data/ + $view = new \OC\Files\View('/'); + $view->rmdir('public-keys'); + $view->rmdir('owncloud_private_key'); } /** diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php index 811530546e8..d5bfb86a2e4 100755 --- a/apps/files_encryption/tests/util.php +++ b/apps/files_encryption/tests/util.php @@ -124,9 +124,18 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { \OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1); \OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER2); \OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER); + //cleanup groups \OC_Group::deleteGroup(self::TEST_ENCRYPTION_UTIL_GROUP1); \OC_Group::deleteGroup(self::TEST_ENCRYPTION_UTIL_GROUP2); + + \OC_Hook::clear(); + \OC_FileProxy::clearProxies(); + + // Delete keys in /data/ + $view = new \OC\Files\View('/'); + $view->rmdir('public-keys'); + $view->rmdir('owncloud_private_key'); } public static function setupHooks() { diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php index c46d3bf0899..cc0cff9aa5c 100755 --- a/apps/files_encryption/tests/webdav.php +++ b/apps/files_encryption/tests/webdav.php @@ -108,6 +108,14 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase { public static function tearDownAfterClass() { // cleanup test user \OC_User::deleteUser(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1); + + \OC_Hook::clear(); + \OC_FileProxy::clearProxies(); + + // Delete keys in /data/ + $view = new \OC\Files\View('/'); + $view->rmdir('public-keys'); + $view->rmdir('owncloud_private_key'); } /** diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index 00d2a920cbf..75d45ae1924 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -19,28 +19,28 @@ function getSelection($row) { return values; } -function highlightBorder(element, highlight) { - $(element).toggleClass('warning-input', highlight); +function highlightBorder($element, highlight) { + $element.toggleClass('warning-input', highlight); return highlight; } -function highlightInput(input) { - if ($(input).attr('type') === 'text' || $(input).attr('type') === 'password') { - return highlightBorder(input, - ($(input).val() === '' && !$(input).hasClass('optional'))); +function highlightInput($input) { + if ($input.attr('type') === 'text' || $input.attr('type') === 'password') { + return highlightBorder($input, + ($input.val() === '' && !$input.hasClass('optional'))); } } OC.MountConfig={ - saveStorage:function(tr, callback) { - var mountPoint = $(tr).find('.mountPoint input').val(); - var oldMountPoint = $(tr).find('.mountPoint input').data('mountpoint'); + saveStorage:function($tr, callback) { + var mountPoint = $tr.find('.mountPoint input').val(); + var oldMountPoint = $tr.find('.mountPoint input').data('mountpoint'); if (mountPoint === '') { return false; } - var statusSpan = $(tr).closest('tr').find('.status span'); - var backendClass = $(tr).find('.backend').data('class'); - var configuration = $(tr).find('.configuration input'); + var statusSpan = $tr.find('.status span'); + var backendClass = $tr.find('.backend').data('class'); + var configuration = $tr.find('.configuration input'); var addMountPoint = true; if (configuration.length < 1) { return false; @@ -62,14 +62,14 @@ OC.MountConfig={ } }); if ($('#externalStorage').data('admin') === true) { - var multiselect = getSelection($(tr)); + var multiselect = getSelection($tr); } if (addMountPoint) { var status = false; if ($('#externalStorage').data('admin') === true) { var isPersonal = false; - var oldGroups = $(tr).find('.applicable').data('applicable-groups'); - var oldUsers = $(tr).find('.applicable').data('applicable-users'); + var oldGroups = $tr.find('.applicable').data('applicable-groups'); + var oldUsers = $tr.find('.applicable').data('applicable-users'); var groups = []; var users = []; $.each(multiselect, function(index, value) { @@ -102,7 +102,7 @@ OC.MountConfig={ oldMountPoint: oldMountPoint }, success: function(result) { - $(tr).find('.mountPoint input').data('mountpoint', mountPoint); + $tr.find('.mountPoint input').data('mountpoint', mountPoint); status = updateStatus(statusSpan, result); if (callback) { callback(status); @@ -116,8 +116,8 @@ OC.MountConfig={ } }); }); - $(tr).find('.applicable').data('applicable-groups', groups); - $(tr).find('.applicable').data('applicable-users', users); + $tr.find('.applicable').data('applicable-groups', groups); + $tr.find('.applicable').data('applicable-users', users); var mountType = 'group'; $.each(oldGroups, function(index, applicable) { $.ajax({type: 'POST', @@ -163,7 +163,7 @@ OC.MountConfig={ oldMountPoint: oldMountPoint }, success: function(result) { - $(tr).find('.mountPoint input').data('mountpoint', mountPoint); + $tr.find('.mountPoint input').data('mountpoint', mountPoint); status = updateStatus(statusSpan, result); if (callback) { callback(status); @@ -183,20 +183,23 @@ OC.MountConfig={ }; $(document).ready(function() { + var $externalStorage = $('#externalStorage'); + //initialize hidden input field with list of users and groups - $('#externalStorage').find('tr:not(#addMountPoint)').each(function(i,tr) { - var applicable = $(tr).find('.applicable'); - if (applicable.length > 0) { - var groups = applicable.data('applicable-groups'); + $externalStorage.find('tr:not(#addMountPoint)').each(function(i,tr) { + var $tr = $(tr); + var $applicable = $tr.find('.applicable'); + if ($applicable.length > 0) { + var groups = $applicable.data('applicable-groups'); var groupsId = []; $.each(groups, function () { - groupsId.push(this+"(group)"); + groupsId.push(this + '(group)'); }); - var users = applicable.data('applicable-users'); + var users = $applicable.data('applicable-users'); if (users.indexOf('all') > -1) { - $(tr).find('.applicableUsers').val(''); + $tr.find('.applicableUsers').val(''); } else { - $(tr).find('.applicableUsers').val(groupsId.concat(users).join(',')); + $tr.find('.applicableUsers').val(groupsId.concat(users).join(',')); } } }); @@ -221,7 +224,7 @@ $(document).ready(function() { }; }, results: function (data, page) { - if (data.status === "success") { + if (data.status === 'success') { var results = []; var userCount = 0; // users is an object @@ -256,10 +259,10 @@ $(document).ready(function() { type: 'POST', contentType: 'application/json', data: JSON.stringify(users), - dataType: "json" + dataType: 'json' }).done(function(data) { var results = []; - if (data.status === "success") { + if (data.status === 'success') { $.each(data.users, function(user, displayname) { if (displayname !== false) { results.push({name:user, displayname:displayname, type:'user'}); @@ -294,9 +297,9 @@ $(document).ready(function() { } }, escapeMarkup: function (m) { return m; } // we escape the markup in formatResult and formatSelection - }).on("select2-loaded", function() { - $.each($(".avatardiv"), function(i, div) { - $div = $(div); + }).on('select2-loaded', function() { + $.each($('.avatardiv'), function(i, div) { + var $div = $(div); if ($div.data('type') === 'user') { $div.avatar($div.data('name'),32); } @@ -306,21 +309,21 @@ $(document).ready(function() { } addSelect2($('tr:not(#addMountPoint) .applicableUsers')); - $('#externalStorage').on('change', '#selectBackend', function() { - var tr = $(this).closest("tr"); - $('#externalStorage tbody').append($(tr).clone()); - $('#externalStorage tbody tr').last().find('.mountPoint input').val(''); + $externalStorage.on('change', '#selectBackend', function() { + var $tr = $(this).closest('tr'); + $externalStorage.find('tbody').append($tr.clone()); + $externalStorage.find('tbody tr').last().find('.mountPoint input').val(''); var selected = $(this).find('option:selected').text(); var backendClass = $(this).val(); - $(tr).find('.backend').text(selected); - if ($(tr).find('.mountPoint input').val() === '') { - $(tr).find('.mountPoint input').val(suggestMountPoint(selected)); + $tr.find('.backend').text(selected); + if ($tr.find('.mountPoint input').val() === '') { + $tr.find('.mountPoint input').val(suggestMountPoint(selected)); } - $(tr).addClass(backendClass); - $(tr).find('.status').append('<span></span>'); - $(tr).find('.backend').data('class', backendClass); + $tr.addClass(backendClass); + $tr.find('.status').append('<span></span>'); + $tr.find('.backend').data('class', backendClass); var configurations = $(this).data('configurations'); - var td = $(tr).find('td.configuration'); + var $td = $tr.find('td.configuration'); $.each(configurations, function(backend, parameters) { if (backend === backendClass) { $.each(parameters['configuration'], function(parameter, placeholder) { @@ -342,20 +345,20 @@ $(document).ready(function() { newElement = $('<input type="text" class="added' + class_string + '" data-parameter="'+parameter+'" placeholder="'+placeholder+'" />'); } highlightInput(newElement); - td.append(newElement); + $td.append(newElement); }); - if (parameters['custom'] && $('#externalStorage tbody tr.'+backendClass.replace(/\\/g, '\\\\')).length === 1) { + if (parameters['custom'] && $externalStorage.find('tbody tr.'+backendClass.replace(/\\/g, '\\\\')).length === 1) { OC.addScript('files_external', parameters['custom']); } - td.children().not('[type=hidden]').first().focus(); + $td.children().not('[type=hidden]').first().focus(); return false; } }); - $(tr).find('td').last().attr('class', 'remove'); - $(tr).find('td').last().removeAttr('style'); - $(tr).removeAttr('id'); + $tr.find('td').last().attr('class', 'remove'); + $tr.find('td').last().removeAttr('style'); + $tr.removeAttr('id'); $(this).remove(); - addSelect2($('tr:not(#addMountPoint) .applicableUsers')); + addSelect2($tr.find('.applicableUsers')); }); function suggestMountPoint(defaultMountPoint) { @@ -369,7 +372,7 @@ $(document).ready(function() { var match = true; while (match && i < 20) { match = false; - $('#externalStorage tbody td.mountPoint input').each(function(index, mountPoint) { + $externalStorage.find('tbody td.mountPoint input').each(function(index, mountPoint) { if ($(mountPoint).val() === defaultMountPoint+append) { match = true; return false; @@ -385,54 +388,54 @@ $(document).ready(function() { return defaultMountPoint+append; } - $('#externalStorage').on('paste', 'td input', function() { - var tr = $(this).closest("tr"); - var me = this; + $externalStorage.on('paste', 'td input', function() { + var $me = $(this); + var $tr = $me.closest('tr'); setTimeout(function() { - highlightInput($(me)); - OC.MountConfig.saveStorage(tr); + highlightInput($me); + OC.MountConfig.saveStorage($tr); }, 20); }); var timer; - $('#externalStorage').on('keyup', 'td input', function() { + $externalStorage.on('keyup', 'td input', function() { clearTimeout(timer); - var tr = $(this).closest("tr"); + var $tr = $(this).closest('tr'); highlightInput($(this)); if ($(this).val) { timer = setTimeout(function() { - OC.MountConfig.saveStorage(tr); + OC.MountConfig.saveStorage($tr); }, 2000); } }); - $('#externalStorage').on('change', 'td input:checkbox', function() { - OC.MountConfig.saveStorage($(this).closest("tr")); + $externalStorage.on('change', 'td input:checkbox', function() { + OC.MountConfig.saveStorage($(this).closest('tr')); }); - $('#externalStorage').on('change', '.applicable', function() { - OC.MountConfig.saveStorage($(this).closest("tr")); + $externalStorage.on('change', '.applicable', function() { + OC.MountConfig.saveStorage($(this).closest('tr')); }); - $('#externalStorage').on('click', '.status>span', function() { - OC.MountConfig.saveStorage($(this).closest("tr")); + $externalStorage.on('click', '.status>span', function() { + OC.MountConfig.saveStorage($(this).closest('tr')); }); $('#sslCertificate').on('click', 'td.remove>img', function() { - var $tr = $(this).closest("tr"); + var $tr = $(this).closest('tr'); $.post(OC.filePath('files_external', 'ajax', 'removeRootCertificate.php'), {cert: $tr.attr('id')}); $tr.remove(); return true; }); - $('#externalStorage').on('click', 'td.remove>img', function() { - var tr = $(this).closest('tr'); - var mountPoint = $(tr).find('.mountPoint input').val(); + $externalStorage.on('click', 'td.remove>img', function() { + var $tr = $(this).closest('tr'); + var mountPoint = $tr.find('.mountPoint input').val(); - if ($('#externalStorage').data('admin') === true) { + if ($externalStorage.data('admin') === true) { var isPersonal = false; - var multiselect = getSelection($(tr)); + var multiselect = getSelection($tr); $.each(multiselect, function(index, value) { var pos = value.indexOf('(group)'); if (pos != -1) { @@ -450,10 +453,11 @@ $(document).ready(function() { var isPersonal = true; $.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal }); } - $(tr).remove(); + $tr.remove(); }); - $('#allowUserMounting').bind('change', function() { + var $allowUserMounting = $('#allowUserMounting'); + $allowUserMounting.bind('change', function() { OC.msg.startSaving('#userMountingMsg'); if (this.checked) { OC.AppConfig.setValue('files_external', 'allow_user_mounting', 'yes'); @@ -475,8 +479,8 @@ $(document).ready(function() { // disable allowUserMounting if(userMountingBackends.length === 0) { - $('#allowUserMounting').prop('checked', false); - $('#allowUserMounting').trigger('change'); + $allowUserMounting.prop('checked', false); + $allowUserMounting.trigger('change'); } }); diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php index 0674d3f6175..7ad93be519a 100644 --- a/apps/files_external/l10n/uk.php +++ b/apps/files_external/l10n/uk.php @@ -8,6 +8,10 @@ $TRANSLATIONS = array( "Host" => "Хост", "Username" => "Ім'я користувача", "Password" => "Пароль", +"OpenStack Object Storage" => "OpenStack Object Storage", +"Region (optional for OpenStack Object Storage)" => "Регіон (опціонально для OpenStack Object Storage)", +"Password (required for OpenStack Object Storage)" => "Пароль (обов’язково для OpenStack Object Storage)", +"Service Name (required for OpenStack Object Storage)" => "Назва сервісу (обов’язково для OpenStack Object Storage)", "Share" => "Поділитися", "URL" => "URL", "Access granted" => "Доступ дозволено", @@ -15,12 +19,16 @@ $TRANSLATIONS = array( "Grant access" => "Дозволити доступ", "Error configuring Google Drive storage" => "Помилка при налаштуванні сховища Google Drive", "Personal" => "Особисте", +"Saved" => "Збереженно", +"You don't have any external storages" => "У вас немає зовнішніх сховищ", "Name" => "Ім'я", +"Storage type" => "Тип сховища", "External Storage" => "Зовнішні сховища", "Folder name" => "Ім'я теки", "Configuration" => "Налаштування", "Add storage" => "Додати сховище", "Delete" => "Видалити", -"Enable User External Storage" => "Активувати користувацькі зовнішні сховища" +"Enable User External Storage" => "Активувати користувацькі зовнішні сховища", +"Allow users to mount the following external storage" => "Дозволити користувачам монтувати наступні зовнішні сховища" ); $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/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index b3036254401..c4b5508692e 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -85,7 +85,7 @@ OCA.Sharing.PublicApp = { }; var img = $('<img class="publicpreview">'); - if (previewSupported === 'true' || mimetype.substr(0, mimetype.indexOf('/')) === 'image') { + if (previewSupported === 'true' || mimetype.substr(0, mimetype.indexOf('/')) === 'image' && mimetype !== 'image/svg+xml') { img.attr('src', OC.filePath('files_sharing', 'ajax', 'publicpreview.php') + '?' + OC.buildQueryString(params)); img.appendTo('#imgframe'); } else if (mimetype.substr(0, mimetype.indexOf('/')) !== 'video') { diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php index d0fb98e4ee2..e087af6b9e3 100644 --- a/apps/files_sharing/l10n/et_EE.php +++ b/apps/files_sharing/l10n/et_EE.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "Server to server sharing is not enabled on this server" => "Serverist serverisse jagamine pole antud serveris lubatud", +"The mountpoint name contains invalid characters." => "Ühenduspunkti nimes on vigaseid märke.", "Invalid or untrusted SSL certificate" => "Vigane või tundmatu SSL sertifikaat", "Couldn't add remote share" => "Ei suutnud lisada kaugjagamist", "Shared with you" => "Sinuga jagatud", diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php index 48297bcf2b3..da1fe1acdd1 100644 --- a/apps/files_sharing/l10n/uk.php +++ b/apps/files_sharing/l10n/uk.php @@ -1,19 +1,40 @@ <?php $TRANSLATIONS = array( +"Server to server sharing is not enabled on this server" => "На даному сервері вимкнута можливість передачі даних між серверами", +"The mountpoint name contains invalid characters." => "Ім'я точки монтування містить неприпустимі символи.", +"Invalid or untrusted SSL certificate" => "Недійсній або не довірений SSL-сертифікат", +"Couldn't add remote share" => "Неможливо додати віддалену загальну теку", +"Shared with you" => "Доступне для вас", +"Shared with others" => "Доступне для інших", +"Shared by link" => "Доступне за посиланням", +"No files have been shared with you yet." => "Доступні для вас файли відсутні.", +"You haven't shared any files yet." => "Ви не маєте загальнодоступних файлів.", +"You haven't shared any files by link yet." => "Ви ще не відкрили доступ за посиланням для жодного з файлів.", +"Do you want to add the remote share {name} from {owner}@{remote}?" => "Додати віддалену загальну теку {name} з {owner}@{remote}?", +"Remote share" => "Віддалена загальна тека", +"Remote share password" => "Пароль для віддаленої загальної теки", "Cancel" => "Відмінити", +"Add remote share" => "Додати віддалену загальну теку", +"No ownCloud installation found at {remote}" => "Не знайдено ownCloud на {remote}", +"Invalid ownCloud url" => "Невірний ownCloud URL", "Shared by" => "Опубліковано", "This share is password-protected" => "Цей ресурс обміну захищений паролем", "The password is wrong. Try again." => "Невірний пароль. Спробуйте ще раз.", "Password" => "Пароль", "Name" => "Ім'я", +"Share time" => "Дата публікації", "Sorry, this link doesn’t seem to work anymore." => "На жаль, посилання більше не працює.", "Reasons might be:" => "Можливі причини:", "the item was removed" => "цей пункт був вилучений", "the link expired" => "посилання застаріло", "sharing is disabled" => "обмін заборонений", "For more info, please ask the person who sent this link." => "Для отримання додаткової інформації, будь ласка, зверніться до особи, яка надіслала це посилання.", +"Add to your ownCloud" => "Додати до вашого ownCloud", "Download" => "Завантажити", "Download %s" => "Завантажити %s", -"Direct link" => "Пряме посилання" +"Direct link" => "Пряме посилання", +"Remote Shares" => "Віддалені загальні теки", +"Allow other instances to mount public links shared from this server" => "Дозволити іншим ownCloud монтувати посилання, опублікованих на цьому сервері", +"Allow users to mount public link shares" => "Дозволити користувачам монтувати монтувати посилання на загальні теки" ); $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/apps/files_sharing/tests/base.php b/apps/files_sharing/tests/base.php index 738ba3493ba..6bc02ec2008 100644 --- a/apps/files_sharing/tests/base.php +++ b/apps/files_sharing/tests/base.php @@ -37,7 +37,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase { const TEST_FILES_SHARING_API_GROUP1 = "test-share-group1"; - public $stateFilesEncryption; + public static $stateFilesEncryption; public $filename; public $data; /** @@ -48,6 +48,13 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase { public $subfolder; public static function setUpBeforeClass() { + + // remember files_encryption state + self::$stateFilesEncryption = \OC_App::isEnabled('files_encryption'); + + //we don't want to tests with app files_encryption enabled + \OC_App::disable('files_encryption'); + // reset backend \OC_User::clearBackends(); \OC_User::useBackend('database'); @@ -70,29 +77,16 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase { function setUp() { + $this->assertFalse(\OC_App::isEnabled('files_encryption')); + //login as user1 self::loginHelper(self::TEST_FILES_SHARING_API_USER1); $this->data = 'foobar'; $this->view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files'); - // remember files_encryption state - $this->stateFilesEncryption = \OC_App::isEnabled('files_encryption'); - - //we don't want to tests with app files_encryption enabled - \OC_App::disable('files_encryption'); - - - $this->assertTrue(!\OC_App::isEnabled('files_encryption')); } function tearDown() { - // reset app files_encryption - if ($this->stateFilesEncryption) { - \OC_App::enable('files_encryption'); - } else { - \OC_App::disable('files_encryption'); - } - $query = \OCP\DB::prepare('DELETE FROM `*PREFIX*share`'); $query->execute(); } @@ -106,6 +100,13 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase { // delete group \OC_Group::deleteGroup(self::TEST_FILES_SHARING_API_GROUP1); + + // reset app files_encryption + if (self::$stateFilesEncryption) { + \OC_App::enable('files_encryption'); + } else { + \OC_App::disable('files_encryption'); + } } /** @@ -126,9 +127,9 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase { } \OC_Util::tearDownFS(); - \OC_User::setUserId(''); + \OC::$server->getUserSession()->setUser(null); \OC\Files\Filesystem::tearDown(); - \OC_User::setUserId($user); + \OC::$server->getUserSession()->login($user, $password); \OC_Util::setupFS($user); } diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index 48d097c3600..e8d268d3df2 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -29,6 +29,16 @@ use OCA\user_ldap\lib\BackendUtility; class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { protected $enabled = false; + /** + * @var string[] $cachedGroupMembers array of users with gid as key + */ + protected $cachedGroupMembers = array(); + + /** + * @var string[] $cachedGroupsByMember array of groups with uid as key + */ + protected $cachedGroupsByMember = array(); + public function __construct(Access $access) { parent::__construct($access); $filter = $this->access->connection->ldapGroupFilter; @@ -56,6 +66,21 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { } $userDN = $this->access->username2dn($uid); + + if(isset($this->cachedGroupMembers[$gid])) { + $isInGroup = in_array($userDN, $this->cachedGroupMembers[$gid]); + return $isInGroup; + } + + $cacheKeyMembers = 'inGroup-members:'.$gid; + if($this->access->connection->isCached($cacheKeyMembers)) { + $members = $this->access->connection->getFromCache($cacheKeyMembers); + $this->cachedGroupMembers[$gid] = $members; + $isInGroup = in_array($userDN, $members); + $this->access->connection->writeToCache($cacheKey, $isInGroup); + return $isInGroup; + } + $groupDN = $this->access->groupname2dn($gid); // just in case if(!$groupDN || !$userDN) { @@ -70,29 +95,44 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { } //usually, LDAP attributes are said to be case insensitive. But there are exceptions of course. - $members = array_keys($this->_groupMembers($groupDN)); - if(!$members) { + $members = $this->_groupMembers($groupDN); + $members = array_keys($members); // uids are returned as keys + if(!is_array($members) || count($members) === 0) { $this->access->connection->writeToCache($cacheKey, false); return false; } //extra work if we don't get back user DNs - //TODO: this can be done with one LDAP query if(strtolower($this->access->connection->ldapGroupMemberAssocAttr) === 'memberuid') { $dns = array(); + $filterParts = array(); + $bytes = 0; foreach($members as $mid) { $filter = str_replace('%uid', $mid, $this->access->connection->ldapLoginFilter); - $ldap_users = $this->access->fetchListOfUsers($filter, 'dn'); - if(count($ldap_users) < 1) { - continue; + $filterParts[] = $filter; + $bytes += strlen($filter); + if($bytes >= 9000000) { + // AD has a default input buffer of 10 MB, we do not want + // to take even the chance to exceed it + $filter = $this->access->combineFilterWithOr($filterParts); + $bytes = 0; + $filterParts = array(); + $users = $this->access->fetchListOfUsers($filter, 'dn', count($filterParts)); + $dns = array_merge($dns, $users); } - $dns[] = $ldap_users[0]; + } + if(count($filterParts) > 0) { + $filter = $this->access->combineFilterWithOr($filterParts); + $users = $this->access->fetchListOfUsers($filter, 'dn', count($filterParts)); + $dns = array_merge($dns, $users); } $members = $dns; } $isInGroup = in_array($userDN, $members); $this->access->connection->writeToCache($cacheKey, $isInGroup); + $this->access->connection->writeToCache($cacheKeyMembers, $members); + $this->cachedGroupMembers[$gid] = $members; return $isInGroup; } @@ -293,8 +333,13 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface { $uid = $userDN; } - $groups = array_values($this->getGroupsByMember($uid)); - $groups = $this->access->ownCloudGroupNames($groups); + if(isset($this->cachedGroupsByMember[$uid])) { + $groups = $this->cachedGroupsByMember[$uid]; + } else { + $groups = array_values($this->getGroupsByMember($uid)); + $groups = $this->access->ownCloudGroupNames($groups); + $this->cachedGroupsByMember[$uid] = $groups; + } $primaryGroup = $this->getUserPrimaryGroup($userDN); if($primaryGroup !== false) { diff --git a/apps/user_ldap/l10n/bg_BG.php b/apps/user_ldap/l10n/bg_BG.php index dfd9db5438b..9873a7d1f5c 100644 --- a/apps/user_ldap/l10n/bg_BG.php +++ b/apps/user_ldap/l10n/bg_BG.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "Edit raw filter instead" => "Промени raw филтъра", "Raw LDAP filter" => "Raw LDAP филтър", "The filter specifies which LDAP groups shall have access to the %s instance." => "Филтърът посочва кои LDAP групи ще имат достъп до %s инсталацията.", +"Test Filter" => "Тестов Филтър", "groups found" => "открити групи", "Users login with this attribute:" => "Потребителски профили с този атрибут:", "LDAP Username:" => "LDAP Потребителско Име:", @@ -66,9 +67,12 @@ $TRANSLATIONS = array( "For anonymous access, leave DN and Password empty." => "За анонимен достъп, остави DN и Парола празни.", "One Base DN per line" => "По един Base DN на ред", "You can specify Base DN for users and groups in the Advanced tab" => "Можеш да настроиш Base DN за отделни потребители и групи в разделителя Допълнителни.", +"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Избягва автоматични LDAP заявки. По-добра опция за големи инсталации, но изисква LDAP познания.", +"Manually enter LDAP filters (recommended for large directories)" => "Ръчно въвеждана на LDAP филтри(препоръчано за по-големи папки)", "Limit %s access to users meeting these criteria:" => "Ограничи достъпа на %s до потребители покриващи следните критерии:", "The filter specifies which LDAP users shall have access to the %s instance." => "Филтърът посочва кои LDAP потребители ще имат достъп до %s инсталацията.", "users found" => "открити потребители", +"Saving" => "Записване", "Back" => "Назад", "Continue" => "Продължи", "Expert" => "Експерт", diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php index e3b76799fb1..03e3ac578c3 100644 --- a/apps/user_ldap/l10n/cs_CZ.php +++ b/apps/user_ldap/l10n/cs_CZ.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "Edit raw filter instead" => "Edituj filtr přímo", "Raw LDAP filter" => "Původní filtr LDAP", "The filter specifies which LDAP groups shall have access to the %s instance." => "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.", +"Test Filter" => "Otestovat filtr", "groups found" => "nalezené skupiny", "Users login with this attribute:" => "Uživatelé se přihlašují s tímto atributem:", "LDAP Username:" => "LDAP uživatelské jméno:", @@ -66,9 +67,12 @@ $TRANSLATIONS = array( "For anonymous access, leave DN and Password empty." => "Pro anonymní přístup ponechte údaje DN and heslo prázdné.", "One Base DN per line" => "Jedna základní DN na řádku", "You can specify Base DN for users and groups in the Advanced tab" => "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny", +"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Zabraňuje automatickým LDAP požadavkům. Výhodné pro objemná nastavení, ale vyžaduje znalosti o LDAP.", +"Manually enter LDAP filters (recommended for large directories)" => "Ručně vložit LDAP filtry (doporučené pro obsáhlé adresáře)", "Limit %s access to users meeting these criteria:" => "Omezit přístup %s uživatelům splňujícím tyto podmínky:", "The filter specifies which LDAP users shall have access to the %s instance." => "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.", "users found" => "nalezení uživatelé", +"Saving" => "Ukládá se", "Back" => "Zpět", "Continue" => "Pokračovat", "Expert" => "Expertní", diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php index 31dbd08d1b3..d76395ab3ba 100644 --- a/apps/user_ldap/l10n/da.php +++ b/apps/user_ldap/l10n/da.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "Edit raw filter instead" => "Redigér det rå filter i stedet", "Raw LDAP filter" => "Råt LDAP-filter", "The filter specifies which LDAP groups shall have access to the %s instance." => "Filteret angiver hvilke LDAP-grupper, der skal have adgang til instansen %s.", +"Test Filter" => "Testfilter", "groups found" => "grupper blev fundet", "Users login with this attribute:" => "Brugeres login med dette attribut:", "LDAP Username:" => "LDAP-brugernavn:", @@ -66,9 +67,12 @@ $TRANSLATIONS = array( "For anonymous access, leave DN and Password empty." => "For anonym adgang, skal du lade DN og Adgangskode tomme.", "One Base DN per line" => "Ét Base DN per linje", "You can specify Base DN for users and groups in the Advanced tab" => "You can specify Base DN for users and groups in the Advanced tab", +"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Undgår automatiske LDAP-forespørgsler. Bedre på større opsætninger, men kræver en del LDAP-kendskab.", +"Manually enter LDAP filters (recommended for large directories)" => "Angiv LDAP-filtre manuelt (anbefales til større kataloger)", "Limit %s access to users meeting these criteria:" => "Begræns %s-adgangen til brugere som imødekommer disse kriterier:", "The filter specifies which LDAP users shall have access to the %s instance." => "Filteret angiver hvilke LDAP-brugere, der skal have adgang til %s-instansen.", "users found" => "brugere blev fundet", +"Saving" => "Gemmer", "Back" => "Tilbage", "Continue" => "Videre", "Expert" => "Ekspert", diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php index fec908a8d48..e2915b85425 100644 --- a/apps/user_ldap/l10n/de.php +++ b/apps/user_ldap/l10n/de.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "Edit raw filter instead" => "Original-Filter stattdessen bearbeiten", "Raw LDAP filter" => "Original LDAP-Filter", "The filter specifies which LDAP groups shall have access to the %s instance." => "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.", +"Test Filter" => "Test-Filter", "groups found" => "Gruppen gefunden", "Users login with this attribute:" => "Nutzeranmeldung mit diesem Merkmal:", "LDAP Username:" => "LDAP-Benutzername:", @@ -66,9 +67,12 @@ $TRANSLATIONS = array( "For anonymous access, leave DN and Password empty." => "Lasse die Felder DN und Passwort für anonymen Zugang leer.", "One Base DN per line" => "Ein Basis-DN pro Zeile", "You can specify Base DN for users and groups in the Advanced tab" => "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren", +"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Verhindert automatische LDAP-Anfragen. Besser für größere Installationen, benötigt aber einiges an LDAP-Wissen.", +"Manually enter LDAP filters (recommended for large directories)" => "LDAP-Filter manuell eingeben (erforderlich für große Verzeichnisse)", "Limit %s access to users meeting these criteria:" => "Beschränken Sie den %s Zugriff auf die Benutzer-Sitzungen durch folgende Kriterien:", "The filter specifies which LDAP users shall have access to the %s instance." => "Der Filter definiert welche LDAP-Benutzer Zugriff auf die %s Instanz haben sollen.", "users found" => "Benutzer gefunden", +"Saving" => "Speichern", "Back" => "Zurück", "Continue" => "Fortsetzen", "Expert" => "Experte", diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php index 118f482014f..ed1755d54a0 100644 --- a/apps/user_ldap/l10n/de_DE.php +++ b/apps/user_ldap/l10n/de_DE.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "Edit raw filter instead" => "Original-Filter stattdessen bearbeiten", "Raw LDAP filter" => "Original LDAP-Filter", "The filter specifies which LDAP groups shall have access to the %s instance." => "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.", +"Test Filter" => "Test-Filter", "groups found" => "Gruppen gefunden", "Users login with this attribute:" => "Nutzeranmeldung mit diesem Merkmal:", "LDAP Username:" => "LDAP-Benutzername:", @@ -66,9 +67,12 @@ $TRANSLATIONS = array( "For anonymous access, leave DN and Password empty." => "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.", "One Base DN per line" => "Ein Basis-DN pro Zeile", "You can specify Base DN for users and groups in the Advanced tab" => "Sie können Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren", +"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Verhindert automatische LDAP-Anfragen. Besser für größere Installationen, benötigt aber einiges an LDAP-Wissen.", +"Manually enter LDAP filters (recommended for large directories)" => "LDAP-Filter manuell eingeben (erforderlich für große Verzeichnisse)", "Limit %s access to users meeting these criteria:" => "Beschränken Sie den %s Zugriff auf die Benutzer-Sitzungen durch folgende Kriterien:", "The filter specifies which LDAP users shall have access to the %s instance." => "Der Filter definiert welche LDAP-Benutzer Zugriff auf die %s Instanz haben sollen.", "users found" => "Benutzer gefunden", +"Saving" => "Speichern", "Back" => "Zurück", "Continue" => "Fortsetzen", "Expert" => "Experte", diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php index f58efd3a4d9..f85c1a67283 100644 --- a/apps/user_ldap/l10n/es.php +++ b/apps/user_ldap/l10n/es.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "Edit raw filter instead" => "Editar el filtro en bruto en su lugar", "Raw LDAP filter" => "Filtro LDAP en bruto", "The filter specifies which LDAP groups shall have access to the %s instance." => "El filtro especifica que grupos LDAP tendrán acceso a %s.", +"Test Filter" => "Filtro de prueba", "groups found" => "grupos encontrados", "Users login with this attribute:" => "Los usuarios inician sesión con este atributo:", "LDAP Username:" => "Nombre de usuario LDAP:", @@ -66,9 +67,12 @@ $TRANSLATIONS = array( "For anonymous access, leave DN and Password empty." => "Para acceso anónimo, deje DN y contraseña vacíos.", "One Base DN per line" => "Un DN Base por línea", "You can specify Base DN for users and groups in the Advanced tab" => "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado", +"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Evita peticiones automaticas al LDAP. Mejor para grandes configuraciones, pero requiere algun conocimiento de LDAP", +"Manually enter LDAP filters (recommended for large directories)" => "Ingrese manualmente los filtros LDAP (Recomendado para grandes directorios)", "Limit %s access to users meeting these criteria:" => "Limitar el acceso a %s a los usuarios que cumplan estos criterios:", "The filter specifies which LDAP users shall have access to the %s instance." => "El filtro especifica que usuarios LDAP pueden tener acceso a %s.", "users found" => "usuarios encontrados", +"Saving" => "Guardando", "Back" => "Atrás", "Continue" => "Continuar", "Expert" => "Experto", diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php index 394bcd19289..feeef699fac 100644 --- a/apps/user_ldap/l10n/et_EE.php +++ b/apps/user_ldap/l10n/et_EE.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "Edit raw filter instead" => "Selle asemel muuda filtrit", "Raw LDAP filter" => "LDAP filter", "The filter specifies which LDAP groups shall have access to the %s instance." => "Filter määrab millised LDAP grupid saavad ligipääsu sellele %s instantsile.", +"Test Filter" => "Testi filtrit", "groups found" => "gruppi leitud", "Users login with this attribute:" => "Logimiseks kasutatkse atribuuti: ", "LDAP Username:" => "LDAP kasutajanimi:", @@ -66,9 +67,12 @@ $TRANSLATIONS = array( "For anonymous access, leave DN and Password empty." => "Anonüümseks ligipääsuks jäta DN ja parool tühjaks.", "One Base DN per line" => "Üks baas-DN rea kohta", "You can specify Base DN for users and groups in the Advanced tab" => "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaardilt", +"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Väldib automaatseid LDAP päringuid, Parem suurematele saitidele, aga nõuab mõningaid teadmisi LDAP kohta.", +"Manually enter LDAP filters (recommended for large directories)" => "Sisesta LDAP filtrid automaatselt (sooitatav suurtele kataloogidele)", "Limit %s access to users meeting these criteria:" => "Piira %s liigpääs kriteeriumiga sobivatele kasutajatele:", "The filter specifies which LDAP users shall have access to the %s instance." => "Filter määrab millised LDAP kasutajad pääsevad ligi %s instantsile.", "users found" => "kasutajat leitud", +"Saving" => "Salvestamine", "Back" => "Tagasi", "Continue" => "Jätka", "Expert" => "Ekspert", diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php index 2fedc2a9460..8768c6e989f 100644 --- a/apps/user_ldap/l10n/fi_FI.php +++ b/apps/user_ldap/l10n/fi_FI.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "Advanced" => "Lisäasetukset", "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varoitus:</b> PHP:n LDAP-moduulia ei ole asennettu, taustaosa ei toimi. Pyydä järjestelmän ylläpitäjää asentamaan se.", "Connection Settings" => "Yhteysasetukset", +"Backup (Replica) Host" => "Varmuuskopioinnin (replikointi) palvelin", "Backup (Replica) Port" => "Varmuuskopioinnin (replikoinnin) portti", "Disable Main Server" => "Poista pääpalvelin käytöstä", "Only connect to the replica server." => "Yhdistä vain replikointipalvelimeen.", @@ -57,8 +58,12 @@ $TRANSLATIONS = array( "Group Display Name Field" => "Ryhmän \"näytettävä nimi\"-kenttä", "Base Group Tree" => "Ryhmien juuri", "Group-Member association" => "Ryhmän ja jäsenen assosiaatio (yhteys)", +"Quota Field" => "Kiintiökenttä", +"Quota Default" => "Oletuskiintiö", "in bytes" => "tavuissa", "Email Field" => "Sähköpostikenttä", -"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti." +"User Home Folder Naming Rule" => "Käyttäjän kotihakemiston nimeämissääntö", +"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti.", +"Internal Username" => "Sisäinen käyttäjänimi" ); $PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php index 7083cbb2906..8d515fe5a15 100644 --- a/apps/user_ldap/l10n/fr.php +++ b/apps/user_ldap/l10n/fr.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "Edit raw filter instead" => "Éditer le filtre raw à la place", "Raw LDAP filter" => "Filtre Raw LDAP", "The filter specifies which LDAP groups shall have access to the %s instance." => "Le filtre spécifie quels groupes LDAP doivent avoir accès à l'instance %s.", +"Test Filter" => "Filtre de test", "groups found" => "groupes trouvés", "Users login with this attribute:" => "Utilisateurs se connectant avec cet attribut :", "LDAP Username:" => "Nom d'utilisateur LDAP :", @@ -66,9 +67,12 @@ $TRANSLATIONS = array( "For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.", "One Base DN per line" => "Un DN racine par ligne", "You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé", +"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Évite les requêtes LDAP automatiques. Mieux pour les grosses installations, mais demande des connaissances en LDAP.", +"Manually enter LDAP filters (recommended for large directories)" => "Entrée manuelle des filtres LDAP (recommandé pour les gros dossiers)", "Limit %s access to users meeting these criteria:" => "Limiter l'accès à %s aux utilisateurs respectant ces critères :", "The filter specifies which LDAP users shall have access to the %s instance." => "Le filtre spécifie quels utilisateurs LDAP doivent avoir accès à l'instance %s.", "users found" => "utilisateurs trouvés", +"Saving" => "Enregistrement...", "Back" => "Retour", "Continue" => "Poursuivre", "Expert" => "Expert", diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php index ef88ea765d8..34e93fd778e 100644 --- a/apps/user_ldap/l10n/it.php +++ b/apps/user_ldap/l10n/it.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "Edit raw filter instead" => "Modifica invece il filtro grezzo", "Raw LDAP filter" => "Filtro LDAP grezzo", "The filter specifies which LDAP groups shall have access to the %s instance." => "Il filtro specifica quali gruppi LDAP devono avere accesso all'istanza %s.", +"Test Filter" => "Prova filtro", "groups found" => "gruppi trovati", "Users login with this attribute:" => "Utenti con questo attributo:", "LDAP Username:" => "Nome utente LDAP:", @@ -66,9 +67,12 @@ $TRANSLATIONS = array( "For anonymous access, leave DN and Password empty." => "Per l'accesso anonimo, lasciare vuoti i campi DN e Password", "One Base DN per line" => "Un DN base per riga", "You can specify Base DN for users and groups in the Advanced tab" => "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate", +"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Impedisce le richieste LDAP automatiche. Meglio per installazioni più grandi, ma richiede una certa conoscenza di LDAP.", +"Manually enter LDAP filters (recommended for large directories)" => "Digita manualmente i filtri LDAP (consigliato per directory grandi)", "Limit %s access to users meeting these criteria:" => "Limita l'accesso a %s ai gruppi che verificano questi criteri:", "The filter specifies which LDAP users shall have access to the %s instance." => "Il filtro specifica quali utenti LDAP devono avere accesso all'istanza %s.", "users found" => "utenti trovati", +"Saving" => "Salvataggio", "Back" => "Indietro", "Continue" => "Continua", "Expert" => "Esperto", diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php index 5fbdfb39c50..ccf109d4d48 100644 --- a/apps/user_ldap/l10n/nl.php +++ b/apps/user_ldap/l10n/nl.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "Edit raw filter instead" => "Bewerk raw filter", "Raw LDAP filter" => "Raw LDAP filter", "The filter specifies which LDAP groups shall have access to the %s instance." => "Dit filter geeft aan welke LDAP groepen toegang hebben tot %s.", +"Test Filter" => "Testfilter", "groups found" => "groepen gevonden", "Users login with this attribute:" => "Gebruikers loggen in met dit attribuut:", "LDAP Username:" => "LDAP Username:", @@ -66,9 +67,12 @@ $TRANSLATIONS = array( "For anonymous access, leave DN and Password empty." => "Voor anonieme toegang, laat de DN en het wachtwoord leeg.", "One Base DN per line" => "Een Base DN per regel", "You can specify Base DN for users and groups in the Advanced tab" => "Je kunt het Base DN voor gebruikers en groepen specificeren in het tab Geavanceerd.", +"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Voorkom automatische LDAP opvragingen. Weliswaar beter voor grote installaties, maar vergt LDAP kennis.", +"Manually enter LDAP filters (recommended for large directories)" => "Handmatig invoeren LDAP filters (aanbevolen voor grote directories)", "Limit %s access to users meeting these criteria:" => "Beperk %s toegang tot gebruikers die voldoen aan deze criteria:", "The filter specifies which LDAP users shall have access to the %s instance." => "Dit filter geeft aan welke LDAP gebruikers toegang hebben tot %s.", "users found" => "gebruikers gevonden", +"Saving" => "Opslaan", "Back" => "Terug", "Continue" => "Verder", "Expert" => "Expert", diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php index 6e5a1663e2d..870cc7ebca9 100644 --- a/apps/user_ldap/l10n/pt_BR.php +++ b/apps/user_ldap/l10n/pt_BR.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "Edit raw filter instead" => "Editar filtro raw ao invéz", "Raw LDAP filter" => "Filtro LDAP Raw", "The filter specifies which LDAP groups shall have access to the %s instance." => "O filtro especifica quais grupos LDAP devem ter acesso à instância do %s.", +"Test Filter" => "Filtro Teste", "groups found" => "grupos encontrados", "Users login with this attribute:" => "Usuários entrar com este atributo:", "LDAP Username:" => "Usuário LDAP:", @@ -66,9 +67,12 @@ $TRANSLATIONS = array( "For anonymous access, leave DN and Password empty." => "Para acesso anônimo, deixe DN e Senha vazios.", "One Base DN per line" => "Uma base DN por linha", "You can specify Base DN for users and groups in the Advanced tab" => "Você pode especificar DN Base para usuários e grupos na guia Avançada", +"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Evita pedidos LDAP automáticos. Melhor para configurações maiores, mas requer algum conhecimento LDAP.", +"Manually enter LDAP filters (recommended for large directories)" => "Inserir manualmente filtros LDAP (recomendado para grandes diretórios)", "Limit %s access to users meeting these criteria:" => "Limitar o acesso %s para usuários que satisfazem esses critérios:", "The filter specifies which LDAP users shall have access to the %s instance." => "O filtro especifica quais usuários LDAP devem ter acesso à instância do %s.", "users found" => "usuários encontrados", +"Saving" => "Salvando", "Back" => "Voltar", "Continue" => "Continuar", "Expert" => "Especialista", diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php index 4a10b141dbc..3527870032b 100644 --- a/apps/user_ldap/l10n/tr.php +++ b/apps/user_ldap/l10n/tr.php @@ -47,6 +47,7 @@ $TRANSLATIONS = array( "Edit raw filter instead" => "Bunun yerine ham filtreyi düzenle", "Raw LDAP filter" => "Ham LDAP filtresi", "The filter specifies which LDAP groups shall have access to the %s instance." => "Filtre, %s örneğine erişmesi gereken LDAP gruplarını belirtir.", +"Test Filter" => "Filtreyi Test Et", "groups found" => "grup bulundu", "Users login with this attribute:" => "Kullanıcılar şu öznitelikle oturum açarlar:", "LDAP Username:" => "LDAP Kullanıcı Adı:", @@ -66,9 +67,12 @@ $TRANSLATIONS = array( "For anonymous access, leave DN and Password empty." => "Anonim erişim için DN ve Parola alanlarını boş bırakın.", "One Base DN per line" => "Her satırda tek bir Base DN", "You can specify Base DN for users and groups in the Advanced tab" => "Gelişmiş sekmesinde, kullanıcılar ve gruplar için Base DN belirtebilirsiniz", +"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Otomatik LDAP isteklerinden kaçın. Büyük kurulumlar için daha iyi ancak LDAP bilgisi gerektirir.", +"Manually enter LDAP filters (recommended for large directories)" => "LDAP filtrelerini el ile girin (büyük dizinler için önerilir)", "Limit %s access to users meeting these criteria:" => "%s erişimini, şu kriterlerle eşleşen kullanıcılara sınırla:", "The filter specifies which LDAP users shall have access to the %s instance." => "Filtre, %s örneğine erişmesi gereken LDAP kullanıcılarını belirtir.", "users found" => "kullanıcı bulundu", +"Saving" => "Kaydediliyor", "Back" => "Geri", "Continue" => "Devam et", "Expert" => "Uzman", diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php index 19d37a282b7..7259fc8ba13 100644 --- a/apps/user_ldap/l10n/uk.php +++ b/apps/user_ldap/l10n/uk.php @@ -1,26 +1,63 @@ <?php $TRANSLATIONS = array( +"Failed to clear the mappings." => "Не вдалося очистити відображення.", "Failed to delete the server configuration" => "Не вдалося видалити конфігурацію сервера", "The configuration is valid and the connection could be established!" => "Конфігурація вірна і зв'язок може бути встановлений !", "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Конфігурація вірна, але встановити зв'язок не вдалося. Будь ласка, перевірте налаштування сервера і облікові дані.", +"The configuration is invalid. Please have a look at the logs for further details." => "Конфігурація є недійсною. Будь ласка, дивіться журнали для отримання додаткової інформації.", +"No action specified" => "Ніяких дій не вказано", +"No configuration specified" => "Немає конфігурації", +"No data specified" => "Немає даних", +" Could not set configuration %s" => "Не вдалося встановити конфігурацію %s", "Deletion failed" => "Видалення не було виконано", "Take over settings from recent server configuration?" => "Застосувати налаштування з останньої конфігурації сервера ?", "Keep settings?" => "Зберегти налаштування ?", +"{nthServer}. Server" => "{nthServer}. Сервер", "Cannot add server configuration" => "Неможливо додати конфігурацію сервера", +"mappings cleared" => "відображення очищається", "Success" => "Успіх", "Error" => "Помилка", +"Please specify a Base DN" => "Введіть Base DN", +"Could not determine Base DN" => "Не вдалося визначити Base DN", +"Please specify the port" => "Будь ласка, вкажіть порт", +"Configuration OK" => "Конфігурація OK", +"Configuration incorrect" => "Невірна конфігурація", +"Configuration incomplete" => "Конфігурація неповна", "Select groups" => "Оберіть групи", +"Select object classes" => "Виберіть класи об'єктів", +"Select attributes" => "Виберіть атрибути", "Connection test succeeded" => "Перевірка з'єднання пройшла успішно", "Connection test failed" => "Перевірка з'єднання завершилась неуспішно", "Do you really want to delete the current Server Configuration?" => "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?", "Confirm Deletion" => "Підтвердіть Видалення", -"_%s group found_::_%s groups found_" => array("","",""), -"_%s user found_::_%s users found_" => array("","",""), +"_%s group found_::_%s groups found_" => array(" %s група знайдена "," %s груп знайдено ","%s груп знайдено "), +"_%s user found_::_%s users found_" => array("%s користувач знайден","%s користувачів знайдено","%s користувачів знайдено"), +"Could not find the desired feature" => "Не вдалося знайти потрібну функцію", +"Invalid Host" => "Невірний Host", +"Server" => "Сервер", +"User Filter" => "Користувацький Фільтр", +"Login Filter" => "Фільтр Входу", "Group Filter" => "Фільтр Груп", "Save" => "Зберегти", "Test Configuration" => "Тестове налаштування", "Help" => "Допомога", +"Groups meeting these criteria are available in %s:" => "Групи, що відповідають цим критеріям доступні в %s:", +"only those object classes:" => "тільки ці об'єктні класи:", +"only from those groups:" => "тільки з цих груп:", +"Edit raw filter instead" => "Редагувати початковий фільтр", +"Raw LDAP filter" => "Початковий LDAP фільтр", +"The filter specifies which LDAP groups shall have access to the %s instance." => "Фільтр визначає, які LDAP групи повинні мати доступ до %s примірника.", +"Test Filter" => "Тест Фільтр", +"groups found" => "знайдені групи", +"Users login with this attribute:" => "Вхід користувачів з цим атрибутом:", +"LDAP Username:" => "LDAP Ім’я користувача:", +"LDAP Email Address:" => "LDAP E-mail адрес:", +"Other Attributes:" => "Інші Атрібути:", +"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Визначає фільтр, який слід застосовувати при спробі входу.\n%%uid замінює ім'я користувача при вході в систему. Приклад: \"uid=%%uid\"", +"1. Server" => "1. Сервер", +"%s. Server:" => "%s. Сервер:", "Add Server Configuration" => "Додати налаштування Сервера", +"Delete Configuration" => "Видалити Конфігурацію", "Host" => "Хост", "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://", "Port" => "Порт", @@ -30,9 +67,17 @@ $TRANSLATIONS = array( "For anonymous access, leave DN and Password empty." => "Для анонімного доступу, залиште DN і Пароль порожніми.", "One Base DN per line" => "Один Base DN на одній строчці", "You can specify Base DN for users and groups in the Advanced tab" => "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково", +"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Уникати автоматичні запити LDAP. Краще для великих установок, але вимагає деякого LDAP знання.", +"Manually enter LDAP filters (recommended for large directories)" => "Вручну введіть LDAP фільтри (рекомендується для великих каталогів)", +"Limit %s access to users meeting these criteria:" => "Обмежити %s доступ до користувачів, що відповідають цим критеріям:", +"The filter specifies which LDAP users shall have access to the %s instance." => "Фільтр визначає, які користувачі LDAP повині мати доступ до примірника %s.", +"users found" => "користувачів знайдено", +"Saving" => "Збереження", "Back" => "Назад", "Continue" => "Продовжити", +"Expert" => "Експерт", "Advanced" => "Додатково", +"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Попередження:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них.", "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Увага:</ b> Потрібний модуль PHP LDAP не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його.", "Connection Settings" => "Налаштування З'єднання", "Configuration Active" => "Налаштування Активне", @@ -41,26 +86,46 @@ $TRANSLATIONS = array( "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Вкажіть додатковий резервний сервер. Він повинен бути копією головного LDAP/AD сервера.", "Backup (Replica) Port" => "Порт сервера для резервних копій", "Disable Main Server" => "Вимкнути Головний Сервер", +"Only connect to the replica server." => "Підключити тільки до сервера реплік.", +"Case insensitive LDAP server (Windows)" => "Без урахування регістра LDAP сервер (Windows)", "Turn off SSL certificate validation." => "Вимкнути перевірку SSL сертифіката.", +"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Не рекомендується, використовувати його тільки для тестування!\nЯкщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший %s сервер.", "Cache Time-To-Live" => "Час актуальності Кеша", "in seconds. A change empties the cache." => "в секундах. Зміна очищує кеш.", "Directory Settings" => "Налаштування Каталога", "User Display Name Field" => "Поле, яке відображає Ім'я Користувача", +"The LDAP attribute to use to generate the user's display name." => "Атрибут LDAP, який використовується для генерації імен користувачів.", "Base User Tree" => "Основне Дерево Користувачів", "One User Base DN per line" => "Один Користувач Base DN на одній строчці", "User Search Attributes" => "Пошукові Атрибути Користувача", "Optional; one attribute per line" => "Додатково; один атрибут на строчку", "Group Display Name Field" => "Поле, яке відображає Ім'я Групи", +"The LDAP attribute to use to generate the groups's display name." => "Атрибут LDAP, який використовується для генерації імен груп.", "Base Group Tree" => "Основне Дерево Груп", "One Group Base DN per line" => "Одна Група Base DN на одній строчці", "Group Search Attributes" => "Пошукові Атрибути Групи", "Group-Member association" => "Асоціація Група-Член", +"Nested Groups" => "Вкладені Групи", +"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "При включенні, групи, які містять групи підтримуються. (Працює тільки якщо атрибут члена групи містить DNS.)", +"Paging chunksize" => "Розмір підкачки", +"Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" => "Підкачка використовується для сторінкових пошуків LDAP, які можуть повертати громіздкі результати кількісті користувачів або груп. (Установка його 0 відключає вивантаженя пошуку LDAP в таких ситуаціях.)", "Special Attributes" => "Спеціальні Атрибути", "Quota Field" => "Поле Квоти", "Quota Default" => "Квота за замовчанням", "in bytes" => "в байтах", "Email Field" => "Поле Ел. пошти", "User Home Folder Naming Rule" => "Правило іменування домашньої теки користувача", -"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD." +"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD.", +"Internal Username" => "Внутрішня Ім'я користувача", +"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "За замовчуванням внутрішнє ім'я користувача буде створено з атрибуту UUID. Таким чином ім'я користувача є унікальним і не потребує перетворення символів. Внутрішнє ім'я користувача може складатися лише з наступних символів: [A-Za-z0-9 _ @ -.]. Інші символи заміняються відповідними з таблиці ASCII або пропускаються. При збігу до імені буде додано або збільшено число. Внутрішнє ім'я користувача використовується для внутрішньої ідентифікації користувача. Це також ім'я за замовчуванням для домашньої теки користувача та частина віддалених URL, наприклад, для всіх сервісів *DAV. За допомогою цієї установки можна змінити поведінку за замовчуванням. Для досягнення поведінки, що була до OwnCloud 5, введіть атрибут ім'я користувача, що відображається, в наступне поле. Залиште порожнім для режиму за замовчуванням. Зміни будуть діяти тільки для нових підключень (доданих) користувачів LDAP.", +"Internal Username Attribute:" => "Внутрішня Ім'я користувача, Атрибут:", +"Override UUID detection" => "Перекрити вивід UUID ", +"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "За замовчуванням ownCloud визначає атрибут UUID автоматично. Цей атрибут використовується для того, щоб достовірно ідентифікувати користувачів і групи LDAP. Також на підставі атрибута UUID створюється внутрішнє ім'я користувача, якщо вище не вказано інакше. Ви можете перевизначити це налаштування та вказати свій атрибут за вибором. Ви повинні упевнитися, що обраний вами атрибут може бути вибраний для користувачів і груп, а також те, що він унікальний. Залиште поле порожнім для поведінки за замовчуванням. Зміни вступлять в силу тільки для нових підключених (доданих) користувачів і груп LDAP.", +"UUID Attribute for Users:" => "UUID Атрибут для користувачів:", +"UUID Attribute for Groups:" => "UUID Атрибут для груп:", +"Username-LDAP User Mapping" => "Картографія Імен користувачів-LDAP ", +"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ownCloud використовує імена користувачів для зберігання і призначення метаданих. Для точної ідентифікації і розпізнавання користувачів, кожен користувач LDAP буде мати своє внутрішнє ім'я користувача. Це вимагає прив'язки імені користувача ownCloud до користувача LDAP. При створенні ім'я користувача призначається ідентифікатору UUID користувача LDAP. Крім цього кешується розрізнювальне ім'я (DN) для зменшення числа звернень до LDAP, однак воно не використовується для ідентифікації. Якщо розрізнювальне ім'я було змінене, про це стане відомо ownCloud. Внутрішнє ім'я ownCloud використовується скрізь в ownCloud. Після скидання прив'язок в базі можуть зберегтися залишки старої інформації. Скидання прив'язок не прив'язано до конфігурації, він вплине на всі LDAP-підключення! Ні в якому разі не рекомендується скидати прив'язки, якщо система вже знаходиться в експлуатації, тільки на етапі тестування.", +"Clear Username-LDAP User Mapping" => "Очистити картографію Імен користувачів-LDAP", +"Clear Groupname-LDAP Group Mapping" => "Очистити картографію Імен груп-LDAP" ); $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/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 159b0d73000..44162e32d47 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -1359,7 +1359,7 @@ class Access extends LDAPUtility implements user\IUserTools { * @param string[] $bases array containing the allowed base DN or DNs * @return bool */ - private function isDNPartOfBase($dn, $bases) { + public function isDNPartOfBase($dn, $bases) { $belongsToBase = false; $bases = $this->sanitizeDN($bases); diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php index c4aed25a1cc..d1262e4f5b8 100644 --- a/apps/user_ldap/tests/group_ldap.php +++ b/apps/user_ldap/tests/group_ldap.php @@ -59,10 +59,7 @@ class Test_Group_Ldap extends \PHPUnit_Framework_TestCase { private function enableGroups($access) { $access->connection->expects($this->any()) ->method('__get') - ->will($this->returnCallback(function($name) { -// if($name === 'ldapLoginFilter') { -// return '%uid'; -// } + ->will($this->returnCallback(function() { return 1; })); } @@ -269,4 +266,32 @@ class Test_Group_Ldap extends \PHPUnit_Framework_TestCase { $this->assertSame(false, $gid); } + /** + * tests whether Group Backend behaves correctly when cache with uid and gid + * is hit + */ + public function testInGroupHitsUidGidCache() { + $access = $this->getAccessMock(); + $this->enableGroups($access); + + $uid = 'someUser'; + $gid = 'someGroup'; + $cacheKey = 'inGroup'.$uid.':'.$gid; + $access->connection->expects($this->once()) + ->method('isCached') + ->with($cacheKey) + ->will($this->returnValue(true)); + + $access->connection->expects($this->once()) + ->method('getFromCache') + ->with($cacheKey) + ->will($this->returnValue(true)); + + $access->expects($this->never()) + ->method('username2dn'); + + $groupBackend = new GroupLDAP($access); + $groupBackend->inGroup($uid, $gid); + } + } diff --git a/apps/user_webdavauth/l10n/uk.php b/apps/user_webdavauth/l10n/uk.php index b548b01951b..1b1463e5b75 100644 --- a/apps/user_webdavauth/l10n/uk.php +++ b/apps/user_webdavauth/l10n/uk.php @@ -1,6 +1,7 @@ <?php $TRANSLATIONS = array( "WebDAV Authentication" => "Аутентифікація WebDAV", +"Address:" => "Адреси:", "Save" => "Зберегти", "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Облікові дані користувача буде надіслано на цю адресу. Цей плагін перевіряє відповідь і буде інтерпретувати коди статусу HTTP 401 і 403, як неправильні облікові дані, а всі інші відповіді, вважатимуться правильними." ); diff --git a/config/config.sample.php b/config/config.sample.php index 597f01c802c..621e5df80b3 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -6,7 +6,7 @@ * * DO NOT COMPLETELY BASE YOUR CONFIGURATION FILE ON THIS SAMPLE. THIS MAY BREAK * YOUR INSTANCE. Instead, manually copy configuration switches that you - * consider important for your instance to your working ``config.php``, and + * consider important for your instance to your working ``config.php``, and * apply configuration options that are pertinent for your instance. * * This file is used to generate the config documentation. Please consider @@ -45,6 +45,7 @@ $CONFIG = array( * * 'instanceid' => 'd3c944a9a', */ +'instanceid' => '', /** * The salt used to hash all passwords, auto-generated by the ownCloud @@ -54,13 +55,14 @@ $CONFIG = array( * *'passwordsalt' => 'd3c944a9af095aa08f', */ +'passwordsalt' => '', /** * Your list of trusted domains that users can log into. Specifying trusted * domains prevents host header poisoning. Do not remove this, as it performs * necessary security checks. */ -'trusted_domains' => +'trusted_domains' => array ( 'demo.example.org', 'otherdomain.example.org:8080', @@ -549,10 +551,12 @@ $CONFIG = array( /** * By default, ownCloud can generate previews for the following filetypes: - * Images files - * Covers of MP3 files - * Text documents - * Valid values are ``true``, to enable previews, or + * + * - Images files + * - Covers of MP3 files + * - Text documents + * + * Valid values are ``true``, to enable previews, or * ``false``, to disable previews */ 'enable_previews' => true, @@ -665,7 +669,7 @@ $CONFIG = array( */ /** - * Blacklist a specific file or files and disallow the upload of files + * Blacklist a specific file or files and disallow the upload of files * with this name. ``.htaccess`` is blocked by default. * WARNING: USE THIS ONLY IF YOU KNOW WHAT YOU ARE DOING. */ diff --git a/core/js/share.js b/core/js/share.js index 5632ecba971..d9ae0168129 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -444,7 +444,7 @@ OC.Share={ } }); } - $('#shareWith').autocomplete({minLength: 1, source: function(search, response) { + $('#shareWith').autocomplete({minLength: 2, delay: 750, source: function(search, response) { var $loading = $('#dropdown .shareWithLoading'); $loading.removeClass('hidden'); $.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWith', search: search.term, itemShares: OC.Share.itemShares }, function(result) { @@ -1025,6 +1025,7 @@ $(document).ready(function() { $loading.removeClass('hidden'); OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName).then(function() { $loading.addClass('hidden'); + $('#linkPassText').attr('placeholder', t('core', 'Choose a password for the public link')); }); } else { $('#linkPassText').focus(); diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php index 70eb05afd16..717eba17d6c 100644 --- a/core/l10n/bg_BG.php +++ b/core/l10n/bg_BG.php @@ -150,6 +150,7 @@ $TRANSLATIONS = array( "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Здрасти,\n\nсамо да те уведомя, че %s сподели %s с теб.\nРазгледай го: %s\n\n", "The share will expire on %s." => "Споделянето ще изтече на %s.", "Cheers!" => "Поздрави!", +"Internal Server Error" => "Вътрешна системна грешка", "The server encountered an internal error and was unable to complete your request." => "Сървърът се натъкна на вътрешна грешка и неуспя да завърши заявката.", "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Моля, свържи се със сървърния администратор ако тази грешка се появи отново, моля, включи техническите данни показани в доклада по-долу.", "More details can be found in the server log." => "Допълнителна информация може да бъде открита в сървърните доклади.", diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php index 79ac796e611..ac7642f6c86 100644 --- a/core/l10n/cs_CZ.php +++ b/core/l10n/cs_CZ.php @@ -150,6 +150,7 @@ $TRANSLATIONS = array( "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej ty tam,\n\njen ti chci dát vědět, že %s sdílel %s s tebou.\nZobraz si to: %s\n\n", "The share will expire on %s." => "Sdílení vyprší %s.", "Cheers!" => "Ať slouží!", +"Internal Server Error" => "Vnitřní chyba serveru", "The server encountered an internal error and was unable to complete your request." => "Server zaznamenal interní chybu a nebyl schopen dokončit váš požadavek.", "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Kontaktujte prosím administrátora serveru, pokud se bude tato chyba opakovat. Připojte do svého hlášení níže zobrazené technické detaily.", "More details can be found in the server log." => "Více podrobností k nalezení v serverovém logu.", diff --git a/core/l10n/da.php b/core/l10n/da.php index 8eace7d1662..ce415eca549 100644 --- a/core/l10n/da.php +++ b/core/l10n/da.php @@ -150,6 +150,7 @@ $TRANSLATIONS = array( "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej med dig\n\nDette blot for at lade dig vide, at %s har delt %s med dig.\nSe det her: %s\n\n", "The share will expire on %s." => "Delingen vil udløbe om %s.", "Cheers!" => "Hej!", +"Internal Server Error" => "Intern serverfejl", "The server encountered an internal error and was unable to complete your request." => "Servern stødte på en intern fejl og var ikke i stand til at fuldføre din forespørgsel.", "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Kontakt venligst serveradministratoren, hvis denne fejl gentager sig flere gange - medtag venligst de tekniske detaljer nedenfor i din rapport.", "More details can be found in the server log." => "Flere detaljer kan fås i serverloggen.", diff --git a/core/l10n/de.php b/core/l10n/de.php index ada6e70080d..5aa1dc14a9a 100644 --- a/core/l10n/de.php +++ b/core/l10n/de.php @@ -150,11 +150,12 @@ $TRANSLATIONS = array( "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\nich wollte Dich nur wissen lassen, dass %s %s mit Dir teilt.\nSchaue es Dir an: %s\n\n", "The share will expire on %s." => "Die Freigabe wird am %s ablaufen.", "Cheers!" => "Hallo!", +"Internal Server Error" => "Interner Server-Fehler", "The server encountered an internal error and was unable to complete your request." => "Der Server hat einen internen Fehler und konnte Ihre Anfrage nicht vervollständigen.", -"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Bitte wende Dich sich an den Serveradministrator, wenn dieser Fehler mehrfach auftritt, gebe bitte die, unten stehenden, technischen Details in Ihrem Bericht mit an.", +"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Bitte wende Dich an den Serveradministrator, wenn dieser Fehler mehrfach auftritt. Füge deinem Bericht, bitte die untenstehenden technischen Details hinzu.", "More details can be found in the server log." => "Weitere Details können im Serverprotokoll gefunden werden.", "Technical details" => "Technische Details", -"Remote Address: %s" => "Entfernte Adresse: %s", +"Remote Address: %s" => "IP Adresse: %s", "Request ID: %s" => "Anforderungskennung: %s", "Code: %s" => "Code: %s", "Message: %s" => "Nachricht: %s", diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php index 84d15a31de7..f50b3d6b07b 100644 --- a/core/l10n/de_DE.php +++ b/core/l10n/de_DE.php @@ -150,6 +150,7 @@ $TRANSLATIONS = array( "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\n%s hat %s mit Ihnen geteilt.\nAnsehen: %s\n\n", "The share will expire on %s." => "Die Freigabe wird am %s ablaufen.", "Cheers!" => "Noch einen schönen Tag!", +"Internal Server Error" => "Interner Server-Fehler", "The server encountered an internal error and was unable to complete your request." => "Der Server hat einen internen Fehler und konnte Ihre Anfrage nicht vervollständigen.", "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Bitte wenden Sie sich an den Serveradministrator, wenn dieser Fehler mehrfach auftritt, geben Sie bitte die, unten stehenden, technischen Details in Ihrem Bericht mit an.", "More details can be found in the server log." => "Weitere Details können im Serverprotokoll gefunden werden.", diff --git a/core/l10n/es.php b/core/l10n/es.php index 7c720aa563e..c7ca3c1580d 100644 --- a/core/l10n/es.php +++ b/core/l10n/es.php @@ -150,6 +150,7 @@ $TRANSLATIONS = array( "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hola:\n\nTan solo queremos informarte que %s compartió %s contigo.\nMíralo aquí: %s\n\n", "The share will expire on %s." => "El objeto dejará de ser compartido el %s.", "Cheers!" => "¡Saludos!", +"Internal Server Error" => "Error interno del servidor", "The server encountered an internal error and was unable to complete your request." => "El servidor ha encontrado un error y no puede completar la solicitud.", "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Por favor contacte con el administrador del servidor si este error reaparece multiples veces. Por favor incluya los detalles tecnicos que se muestran acontinuación.", "More details can be found in the server log." => "Mas detalles pueden verse en el log del servidor.", diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php index 4b9ac3f93b6..3035ee91877 100644 --- a/core/l10n/et_EE.php +++ b/core/l10n/et_EE.php @@ -68,6 +68,7 @@ $TRANSLATIONS = array( "Strong password" => "Väga hea parool", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv.", "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.", +"Error occurred while checking server setup" => "Serveri seadete kontrolimisel tekkis viga", "Shared" => "Jagatud", "Shared with {recipients}" => "Jagatud {recipients}", "Share" => "Jaga", @@ -87,6 +88,7 @@ $TRANSLATIONS = array( "Send" => "Saada", "Set expiration date" => "Määra aegumise kuupäev", "Expiration date" => "Aegumise kuupäev", +"Adding user..." => "Kasutaja lisamine...", "group" => "grupp", "Resharing is not allowed" => "Edasijagamine pole lubatud", "Shared in {item} with {user}" => "Jagatud {item} kasutajaga {user}", @@ -142,9 +144,21 @@ $TRANSLATIONS = array( "Error favoriting" => "Viga lemmikuks lisamisel", "Error unfavoriting" => "Viga lemmikutest eemaldamisel", "Access forbidden" => "Ligipääs on keelatud", +"File not found" => "Faili ei leitud", +"The specified document has not been found on the server." => "Määratud dokumenti serverist ei leitud.", +"You can click here to return to %s." => "%s tagasi minemiseks võid sa siia klikkida.", "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Tere,\n\n%s jagas sulle välja %s.\nVaata siit: %s\n\n", "The share will expire on %s." => "Jagamine aegub %s.", "Cheers!" => "Terekest!", +"Internal Server Error" => "Serveri sisemine viga", +"More details can be found in the server log." => "Lisainfot võib leida serveri logist.", +"Technical details" => "Tehnilised andmed", +"Remote Address: %s" => "Kaugaadress: %s", +"Request ID: %s" => "Päringu ID: %s", +"Code: %s" => "Kood: %s", +"Message: %s" => "Sõnum: %s", +"File: %s" => "Fail: %s", +"Line: %s" => "Rida: %s", "Security Warning" => "Turvahoiatus", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sinu PHP versioon on haavatav NULL Baidi (CVE-2006-7243) rünnakuga.", "Please update your PHP installation to use %s securely." => "Palun uuenda oma paigaldatud PHP-d tagamaks %s turvalisus.", diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php index 1b97801264a..e72bc5b8e7d 100644 --- a/core/l10n/fi_FI.php +++ b/core/l10n/fi_FI.php @@ -149,6 +149,7 @@ $TRANSLATIONS = array( "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hei sinä!\n\n%s jakoi kohteen %s kanssasi.\nTutustu siihen: %s\n\n", "The share will expire on %s." => "Jakaminen päättyy %s.", "Cheers!" => "Kippis!", +"Internal Server Error" => "Sisäinen palvelinvirhe", "The server encountered an internal error and was unable to complete your request." => "Palvelin kohtasi sisäisen virheen, eikä pystynyt viimeistelmään pyyntöäsi.", "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Ota yhteys palvelimen ylläpitäjään, jos tämä virhe ilmenee useita kertoja. Lisää yhteydenottoosi alla olevat tekniset tiedot.", "More details can be found in the server log." => "Lisätietoja on palvelimen lokitiedostossa.", @@ -159,6 +160,7 @@ $TRANSLATIONS = array( "Message: %s" => "Viesti: %s", "File: %s" => "Tiedosto: %s", "Line: %s" => "Rivi: %s", +"Trace" => "Jälki", "Security Warning" => "Turvallisuusvaroitus", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-asennuksesi on haavoittuvainen NULL Byte -hyökkäykselle (CVE-2006-7243)", "Please update your PHP installation to use %s securely." => "Päivitä PHP-asennus varmistaaksesi, että %s on turvallinen käyttää.", diff --git a/core/l10n/fr.php b/core/l10n/fr.php index 861fb4d54f6..ea6736a1648 100644 --- a/core/l10n/fr.php +++ b/core/l10n/fr.php @@ -150,6 +150,7 @@ $TRANSLATIONS = array( "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Bonjour,\n\nNous vous informons que %s a partagé %s avec vous.\nConsultez-le : %s\n", "The share will expire on %s." => "Le partage expirera le %s.", "Cheers!" => "À bientôt !", +"Internal Server Error" => "Erreur interne du serveur", "The server encountered an internal error and was unable to complete your request." => "Le serveur a rencontré une erreur interne et est incapable d'exécuter votre requête.", "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Veuillez contacter l'administrateur du serveur si cette erreur apparaît plusieurs fois. Veuillez joindre les détails techniques à votre rapport.", "More details can be found in the server log." => "Le fichier journal du serveur peut fournir plus de renseignements.", diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php index f9d5f012e9a..b5e28333cc9 100644 --- a/core/l10n/hu_HU.php +++ b/core/l10n/hu_HU.php @@ -68,6 +68,7 @@ $TRANSLATIONS = array( "Strong password" => "Erős jelszó", "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.", "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.", +"Error occurred while checking server setup" => "Hiba történt a szerver beállítások ellenőrzése közben", "Shared" => "Megosztott", "Shared with {recipients}" => "Megosztva ővelük: {recipients}", "Share" => "Megosztás", @@ -87,6 +88,7 @@ $TRANSLATIONS = array( "Send" => "Küldjük el", "Set expiration date" => "Legyen lejárati idő", "Expiration date" => "A lejárati idő", +"Adding user..." => "Felhasználó hozzáadása...", "group" => "csoport", "Resharing is not allowed" => "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal", "Shared in {item} with {user}" => "Megosztva {item}-ben {user}-rel", @@ -142,9 +144,20 @@ $TRANSLATIONS = array( "Error favoriting" => "Hiba a kedvencekhez adáskor", "Error unfavoriting" => "Hiba a kedvencekből törléskor", "Access forbidden" => "A hozzáférés nem engedélyezett", +"File not found" => "Fájl nem található", +"The specified document has not been found on the server." => "A meghatározott dokumentum nem található a szerveren.", +"You can click here to return to %s." => "Ide kattintva visszatérhetsz ide: %s.", "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Üdv!\\n\n\\n\nÉrtesítjük, hogy %s megosztotta Önnel a következőt: %s.\\n\nItt lehet megnézni: %s\\n\n\\n", "The share will expire on %s." => "A megosztás lejár ekkor %s", "Cheers!" => "Üdv.", +"Internal Server Error" => "Belső szerver hiba", +"Technical details" => "Technikai adatok", +"Remote Address: %s" => "Távoli cím: %s", +"Request ID: %s" => "Kérelem azonosító: %s", +"Code: %s" => "Kód: %s", +"Message: %s" => "Üzenet: %s", +"File: %s" => "Fájl: %s", +"Line: %s" => "Sor: %s", "Security Warning" => "Biztonsági figyelmeztetés", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Az Ön PHP verziója sebezhető a NULL bájtos támadással szemben (CVE-2006-7243)", "Please update your PHP installation to use %s securely." => "Kérjük frissítse a telepített PHP csomagjait, hogy biztonságos legyen az %s szolgáltatása.", diff --git a/core/l10n/it.php b/core/l10n/it.php index 67114a321bb..ae3fd59861f 100644 --- a/core/l10n/it.php +++ b/core/l10n/it.php @@ -150,6 +150,7 @@ $TRANSLATIONS = array( "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ciao,\n\nvolevo informarti che %s ha condiviso %s con te.\nVedi: %s\n\n", "The share will expire on %s." => "La condivisione scadrà il %s.", "Cheers!" => "Saluti!", +"Internal Server Error" => "Errore interno del server", "The server encountered an internal error and was unable to complete your request." => "Il server ha riscontrato un errore interno e non è stato in grado di completare la tua richiesta.", "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Contatta l'amministratore del server se questo errore riappare più volte, includendo i dettagli tecnici sotto riportati nella tua segnalazione.", "More details can be found in the server log." => "Ulteriori dettagli sono disponibili nel log del server.", diff --git a/core/l10n/nl.php b/core/l10n/nl.php index 581db3a6216..b6c3b5ce401 100644 --- a/core/l10n/nl.php +++ b/core/l10n/nl.php @@ -150,6 +150,7 @@ $TRANSLATIONS = array( "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\n%s deelt %s met u.\nBekijk het hier: %s\n\n", "The share will expire on %s." => "De share vervalt op %s.", "Cheers!" => "Proficiat!", +"Internal Server Error" => "Interne serverfout", "The server encountered an internal error and was unable to complete your request." => "De server ontdekte een interne fout en kon uw aanvraag niet verder uitvoeren.", "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Neem contact op mer de serverbeheerder als deze fout meerdere keren optreedt en neem de onderstaande technische details op in uw melding.", "More details can be found in the server log." => "Meer details in de serverlogging,", diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php index 505dc24c10a..7d653d12dd4 100644 --- a/core/l10n/pt_BR.php +++ b/core/l10n/pt_BR.php @@ -150,6 +150,7 @@ $TRANSLATIONS = array( "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Olá,\n\ngostaria que você soubesse que %s compartilhou %s com você.\nVeja isto: %s\n\n", "The share will expire on %s." => "O compartilhamento irá expirar em %s.", "Cheers!" => "Saúde!", +"Internal Server Error" => "Erro Interno do Servidor", "The server encountered an internal error and was unable to complete your request." => "O servidor encontrou um erro interno e não conseguiu concluir o seu pedido.", "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Entre em contato com o administrador do servidor se este erro reaparece várias vezes, por favor, inclua os detalhes técnicos abaixo em seu relatório.", "More details can be found in the server log." => "Mais detalhes podem ser encontrados no log do servidor.", diff --git a/core/l10n/sl.php b/core/l10n/sl.php index b6a7b9206f2..20a8d9b8fc0 100644 --- a/core/l10n/sl.php +++ b/core/l10n/sl.php @@ -150,7 +150,9 @@ $TRANSLATIONS = array( "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Pozdravljeni,\n\noseba %s vam je omogočila souporabo %s.\nVir si lahko ogledate: %s\n\n", "The share will expire on %s." => "Povezava souporabe bo potekla %s.", "Cheers!" => "Na zdravje!", +"Internal Server Error" => "Notranja napaka strežnika", "The server encountered an internal error and was unable to complete your request." => "Prišlo je do notranje napake, zato ni mogoče končati zahteve.", +"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Stopite v stik s skrbnikom sistema, če se napaka pojavlja pogosto. V poročilo vključite tudi tehnične podatke v dnevniški datoteki.", "More details can be found in the server log." => "Več podrobnosti je zabeleženih v dnevniku strežnika.", "Technical details" => "Tehnične podrobnosti", "Remote Address: %s" => "Oddaljen naslov: %s", @@ -159,6 +161,7 @@ $TRANSLATIONS = array( "Message: %s" => "Sporočilo: %s", "File: %s" => "Datoteka: %s", "Line: %s" => "Vrstica: %s", +"Trace" => "Sledenje povezav", "Security Warning" => "Varnostno opozorilo", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uporabljena različica PHP je ranljiva za napad NULL Byte (CVE-2006-7243)", "Please update your PHP installation to use %s securely." => "Za varno uporabo storitve %s, je treba posodobiti namestitev PHP", diff --git a/core/l10n/tr.php b/core/l10n/tr.php index 50a7a798f13..7a1def5d18b 100644 --- a/core/l10n/tr.php +++ b/core/l10n/tr.php @@ -150,6 +150,7 @@ $TRANSLATIONS = array( "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Merhaba,\n\nSadece %s sizinle %s paylaşımını yaptığını bildiriyoruz.\nBuradan bakabilirsiniz: %s\n\n", "The share will expire on %s." => "Bu paylaşım %s tarihinde sona erecek.", "Cheers!" => "Hoşça kalın!", +"Internal Server Error" => "Dahili Sunucu Hatası", "The server encountered an internal error and was unable to complete your request." => "Sunucu dahili bir hatayla karşılaştı ve isteğinizi tamamlayamadı.", "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Eğer bu hata birden çok kez oluştuysa, lütfen sunucu yöneticisine aşağıdaki teknik ayrıntılar ile birlikte iletişime geçin.", "More details can be found in the server log." => "Daha fazla ayrıntı sunucu günlüğünde bulanabilir.", diff --git a/core/l10n/uk.php b/core/l10n/uk.php index ce15a2b2e9a..591198fd7d9 100644 --- a/core/l10n/uk.php +++ b/core/l10n/uk.php @@ -4,6 +4,10 @@ $TRANSLATIONS = array( "Turned on maintenance mode" => "Увімкнено захищений режим", "Turned off maintenance mode" => "Вимкнено захищений режим", "Updated database" => "Базу даних оновлено", +"Checked database schema update" => "Перевірено оновлення схеми бази даних", +"Checked database schema update for apps" => "Перевірено оновлення схеми бази даних для додатків", +"Updated \"%s\" to %s" => "Оновлено \"%s\" до %s", +"Disabled incompatible apps: %s" => "Вимкнені несумісні додатки: %s", "No image or file provided" => "Немає наданого зображення або файлу", "Unknown filetype" => "Невідомий тип файлу", "Invalid image" => "Невірне зображення", @@ -31,8 +35,15 @@ $TRANSLATIONS = array( "Settings" => "Налаштування", "File" => "Файл", "Folder" => "Тека", +"Image" => "Зображення", +"Audio" => "Аудіо", "Saving..." => "Зберігаю...", +"Couldn't send reset email. Please contact your administrator." => "Не можу надіслати email для скидання. Будь ласка, зверніться до вашого адміністратора.", +"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "Посилання для скидання вашого пароль було надіслано на ваш email. Якщо ви не отримали його найближчим часом, перевірте теку зі спамом.<br>Якщо і там немає, спитайте вашого місцевого адміністратора.", +"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Ваші файли зашифровані. Якщо ви не зробили ключ відновлення, після скидання паролю відновити ваші дані буде неможливо.<br /> Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора перед продовженням.<br /> Ви дійсно хочете продовжити?", +"I know what I'm doing" => "Я знаю що роблю", "Reset password" => "Скинути пароль", +"Password can not be changed. Please contact your administrator." => "Пароль не може бути змінено. Будь ласка, зверніться до вашого адміністратора", "No" => "Ні", "Yes" => "Так", "Choose" => "Обрати", @@ -42,6 +53,7 @@ $TRANSLATIONS = array( "_{count} file conflict_::_{count} file conflicts_" => array("{count} файловий конфлікт","{count} файлових конфліктів","{count} файлових конфліктів"), "One file conflict" => "Один файловий конфлікт", "New Files" => "Нових Файлів", +"Already existing files" => "Файли що вже існують", "Which files do you want to keep?" => "Які файли ви хочете залишити?", "If you select both versions, the copied file will have a number added to its name." => "Якщо ви оберете обидві версії, скопійований файл буде мати номер, доданий у його ім'я.", "Cancel" => "Відмінити", @@ -51,10 +63,14 @@ $TRANSLATIONS = array( "Error loading file exists template" => "Помилка при завантаженні файлу існуючого шаблону", "Very weak password" => "Дуже слабкий пароль", "Weak password" => "Слабкий пароль", +"So-so password" => "Такий собі пароль", "Good password" => "Добрий пароль", "Strong password" => "Надійний пароль", "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.", +"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." => "Цей сервер не має під'єднання до Інтернету. Це означає, що деякі функції, такі як монтування зовнішніх сховищ, повідомлення про оновлення або встановлення допоміжних програм не будуть працювати. Віддалений доступ до файлів та надсилання повідомлень електронною поштою також може не працювати. Ми пропонуємо увімкнути під'єднання до Інтернету для даного сервера, якщо ви хочете мати всі можливості ownCloud.", +"Error occurred while checking server setup" => "При перевірці налаштувань серверу сталася помилка", "Shared" => "Опубліковано", +"Shared with {recipients}" => "Опубліковано для {recipients}", "Share" => "Поділитися", "Error" => "Помилка", "Error while sharing" => "Помилка під час публікації", @@ -64,12 +80,15 @@ $TRANSLATIONS = array( "Shared with you by {owner}" => "{owner} опублікував для Вас", "Share with user or group …" => "Поділитися з користувачем або групою ...", "Share link" => "Опублікувати посилання", +"The public link will expire no later than {days} days after it is created" => "Доступ до опублікованого посилання буде припинено не пізніше ніж через {days} днів з моменту створення", "Password protect" => "Захистити паролем", +"Choose a password for the public link" => "Оберіть пароль для опублікованого посилання", "Allow Public Upload" => "Дозволити Публічне Завантаження", "Email link to person" => "Ел. пошта належить Пану", "Send" => "Надіслати", "Set expiration date" => "Встановити термін дії", "Expiration date" => "Термін дії", +"Adding user..." => "Додавання користувача...", "group" => "група", "Resharing is not allowed" => "Пере-публікація не дозволяється", "Shared in {item} with {user}" => "Опубліковано {item} для {user}", @@ -94,8 +113,13 @@ $TRANSLATIONS = array( "Edit tags" => "Редагувати теги", "Error loading dialog template: {error}" => "Помилка при завантаженні шаблону діалогу: {error}", "No tags selected for deletion." => "Жодних тегів не обрано для видалення.", +"Updating {productName} to version {version}, this may take a while." => "Оновлення {productName} до версії {version}, це може займати деякий час.", "Please reload the page." => "Будь ласка, перезавантажте сторінку.", +"The update was unsuccessful." => "Оновлення завершилось невдачею.", "The update was successful. Redirecting you to ownCloud now." => "Оновлення виконалось успішно. Перенаправляємо вас на ownCloud.", +"Couldn't reset password because the token is invalid" => "Неможливо скинути пароль, бо маркер є недійсним", +"Couldn't send reset email. Please make sure your username is correct." => "Не вдалося відправити скидання паролю. Будь ласка, переконайтеся, що ваше ім'я користувача є правильним.", +"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Не вдалося відправити скидання паролю, тому що немає адреси електронної пошти для цього користувача. Будь ласка, зверніться до адміністратора.", "%s password reset" => "%s пароль скинуто", "Use the following link to reset your password: {link}" => "Використовуйте наступне посилання для скидання пароля: {link}", "You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.", @@ -104,7 +128,9 @@ $TRANSLATIONS = array( "Yes, I really want to reset my password now" => "Так, я справді бажаю скинути мій пароль зараз", "Reset" => "Перевстановити", "New password" => "Новий пароль", +"New Password" => "Новий пароль", "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X не підтримується і %s не буде коректно працювати на цій платформі. Випробовуєте на свій риск!", +"For the best results, please consider using a GNU/Linux server instead." => "Для кращих результатів розгляньте можливість використання GNU/Linux серверу", "Personal" => "Особисте", "Users" => "Користувачі", "Apps" => "Додатки", @@ -118,9 +144,24 @@ $TRANSLATIONS = array( "Error favoriting" => "Помилка позначення улюблених", "Error unfavoriting" => "Помилка зняття позначки улюблених", "Access forbidden" => "Доступ заборонено", +"File not found" => "Файл не знайдено", +"The specified document has not been found on the server." => "Не вдалось знайти вказаний документ на сервері.", +"You can click here to return to %s." => "Ви можете натиснути тут для повернення до %s.", "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Агов,\n\nпросто щоб ви знали, що %s поділився %s з вами.\nПодивіться: %s\n\n", "The share will expire on %s." => "Доступ до спільних даних вичерпається %s.", "Cheers!" => "Будьмо!", +"Internal Server Error" => "Внутрішня помилка серверу", +"The server encountered an internal error and was unable to complete your request." => "На сервері сталася внутрішня помилка, тому він не зміг виконати ваш запит.", +"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Будь ласка, зверніться до адміністратора сервера, якщо ця помилка з'являється кілька разів, будь ласка, вкажіть технічні подробиці нижче в звіті.", +"More details can be found in the server log." => "Більше деталей може бути в журналі серверу.", +"Technical details" => "Технічні деталі", +"Remote Address: %s" => "Віддалена Адреса: %s", +"Request ID: %s" => "Запит ID: %s", +"Code: %s" => "Код: %s", +"Message: %s" => "Повідомлення: %s", +"File: %s" => "Файл: %s", +"Line: %s" => "Рядок: %s", +"Trace" => "Трасування", "Security Warning" => "Попередження про небезпеку", "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша версія PHP вразлива для атак NULL Byte (CVE-2006-7243)", "Please update your PHP installation to use %s securely." => "Будь ласка, оновіть вашу інсталяцію PHP для використання %s безпеки.", @@ -128,19 +169,24 @@ $TRANSLATIONS = array( "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Для отримання інформації, як правильно налаштувати сервер, див. <a href=\"%s\" target=\"_blank\">документацію</a>.", "Create an <strong>admin account</strong>" => "Створити <strong>обліковий запис адміністратора</strong>", "Password" => "Пароль", +"Storage & database" => "Сховище і база даних", "Data folder" => "Каталог даних", "Configure the database" => "Налаштування бази даних", +"Only %s is available." => "Тільки %s доступно.", "Database user" => "Користувач бази даних", "Database password" => "Пароль для бази даних", "Database name" => "Назва бази даних", "Database tablespace" => "Таблиця бази даних", "Database host" => "Хост бази даних", +"SQLite will be used as database. For larger installations we recommend to change this." => "Ви використовуете SQLite для вашої бази даних. Для більш навантажених серверів, ми рекомендуемо змінити це.", "Finish setup" => "Завершити налаштування", "Finishing …" => "Завершується ...", +"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Для цього додатка потрібна наявність Java для коректної роботи. Будь ласка, <a href=\"http://enable-javascript.com/\" target=\"_blank\"> увімкніть JavaScript </a> і перезавантажте сторінку.", "%s is available. Get more information on how to update." => "%s доступний. Отримай більше інформації про те, як оновити.", "Log out" => "Вихід", "Server side authentication failed!" => "Помилка аутентифікації на боці Сервера !", "Please contact your administrator." => "Будь ласка, зверніться до вашого Адміністратора.", +"Forgot your password? Reset it!" => "Забули ваш пароль? Скиньте його!", "remember" => "запам'ятати", "Log in" => "Вхід", "Alternative Logins" => "Альтернативні Логіни", @@ -148,6 +194,18 @@ $TRANSLATIONS = array( "This ownCloud instance is currently in single user mode." => "Цей екземпляр OwnCloud зараз працює в монопольному режимі одного користувача", "This means only administrators can use the instance." => "Це означає, що лише адміністратори можуть використовувати цей екземпляр.", "Contact your system administrator if this message persists or appeared unexpectedly." => "Зверніться до системного адміністратора, якщо це повідомлення зберігається або з'являєтья несподівано.", -"Thank you for your patience." => "Дякуємо за ваше терпіння." +"Thank you for your patience." => "Дякуємо за ваше терпіння.", +"You are accessing the server from an untrusted domain." => "Ви зайшли на сервер з ненадійного домену.", +"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Будь ласка, зверніться до адміністратора. Якщо ви є адміністратором цього серверу, ви можете налаштувати опцію \"trusted_domain\" в конфігураційному файлі config/config.php. Приклад конфігурації знаходится в файлі config/config.sample.php.", +"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Залежно від конфігурації Ви як адміністратор можете додати цей домен у список довірених, використовуйте кнопку нижче.", +"Add \"%s\" as trusted domain" => "Додати \"%s\" як довірений", +"%s will be updated to version %s." => "%s буде оновлено до версії %s.", +"The following apps will be disabled:" => "Наступні додатки будуть відключені:", +"The theme %s has been disabled." => "Тему %s було вимкнено.", +"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Перш ніж продовжити, будь ласка, переконайтеся, що база даних, папка конфігурації і папка даних були дубльовані.", +"Start update" => "Почати оновлення", +"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Щоб уникнути великих таймаутів з більш тяжкими встановленнями, ви можете виконати наступну команду відносно директорії встановлення:", +"This %s instance is currently being updated, which may take a while." => "Цей %s екземпляр нині оновлюється, що може зайняти деякий час.", +"This page will refresh itself when the %s instance is available again." => "Ця сторінка автоматично перезавантажиться коли екземпляр %s стане знову доступний." ); $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/core/templates/exception.php b/core/templates/exception.php index cf0e4c74825..144359a16d9 100644 --- a/core/templates/exception.php +++ b/core/templates/exception.php @@ -3,7 +3,7 @@ /** @var OC_L10N $l */ ?> <span class="error error-wide"> - <h2><strong><?php p('Internal Server Error') ?></strong></h2> + <h2><strong><?php p($l->t('Internal Server Error')) ?></strong></h2> <p><?php p($l->t('The server encountered an internal error and was unable to complete your request.')) ?></p> <p><?php p($l->t('Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.')) ?></p> <p><?php p($l->t('More details can be found in the server log.')) ?></p> diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 3e78dc82191..5829a00e76b 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-10-16 01:54-0400\n" +"POT-Creation-Date: 2014-10-20 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -327,12 +327,12 @@ msgstr "" msgid "Share" msgstr "" -#: js/share.js:326 js/share.js:340 js/share.js:347 js/share.js:1076 +#: js/share.js:326 js/share.js:340 js/share.js:347 js/share.js:1077 #: templates/installation.php:10 msgid "Error" msgstr "" -#: js/share.js:328 js/share.js:1139 +#: js/share.js:328 js/share.js:1140 msgid "Error while sharing" msgstr "" @@ -369,7 +369,7 @@ msgstr "" msgid "Password protect" msgstr "" -#: js/share.js:402 +#: js/share.js:402 js/share.js:1028 msgid "Choose a password for the public link" msgstr "" @@ -441,27 +441,27 @@ msgstr "" msgid "delete" msgstr "" -#: js/share.js:1057 +#: js/share.js:1058 msgid "Password protected" msgstr "" -#: js/share.js:1076 +#: js/share.js:1077 msgid "Error unsetting expiration date" msgstr "" -#: js/share.js:1097 +#: js/share.js:1098 msgid "Error setting expiration date" msgstr "" -#: js/share.js:1126 +#: js/share.js:1127 msgid "Sending ..." msgstr "" -#: js/share.js:1137 +#: js/share.js:1138 msgid "Email sent" msgstr "" -#: js/share.js:1161 +#: js/share.js:1162 msgid "Warning" msgstr "" @@ -662,6 +662,10 @@ msgstr "" msgid "Cheers!" msgstr "" +#: templates/exception.php:6 +msgid "Internal Server Error" +msgstr "" + #: templates/exception.php:7 msgid "" "The server encountered an internal error and was unable to complete your " diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 1ea7e4373d5..e7e1feaecc4 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-10-16 01:54-0400\n" +"POT-Creation-Date: 2014-10-20 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -198,7 +198,7 @@ msgstr "" msgid "URL cannot be empty" msgstr "" -#: js/file-upload.js:579 js/filelist.js:1308 +#: js/file-upload.js:579 js/filelist.js:1310 msgid "{new_name} already exists" msgstr "" @@ -238,59 +238,59 @@ msgstr "" msgid "Rename" msgstr "" -#: js/filelist.js:698 js/filelist.js:1854 +#: js/filelist.js:700 js/filelist.js:1856 msgid "Pending" msgstr "" -#: js/filelist.js:1259 +#: js/filelist.js:1261 msgid "Error moving file." msgstr "" -#: js/filelist.js:1267 +#: js/filelist.js:1269 msgid "Error moving file" msgstr "" -#: js/filelist.js:1267 +#: js/filelist.js:1269 msgid "Error" msgstr "" -#: js/filelist.js:1356 +#: js/filelist.js:1358 msgid "Could not rename file" msgstr "" -#: js/filelist.js:1478 +#: js/filelist.js:1480 msgid "Error deleting file." msgstr "" -#: js/filelist.js:1580 templates/list.php:61 +#: js/filelist.js:1582 templates/list.php:61 msgid "Name" msgstr "" -#: js/filelist.js:1581 templates/list.php:72 +#: js/filelist.js:1583 templates/list.php:72 msgid "Size" msgstr "" -#: js/filelist.js:1582 templates/list.php:75 +#: js/filelist.js:1584 templates/list.php:75 msgid "Modified" msgstr "" -#: js/filelist.js:1592 js/filesummary.js:141 js/filesummary.js:168 +#: js/filelist.js:1594 js/filesummary.js:141 js/filesummary.js:168 msgid "%n folder" msgid_plural "%n folders" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:1598 js/filesummary.js:142 js/filesummary.js:169 +#: js/filelist.js:1600 js/filesummary.js:142 js/filesummary.js:169 msgid "%n file" msgid_plural "%n files" msgstr[0] "" msgstr[1] "" -#: js/filelist.js:1655 templates/list.php:47 +#: js/filelist.js:1657 templates/list.php:47 msgid "You don’t have permission to upload or create files here" msgstr "" -#: js/filelist.js:1747 js/filelist.js:1786 +#: js/filelist.js:1749 js/filelist.js:1788 msgid "Uploading %n file" msgid_plural "Uploading %n files" msgstr[0] "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 224bce06504..ee9c156693f 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-10-16 01:54-0400\n" +"POT-Creation-Date: 2014-10-20 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 2255ee24545..fcb737cf643 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-10-16 01:54-0400\n" +"POT-Creation-Date: 2014-10-20 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -223,15 +223,15 @@ msgstr "" msgid "System" msgstr "" -#: js/settings.js:208 +#: js/settings.js:211 msgid "All users. Type to select user or group." msgstr "" -#: js/settings.js:291 +#: js/settings.js:294 msgid "(group)" msgstr "" -#: js/settings.js:467 js/settings.js:474 +#: js/settings.js:471 js/settings.js:478 msgid "Saved" msgstr "" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 2167e5aca0e..cb49d8aa143 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-10-16 01:54-0400\n" +"POT-Creation-Date: 2014-10-20 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot index a01bae342af..522777c38ac 100644 --- a/l10n/templates/files_trashbin.pot +++ b/l10n/templates/files_trashbin.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-10-16 01:54-0400\n" +"POT-Creation-Date: 2014-10-20 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -39,7 +39,7 @@ msgstr "" msgid "Error" msgstr "" -#: lib/trashbin.php:962 lib/trashbin.php:964 +#: lib/trashbin.php:970 lib/trashbin.php:972 msgid "restored" msgstr "" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index e964ff4a625..0636d381a88 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-10-16 01:54-0400\n" +"POT-Creation-Date: 2014-10-20 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 04fb0566568..69e8f167803 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-10-16 01:54-0400\n" +"POT-Creation-Date: 2014-10-20 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -51,38 +51,38 @@ msgid "" "before performing changes on config.php" msgstr "" -#: private/app.php:398 +#: private/app.php:408 msgid "Help" msgstr "" -#: private/app.php:411 +#: private/app.php:421 msgid "Personal" msgstr "" -#: private/app.php:422 +#: private/app.php:432 msgid "Settings" msgstr "" -#: private/app.php:434 +#: private/app.php:444 msgid "Users" msgstr "" -#: private/app.php:447 +#: private/app.php:457 msgid "Admin" msgstr "" -#: private/app.php:853 private/app.php:964 +#: private/app.php:863 private/app.php:974 msgid "Recommended" msgstr "" -#: private/app.php:1142 +#: private/app.php:1156 #, php-format msgid "" "App \\\"%s\\\" can't be installed because it is not compatible with this " "version of ownCloud." msgstr "" -#: private/app.php:1154 +#: private/app.php:1168 msgid "No app name specified" msgstr "" @@ -373,36 +373,36 @@ msgstr "" msgid "Sharing backend for %s not found" msgstr "" -#: private/share/share.php:1841 +#: private/share/share.php:1892 #, php-format msgid "Sharing %s failed, because the user %s is the original sharer" msgstr "" -#: private/share/share.php:1851 +#: private/share/share.php:1902 #, php-format msgid "" "Sharing %s failed, because the permissions exceed permissions granted to %s" msgstr "" -#: private/share/share.php:1877 +#: private/share/share.php:1928 #, php-format msgid "Sharing %s failed, because resharing is not allowed" msgstr "" -#: private/share/share.php:1891 +#: private/share/share.php:1942 #, php-format msgid "" "Sharing %s failed, because the sharing backend for %s could not find its " "source" msgstr "" -#: private/share/share.php:1905 +#: private/share/share.php:1956 #, php-format msgid "" "Sharing %s failed, because the file could not be found in the file cache" msgstr "" -#: private/tags.php:183 +#: private/tags.php:226 #, php-format msgid "Could not find category \"%s\"" msgstr "" diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot index 6e3c68dcf06..6c14b1f749d 100644 --- a/l10n/templates/private.pot +++ b/l10n/templates/private.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-10-16 01:54-0400\n" +"POT-Creation-Date: 2014-10-20 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,38 +18,38 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: app.php:398 +#: app.php:408 msgid "Help" msgstr "" -#: app.php:411 +#: app.php:421 msgid "Personal" msgstr "" -#: app.php:422 +#: app.php:432 msgid "Settings" msgstr "" -#: app.php:434 +#: app.php:444 msgid "Users" msgstr "" -#: app.php:447 +#: app.php:457 msgid "Admin" msgstr "" -#: app.php:853 app.php:964 +#: app.php:863 app.php:974 msgid "Recommended" msgstr "" -#: app.php:1142 +#: app.php:1156 #, php-format msgid "" "App \\\"%s\\\" can't be installed because it is not compatible with this " "version of ownCloud." msgstr "" -#: app.php:1154 +#: app.php:1168 msgid "No app name specified" msgstr "" @@ -332,36 +332,36 @@ msgstr "" msgid "Sharing backend for %s not found" msgstr "" -#: share/share.php:1841 +#: share/share.php:1892 #, php-format msgid "Sharing %s failed, because the user %s is the original sharer" msgstr "" -#: share/share.php:1851 +#: share/share.php:1902 #, php-format msgid "" "Sharing %s failed, because the permissions exceed permissions granted to %s" msgstr "" -#: share/share.php:1877 +#: share/share.php:1928 #, php-format msgid "Sharing %s failed, because resharing is not allowed" msgstr "" -#: share/share.php:1891 +#: share/share.php:1942 #, php-format msgid "" "Sharing %s failed, because the sharing backend for %s could not find its " "source" msgstr "" -#: share/share.php:1905 +#: share/share.php:1956 #, php-format msgid "" "Sharing %s failed, because the file could not be found in the file cache" msgstr "" -#: tags.php:183 +#: tags.php:226 #, php-format msgid "Could not find category \"%s\"" msgstr "" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 88d3e5eed92..91618d6887c 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-10-16 01:54-0400\n" +"POT-Creation-Date: 2014-10-20 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -168,7 +168,7 @@ msgid "test email settings" msgstr "" #: controller/mailsettingscontroller.php:137 -msgid "If you received this email, the settings seems to be correct." +msgid "If you received this email, the settings seem to be correct." msgstr "" #: controller/mailsettingscontroller.php:144 diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 7421a8e8092..569ac70cbe6 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-10-16 01:54-0400\n" +"POT-Creation-Date: 2014-10-20 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -91,55 +91,55 @@ msgstr "" msgid "Error" msgstr "" -#: js/settings.js:244 +#: js/settings.js:266 msgid "Please specify a Base DN" msgstr "" -#: js/settings.js:245 +#: js/settings.js:267 msgid "Could not determine Base DN" msgstr "" -#: js/settings.js:276 +#: js/settings.js:299 msgid "Please specify the port" msgstr "" -#: js/settings.js:792 +#: js/settings.js:933 msgid "Configuration OK" msgstr "" -#: js/settings.js:801 +#: js/settings.js:942 msgid "Configuration incorrect" msgstr "" -#: js/settings.js:810 +#: js/settings.js:951 msgid "Configuration incomplete" msgstr "" -#: js/settings.js:827 js/settings.js:836 +#: js/settings.js:968 js/settings.js:977 msgid "Select groups" msgstr "" -#: js/settings.js:830 js/settings.js:839 +#: js/settings.js:971 js/settings.js:980 msgid "Select object classes" msgstr "" -#: js/settings.js:833 +#: js/settings.js:974 msgid "Select attributes" msgstr "" -#: js/settings.js:860 +#: js/settings.js:1002 msgid "Connection test succeeded" msgstr "" -#: js/settings.js:867 +#: js/settings.js:1009 msgid "Connection test failed" msgstr "" -#: js/settings.js:876 +#: js/settings.js:1018 msgid "Do you really want to delete the current Server Configuration?" msgstr "" -#: js/settings.js:877 +#: js/settings.js:1019 msgid "Confirm Deletion" msgstr "" @@ -165,19 +165,19 @@ msgstr "" msgid "Invalid Host" msgstr "" -#: settings.php:52 +#: settings.php:53 msgid "Server" msgstr "" -#: settings.php:53 +#: settings.php:54 msgid "User Filter" msgstr "" -#: settings.php:54 +#: settings.php:55 msgid "Login Filter" msgstr "" -#: settings.php:55 +#: settings.php:56 msgid "Group Filter" msgstr "" @@ -189,7 +189,7 @@ msgstr "" msgid "Test Configuration" msgstr "" -#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14 +#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:15 msgid "Help" msgstr "" @@ -226,7 +226,12 @@ msgid "" "The filter specifies which LDAP groups shall have access to the %s instance." msgstr "" -#: templates/part.wizard-groupfilter.php:38 +#: templates/part.wizard-groupfilter.php:34 +#: templates/part.wizard-userfilter.php:34 +msgid "Test Filter" +msgstr "" + +#: templates/part.wizard-groupfilter.php:41 msgid "groups found" msgstr "" @@ -309,6 +314,16 @@ msgstr "" msgid "You can specify Base DN for users and groups in the Advanced tab" msgstr "" +#: templates/part.wizard-server.php:75 +msgid "" +"Avoids automatic LDAP requests. Better for bigger setups, but requires some " +"LDAP knowledge." +msgstr "" + +#: templates/part.wizard-server.php:78 +msgid "Manually enter LDAP filters (recommended for large directories)" +msgstr "" + #: templates/part.wizard-userfilter.php:4 #, php-format msgid "Limit %s access to users meeting these criteria:" @@ -320,15 +335,19 @@ msgid "" "The filter specifies which LDAP users shall have access to the %s instance." msgstr "" -#: templates/part.wizard-userfilter.php:38 +#: templates/part.wizard-userfilter.php:41 msgid "users found" msgstr "" -#: templates/part.wizardcontrols.php:5 +#: templates/part.wizardcontrols.php:2 +msgid "Saving" +msgstr "" + +#: templates/part.wizardcontrols.php:6 msgid "Back" msgstr "" -#: templates/part.wizardcontrols.php:8 +#: templates/part.wizardcontrols.php:9 msgid "Continue" msgstr "" diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot index e776c57e516..cb4b5d18c90 100644 --- a/l10n/templates/user_webdavauth.pot +++ b/l10n/templates/user_webdavauth.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud Core 6.0.0\n" "Report-Msgid-Bugs-To: translations@owncloud.org\n" -"POT-Creation-Date: 2014-10-16 01:54-0400\n" +"POT-Creation-Date: 2014-10-20 01:54-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php index 3b247952ede..caa7a558d57 100644 --- a/lib/l10n/bg_BG.php +++ b/lib/l10n/bg_BG.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Settings" => "Настройки", "Users" => "Потребители", "Admin" => "Админ", +"Recommended" => "Препоръчано", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Приложението \\\"%s\\\" не може да бъде инсталирано, защото не е съвместимо с тази версия на ownCloud.", "No app name specified" => "Не е зададено име на преложението", "Unknown filetype" => "Непознат тип файл.", diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php index 244fc53fbf3..a8143d4e431 100644 --- a/lib/l10n/cs_CZ.php +++ b/lib/l10n/cs_CZ.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Settings" => "Nastavení", "Users" => "Uživatelé", "Admin" => "Administrace", +"Recommended" => "Doporučené", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikace \\\"%s\\\" nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud.", "No app name specified" => "Nebyl zadan název aplikace", "Unknown filetype" => "Neznámý typ souboru", diff --git a/lib/l10n/da.php b/lib/l10n/da.php index 1568d72e3a6..8ae7d847a09 100644 --- a/lib/l10n/da.php +++ b/lib/l10n/da.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Settings" => "Indstillinger", "Users" => "Brugere", "Admin" => "Admin", +"Recommended" => "Anbefalet", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "App'en \\\"%s\\\" kan ikke installeres, da den ikke er kompatible med denne version af ownCloud.", "No app name specified" => "Intet app-navn angivet", "Unknown filetype" => "Ukendt filtype", diff --git a/lib/l10n/de.php b/lib/l10n/de.php index e2586d286ed..ac359e34f52 100644 --- a/lib/l10n/de.php +++ b/lib/l10n/de.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Settings" => "Einstellungen", "Users" => "Benutzer", "Admin" => "Administration", +"Recommended" => "Empfohlen", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Applikation \\\"%s\\\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist.", "No app name specified" => "Es wurde kein Applikation-Name angegeben", "Unknown filetype" => "Unbekannter Dateityp", diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php index 98f74eee4d5..006f28d6066 100644 --- a/lib/l10n/de_DE.php +++ b/lib/l10n/de_DE.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Settings" => "Einstellungen", "Users" => "Benutzer", "Admin" => "Administrator", +"Recommended" => "Empfohlen", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "App »%s« kann nicht installiert werden, da sie mit dieser ownCloud-Version nicht kompatibel ist.", "No app name specified" => "Es wurde kein Applikation-Name angegeben", "Unknown filetype" => "Unbekannter Dateityp", diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php index da3cacfce98..5a3ba3a6c54 100644 --- a/lib/l10n/en_GB.php +++ b/lib/l10n/en_GB.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Settings" => "Settings", "Users" => "Users", "Admin" => "Admin", +"Recommended" => "Recommended", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud.", "No app name specified" => "No app name specified", "Unknown filetype" => "Unknown filetype", diff --git a/lib/l10n/es.php b/lib/l10n/es.php index 04253fc7b0c..553ccd519fd 100644 --- a/lib/l10n/es.php +++ b/lib/l10n/es.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Settings" => "Ajustes", "Users" => "Usuarios", "Admin" => "Administración", +"Recommended" => "Recomendado", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "La aplicación \\\"%s\\\" no se puede instalar porque no es compatible con esta versión de ownCloud.", "No app name specified" => "No se ha especificado nombre de la aplicación", "Unknown filetype" => "Tipo de archivo desconocido", diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php index 8adc51dd118..5dd406ac399 100644 --- a/lib/l10n/et_EE.php +++ b/lib/l10n/et_EE.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Settings" => "Seaded", "Users" => "Kasutajad", "Admin" => "Admin", +"Recommended" => "Soovitatud", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Rakendit \\\"%s\\\" ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga.", "No app name specified" => "Ühegi rakendi nime pole määratletud", "Unknown filetype" => "Tundmatu failitüüp", @@ -50,6 +51,7 @@ $TRANSLATIONS = array( "PostgreSQL username and/or password not valid" => "PostgreSQL kasutajatunnus ja/või parool pole õiged", "Set an admin username." => "Määra admin kasutajanimi.", "Set an admin password." => "Määra admini parool.", +"Can't create or write into the data directory %s" => "Ei suuda luua või kirjutada andmete kataloogi %s", "%s shared »%s« with you" => "%s jagas sinuga »%s«", "Sharing %s failed, because the file does not exist" => "%s jagamine ebaõnnestus, kuna faili pole olemas", "You are not allowed to share %s" => "Sul pole lubatud %s jagada", diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php index b002ab02495..5c9a6442c76 100644 --- a/lib/l10n/fi_FI.php +++ b/lib/l10n/fi_FI.php @@ -10,6 +10,7 @@ $TRANSLATIONS = array( "Settings" => "Asetukset", "Users" => "Käyttäjät", "Admin" => "Ylläpito", +"Recommended" => "Suositeltu", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Sovellusta \\\"%s\\\" ei voi asentaa, koska se ei ole yhteensopiva tämän ownCloud-version kanssa.", "No app name specified" => "Sovelluksen nimeä ei määritelty", "Unknown filetype" => "Tuntematon tiedostotyyppi", diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php index 7c26c973f6f..3e07893f749 100644 --- a/lib/l10n/fr.php +++ b/lib/l10n/fr.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Settings" => "Paramètres", "Users" => "Utilisateurs", "Admin" => "Administration", +"Recommended" => "Recommandé", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "L'application \\\"%s\\\" ne peut pas être installée car elle n'est pas compatible avec cette version de ownCloud.", "No app name specified" => "Aucun nom d'application spécifié", "Unknown filetype" => "Type de fichier inconnu", diff --git a/lib/l10n/it.php b/lib/l10n/it.php index 1d71816d32c..c9eaff8a35c 100644 --- a/lib/l10n/it.php +++ b/lib/l10n/it.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Settings" => "Impostazioni", "Users" => "Utenti", "Admin" => "Admin", +"Recommended" => "Consigliata", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "L'applicazione \\\"%s\\\" non può essere installata poiché non è compatibile con questa versione di ownCloud.", "No app name specified" => "Il nome dell'applicazione non è specificato", "Unknown filetype" => "Tipo di file sconosciuto", diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php index f7a91d2785d..f5a81dd6ee3 100644 --- a/lib/l10n/nl.php +++ b/lib/l10n/nl.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Settings" => "Instellingen", "Users" => "Gebruikers", "Admin" => "Beheerder", +"Recommended" => "Aanbevolen", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "App \\\"%s\\\" kan niet worden geïnstalleerd omdat de app niet compatible is met deze versie van ownCloud.", "No app name specified" => "De app naam is niet gespecificeerd.", "Unknown filetype" => "Onbekend bestandsformaat", diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php index 57152025794..d0dc9078128 100644 --- a/lib/l10n/pt_BR.php +++ b/lib/l10n/pt_BR.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Settings" => "Configurações", "Users" => "Usuários", "Admin" => "Admin", +"Recommended" => "Recomendado", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Aplicação \\\"%s\\\" não pode ser instalada porque não é compatível com esta versão do ownCloud.", "No app name specified" => "O nome do aplicativo não foi especificado.", "Unknown filetype" => "Tipo de arquivo desconhecido", diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php index 6558e3bb02e..c042b6af6cb 100644 --- a/lib/l10n/sv.php +++ b/lib/l10n/sv.php @@ -8,6 +8,7 @@ $TRANSLATIONS = array( "Settings" => "Inställningar", "Users" => "Användare", "Admin" => "Admin", +"Recommended" => "Rekomenderad", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Applikationen \\\"%s\\\" kan inte installeras då en inte är kompatibel med denna version utav ownCloud.", "No app name specified" => "Inget appnamn angivet", "Unknown filetype" => "Okänd filtyp", diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php index aba1e7db1cc..4477efd07cc 100644 --- a/lib/l10n/tr.php +++ b/lib/l10n/tr.php @@ -11,6 +11,7 @@ $TRANSLATIONS = array( "Settings" => "Ayarlar", "Users" => "Kullanıcılar", "Admin" => "Yönetici", +"Recommended" => "Önerilen", "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "ownCloud yazılımının bu sürümü ile uyumlu olmadığı için \\\"%s\\\" uygulaması kurulamaz.", "No app name specified" => "Uygulama adı belirtilmedi", "Unknown filetype" => "Bilinmeyen dosya türü", diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php index 6832b707cb4..45df303d1e9 100644 --- a/lib/l10n/uk.php +++ b/lib/l10n/uk.php @@ -5,6 +5,7 @@ $TRANSLATIONS = array( "Settings" => "Налаштування", "Users" => "Користувачі", "Admin" => "Адмін", +"Recommended" => "Рекомендуємо", "Unknown filetype" => "Невідомий тип файлу", "Invalid image" => "Невірне зображення", "web services under your control" => "підконтрольні Вам веб-сервіси", diff --git a/lib/private/app.php b/lib/private/app.php index faaadef3857..a97db7b5e53 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -92,7 +92,7 @@ class OC_App { if ($checkUpgrade and self::shouldUpgrade($app)) { throw new \OC\NeedsUpdateException(); } - require_once $app . '/appinfo/app.php'; + self::requireAppFile($app); if (self::isType($app, array('authentication'))) { // since authentication apps affect the "is app enabled for group" check, // the enabled apps cache needs to be cleared to make sure that the @@ -104,6 +104,16 @@ class OC_App { } /** + * Load app.php from the given app + * + * @param string $app app name + */ + private static function requireAppFile($app) { + // encapsulated here to avoid variable scope conflicts + require_once $app . '/appinfo/app.php'; + } + + /** * check if an app is of a specific type * * @param string $app diff --git a/lib/private/db/adapter.php b/lib/private/db/adapter.php index 6742ccdbb45..972008776f6 100644 --- a/lib/private/db/adapter.php +++ b/lib/private/db/adapter.php @@ -42,7 +42,7 @@ class Adapter { /** * insert the @input values when they do not exist yet * @param string $table name - * @param array $input key->value pairs + * @param array $input key->value pair, key has to be sanitized properly * @return int count of inserted rows */ public function insertIfNotExist($table, $input) { diff --git a/lib/private/files/objectstore/homeobjectstorestorage.php b/lib/private/files/objectstore/homeobjectstorestorage.php index 947fc496b20..14fc604a7f0 100644 --- a/lib/private/files/objectstore/homeobjectstorestorage.php +++ b/lib/private/files/objectstore/homeobjectstorestorage.php @@ -34,12 +34,6 @@ class HomeObjectStoreStorage extends ObjectStoreStorage implements \OCP\Files\IH } $this->user = $params['user']; parent::__construct($params); - - - //initialize cache with root directory in cache - if ( ! $this->is_dir('files') ) { - $this->mkdir('files'); - } } public function getId () { diff --git a/lib/private/files/objectstore/objectstorestorage.php b/lib/private/files/objectstore/objectstorestorage.php index 241864bcccd..ae8bff52896 100644 --- a/lib/private/files/objectstore/objectstorestorage.php +++ b/lib/private/files/objectstore/objectstorestorage.php @@ -349,7 +349,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common { public function writeBack($tmpFile) { if (!isset(self::$tmpFiles[$tmpFile])) { - return false; + return; } $path = self::$tmpFiles[$tmpFile]; @@ -375,9 +375,8 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common { } catch (\Exception $ex) { $this->getCache()->remove($path); \OCP\Util::writeLog('objectstore', 'Could not create object: ' . $ex->getMessage(), \OCP\Util::ERROR); - return false; + throw $ex; // make this bubble up } - return true; } /** diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php index 58a23924872..417be79ab30 100644 --- a/lib/private/group/manager.php +++ b/lib/private/group/manager.php @@ -48,6 +48,7 @@ class Manager extends PublicEmitter implements IGroupManager { */ private $cachedUserGroups = array(); + /** * @param \OC\User\Manager $userManager */ @@ -180,18 +181,24 @@ class Manager extends PublicEmitter implements IGroupManager { $groups[$groupId] = $this->get($groupId); } } - $this->cachedUserGroups[$uid] = array_values($groups); + $this->cachedUserGroups[$uid] = $groups; return $this->cachedUserGroups[$uid]; } + /** + * get a list of group ids for a user * @param \OC\User\User $user - * @return array with group names + * @return array with group ids */ public function getUserGroupIds($user) { $groupIds = array(); - foreach ($this->backends as $backend) { - $groupIds = array_merge($groupIds, $backend->getUserGroups($user->getUID())); - + $userId = $user->getUID(); + if (isset($this->cachedUserGroups[$userId])) { + return array_keys($this->cachedUserGroups[$userId]); + } else { + foreach ($this->backends as $backend) { + $groupIds = array_merge($groupIds, $backend->getUserGroups($userId)); + } } return $groupIds; } @@ -216,10 +223,9 @@ class Manager extends PublicEmitter implements IGroupManager { if(!empty($search)) { // only user backends have the capability to do a complex search for users $searchOffset = 0; + $searchLimit = $limit * 100; if($limit === -1) { - $searchLimit = $group->count(''); - } else { - $searchLimit = $limit * 2; + $searchLimit = 500; } do { @@ -230,7 +236,7 @@ class Manager extends PublicEmitter implements IGroupManager { } } $searchOffset += $searchLimit; - } while(count($groupUsers) < $searchLimit+$offset && count($filteredUsers) === $searchLimit); + } while(count($groupUsers) < $searchLimit+$offset && count($filteredUsers) >= $searchLimit); if($limit === -1) { $groupUsers = array_slice($groupUsers, $offset); diff --git a/lib/private/helper.php b/lib/private/helper.php index ea91cc57516..823e82ceeb1 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -402,9 +402,10 @@ class OC_Helper { /** * Recursive deletion of folders * @param string $dir path to the folder + * @param bool $deleteSelf if set to false only the content of the folder will be deleted * @return bool */ - static function rmdirr($dir) { + static function rmdirr($dir, $deleteSelf = true) { if (is_dir($dir)) { $files = new RecursiveIteratorIterator( new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS), @@ -419,15 +420,19 @@ class OC_Helper { unlink($fileInfo->getRealPath()); } } - rmdir($dir); + if ($deleteSelf) { + rmdir($dir); + } } elseif (file_exists($dir)) { - unlink($dir); + if ($deleteSelf) { + unlink($dir); + } } - if (file_exists($dir)) { - return false; - } else { + if (!$deleteSelf) { return true; } + + return !file_exists($dir); } /** diff --git a/lib/private/preview.php b/lib/private/preview.php index e9bfb3b9285..f8b19f11cb0 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -814,8 +814,18 @@ class Preview { self::initProviders(); } - foreach (self::$providers as $supportedMimeType => $provider) { - if (preg_match($supportedMimeType, $mimeType)) { + // FIXME: Ugly hack to prevent SVG of being returned if the SVG + // provider is not enabled. + // This is required because the preview system is designed in a + // bad way and relies on opt-in with asterisks (i.e. image/*) + // which will lead to the fact that a SVG will also match the image + // provider. + if($mimeType === 'image/svg+xml' && !array_key_exists('/image\/svg\+xml/', self::$providers)) { + return false; + } + + foreach(self::$providers as $supportedMimetype => $provider) { + if(preg_match($supportedMimetype, $mimeType)) { return true; } } diff --git a/lib/private/repair.php b/lib/private/repair.php index c7db8b2617d..081aeb32c66 100644 --- a/lib/private/repair.php +++ b/lib/private/repair.php @@ -10,6 +10,13 @@ namespace OC; use OC\Hooks\BasicEmitter; use OC\Hooks\Emitter; +use OC\Repair\AssetCache; +use OC\Repair\Collation; +use OC\Repair\InnoDB; +use OC\Repair\RepairConfig; +use OC\Repair\RepairLegacyStorages; +use OC\Repair\RepairMimeTypes; +use OC\Repair\SearchLuceneTables; class Repair extends BasicEmitter { /** @@ -69,9 +76,10 @@ class Repair extends BasicEmitter { */ public static function getRepairSteps() { return array( - new \OC\Repair\RepairMimeTypes(), - new \OC\Repair\RepairLegacyStorages(\OC::$server->getConfig(), \OC_DB::getConnection()), - new \OC\Repair\RepairConfig(), + new RepairMimeTypes(), + new RepairLegacyStorages(\OC::$server->getConfig(), \OC_DB::getConnection()), + new RepairConfig(), + new AssetCache() ); } @@ -83,14 +91,14 @@ class Repair extends BasicEmitter { */ public static function getBeforeUpgradeRepairSteps() { $steps = array( - new \OC\Repair\InnoDB(), - new \OC\Repair\Collation(\OC::$server->getConfig(), \OC_DB::getConnection()), - new \OC\Repair\SearchLuceneTables() + new InnoDB(), + new Collation(\OC::$server->getConfig(), \OC_DB::getConnection()), + new SearchLuceneTables() ); //There is no need to delete all previews on every single update - //only 7.0.0 thru 7.0.2 generated broken previews - $currentVersion = \OC_Config::getValue('version'); + //only 7.0.0 through 7.0.2 generated broken previews + $currentVersion = \OC::$server->getConfig()->getSystemValue('version'); if (version_compare($currentVersion, '7.0.0.0', '>=') && version_compare($currentVersion, '7.0.2.2', '<=')) { $steps[] = new \OC\Repair\Preview(); @@ -102,7 +110,7 @@ class Repair extends BasicEmitter { /** * {@inheritDoc} * - * Redeclared as public to allow invocation from within the closure above in php 5.3 + * Re-declared as public to allow invocation from within the closure above in php 5.3 */ public function emit($scope, $method, $arguments = array()) { parent::emit($scope, $method, $arguments); diff --git a/lib/private/request.php b/lib/private/request.php index fa446837a97..1cfa4a150c5 100755 --- a/lib/private/request.php +++ b/lib/private/request.php @@ -245,7 +245,7 @@ class OC_Request { * @return string Path info or false when not found */ public static function getRawPathInfo() { - $requestUri = $_SERVER['REQUEST_URI']; + $requestUri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : ''; // remove too many leading slashes - can be caused by reverse proxy configuration if (strpos($requestUri, '/') === 0) { $requestUri = '/' . ltrim($requestUri, '/'); diff --git a/lib/private/server.php b/lib/private/server.php index ff34cfdccb6..d2728d2b6ef 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -291,6 +291,8 @@ class Server extends SimpleContainer implements IServerContainer { return null; } $userId = $user->getUID(); + } else { + $user = $this->getUserManager()->get($userId); } $dir = '/' . $userId; $root = $this->getRootFolder(); @@ -305,6 +307,19 @@ class Server extends SimpleContainer implements IServerContainer { $dir = '/files'; if (!$folder->nodeExists($dir)) { $folder = $folder->newFolder($dir); + + if (\OCP\App::isEnabled('files_encryption')) { + // disable encryption proxy to prevent recursive calls + $proxyStatus = \OC_FileProxy::$enabled; + \OC_FileProxy::$enabled = false; + } + + \OC_Util::copySkeleton($user, $folder); + + if (\OCP\App::isEnabled('files_encryption')) { + // re-enable proxy - our work is done + \OC_FileProxy::$enabled = $proxyStatus; + } } else { $folder = $folder->get($dir); } diff --git a/lib/private/template.php b/lib/private/template.php index fce26117ede..fe0cde53ff1 100644 --- a/lib/private/template.php +++ b/lib/private/template.php @@ -198,8 +198,8 @@ class OC_Template extends \OC\Template\Base { * Includes another template. use <?php echo $this->inc('template'); ?> to * do this. */ - public function inc( $file, $additionalparams = null ) { - return $this->load($this->path.$file.'.php', $additionalparams); + public function inc( $file, $additionalParams = null ) { + return $this->load($this->path.$file.'.php', $additionalParams); } /** @@ -277,4 +277,34 @@ class OC_Template extends \OC\Template\Base { $content->printPage(); die(); } + + /** + * @return bool + */ + public static function isAssetPipelineEnabled() { + // asset management enabled? + $useAssetPipeline = \OC::$server->getConfig()->getSystemValue('asset-pipeline.enabled', false); + if (!$useAssetPipeline) { + return false; + } + + // assets folder exists? + $assetDir = \OC::$SERVERROOT . '/assets'; + if (!is_dir($assetDir)) { + if (!mkdir($assetDir)) { + \OCP\Util::writeLog('assets', + "Folder <$assetDir> does not exist and/or could not be generated.", \OCP\Util::ERROR); + return false; + } + } + + // assets folder can be accessed? + if (!touch($assetDir."/.oc")) { + \OCP\Util::writeLog('assets', + "Folder <$assetDir> could not be accessed.", \OCP\Util::ERROR); + return false; + } + return $useAssetPipeline; + } + } diff --git a/lib/private/template/templatefilelocator.php b/lib/private/template/templatefilelocator.php index 4676fceb37d..8e9f3bd8100 100644 --- a/lib/private/template/templatefilelocator.php +++ b/lib/private/template/templatefilelocator.php @@ -24,6 +24,8 @@ class TemplateFileLocator { /** * @param string $template + * @return string + * @throws \Exception */ public function find( $template ) { if ($template === '') { diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index 9f996e19f81..558ddad4af2 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -2,8 +2,10 @@ use Assetic\Asset\AssetCollection; use Assetic\Asset\FileAsset; use Assetic\AssetWriter; -use Assetic\Filter\CssRewriteFilter; use Assetic\Filter\CssImportFilter; +use Assetic\Filter\CssMinFilter; +use Assetic\Filter\CssRewriteFilter; +use Assetic\Filter\JSMinFilter; /** * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl> @@ -17,13 +19,22 @@ class OC_TemplateLayout extends OC_Template { private static $versionHash = ''; /** - * @param string $renderas - * @param string $appid application id + * @var \OCP\IConfig + */ + private $config; + + /** + * @param string $renderAs + * @param string $appId application id */ - public function __construct( $renderas, $appid = '' ) { + public function __construct( $renderAs, $appId = '' ) { + + // yes - should be injected .... + $this->config = \OC::$server->getConfig(); + // Decide which page we show - if( $renderas == 'user' ) { + if( $renderAs == 'user' ) { parent::__construct( 'core', 'layout.user' ); if(in_array(OC_APP::getCurrentApp(), array('settings','admin', 'help'))!==false) { $this->assign('bodyid', 'body-settings'); @@ -32,9 +43,12 @@ class OC_TemplateLayout extends OC_Template { } // Update notification - if(OC_Config::getValue('updatechecker', true) === true) { - $data=OC_Updater::check(); - if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array() && OC_User::isAdminUser(OC_User::getUser())) { + if($this->config->getSystemValue('updatechecker', true) === true && + OC_User::isAdminUser(OC_User::getUser())) { + $updater = new \OC\Updater(); + $data = $updater->check('http://apps.owncloud.com/updater.php'); + + if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array()) { $this->assign('updateAvailable', true); $this->assign('updateVersion', $data['versionstring']); $this->assign('updateLink', $data['web']); @@ -47,7 +61,7 @@ class OC_TemplateLayout extends OC_Template { // Add navigation entry $this->assign( 'application', '', false ); - $this->assign( 'appid', $appid ); + $this->assign( 'appid', $appId ); $navigation = OC_App::getNavigation(); $this->assign( 'navigation', $navigation); $this->assign( 'settingsnavigation', OC_App::getSettingsNavigation()); @@ -57,15 +71,15 @@ class OC_TemplateLayout extends OC_Template { break; } } - $user_displayname = OC_User::getDisplayName(); - $this->assign( 'user_displayname', $user_displayname ); + $userDisplayName = OC_User::getDisplayName(); + $this->assign( 'user_displayname', $userDisplayName ); $this->assign( 'user_uid', OC_User::getUser() ); $this->assign( 'appsmanagement_active', strpos(OC_Request::requestUri(), OC_Helper::linkToRoute('settings_apps')) === 0 ); - $this->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true)); - } else if ($renderas == 'error') { + $this->assign('enableAvatars', $this->config->getSystemValue('enable_avatars', true)); + } else if ($renderAs == 'error') { parent::__construct('core', 'layout.guest', '', false); $this->assign('bodyid', 'body-login'); - } else if ($renderas == 'guest') { + } else if ($renderAs == 'guest') { parent::__construct('core', 'layout.guest'); $this->assign('bodyid', 'body-login'); } else { @@ -76,27 +90,27 @@ class OC_TemplateLayout extends OC_Template { self::$versionHash = md5(implode(',', OC_App::getAppVersions())); } - $useAssetPipeline = $this->isAssetPipelineEnabled(); + $useAssetPipeline = self::isAssetPipelineEnabled(); if ($useAssetPipeline) { $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config', array('v' => self::$versionHash))); $this->generateAssets(); } else { // Add the js files - $jsfiles = self::findJavascriptFiles(OC_Util::$scripts); + $jsFiles = self::findJavascriptFiles(OC_Util::$scripts); $this->assign('jsfiles', array(), false); - if (OC_Config::getValue('installed', false) && $renderas!='error') { + if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') { $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config', array('v' => self::$versionHash))); } - foreach($jsfiles as $info) { + foreach($jsFiles as $info) { $web = $info[1]; $file = $info[2]; $this->append( 'jsfiles', $web.'/'.$file . '?v=' . self::$versionHash); } // Add the css files - $cssfiles = self::findStylesheetFiles(OC_Util::$styles); + $cssFiles = self::findStylesheetFiles(OC_Util::$styles); $this->assign('cssfiles', array()); - foreach($cssfiles as $info) { + foreach($cssFiles as $info) { $web = $info[1]; $file = $info[2]; @@ -113,10 +127,10 @@ class OC_TemplateLayout extends OC_Template { // Read the selected theme from the config file $theme = OC_Util::getTheme(); - // Read the detected formfactor and use the right file name. - $fext = self::getFormFactorExtension(); + // Read the detected form factor and use the right file name. + $formFactorExt = self::getFormFactorExtension(); - $locator = new \OC\Template\CSSResourceLocator( $theme, $fext, + $locator = new \OC\Template\CSSResourceLocator( $theme, $formFactorExt, array( OC::$SERVERROOT => OC::$WEBROOT ), array( OC::$THIRDPARTYROOT => OC::$THIRDPARTYWEBROOT )); $locator->find($styles); @@ -131,26 +145,31 @@ class OC_TemplateLayout extends OC_Template { // Read the selected theme from the config file $theme = OC_Util::getTheme(); - // Read the detected formfactor and use the right file name. - $fext = self::getFormFactorExtension(); + // Read the detected form factor and use the right file name. + $formFactorExt = self::getFormFactorExtension(); - $locator = new \OC\Template\JSResourceLocator( $theme, $fext, + $locator = new \OC\Template\JSResourceLocator( $theme, $formFactorExt, array( OC::$SERVERROOT => OC::$WEBROOT ), array( OC::$THIRDPARTYROOT => OC::$THIRDPARTYWEBROOT )); $locator->find($scripts); return $locator->getResources(); } - public function generateAssets() - { + public function generateAssets() { $jsFiles = self::findJavascriptFiles(OC_Util::$scripts); - $jsHash = self::hashScriptNames($jsFiles); + $jsHash = self::hashFileNames($jsFiles); if (!file_exists("assets/$jsHash.js")) { $jsFiles = array_map(function ($item) { $root = $item[0]; $file = $item[2]; - return new FileAsset($root . '/' . $file, array(), $root, $file); + // no need to minifiy minified files + if (substr($file, -strlen('.min.js')) === '.min.js') { + return new FileAsset($root . '/' . $file, array(), $root, $file); + } + return new FileAsset($root . '/' . $file, array( + new JSMinFilter() + ), $root, $file); }, $jsFiles); $jsCollection = new AssetCollection($jsFiles); $jsCollection->setTargetPath("assets/$jsHash.js"); @@ -160,7 +179,7 @@ class OC_TemplateLayout extends OC_Template { } $cssFiles = self::findStylesheetFiles(OC_Util::$styles); - $cssHash = self::hashScriptNames($cssFiles); + $cssHash = self::hashFileNames($cssFiles); if (!file_exists("assets/$cssHash.css")) { $cssFiles = array_map(function ($item) { @@ -170,12 +189,13 @@ class OC_TemplateLayout extends OC_Template { $sourceRoot = \OC::$SERVERROOT; $sourcePath = substr($assetPath, strlen(\OC::$SERVERROOT)); return new FileAsset( - $assetPath, + $assetPath, array( - new CssRewriteFilter(), + new CssRewriteFilter(), + new CssMinFilter(), new CssImportFilter() ), - $sourceRoot, + $sourceRoot, $sourcePath ); }, $cssFiles); @@ -191,49 +211,33 @@ class OC_TemplateLayout extends OC_Template { } /** - * @param array $files - * @return string + * Converts the absolute filepath to a relative path from \OC::$SERVERROOT + * @param string $filePath Absolute path + * @return string Relative path + * @throws Exception If $filePath is not under \OC::$SERVERROOT */ - private static function hashScriptNames($files) - { - $files = array_map(function ($item) { - $root = $item[0]; - $file = $item[2]; - return $root . '/' . $file; - }, $files); + public static function convertToRelativePath($filePath) { + $relativePath = explode(\OC::$SERVERROOT, $filePath); + if(count($relativePath) !== 2) { + throw new \Exception('$filePath is not under the \OC::$SERVERROOT'); + } - sort($files); - // include the apps' versions hash to invalidate the cached assets - $files[]= self::$versionHash; - return hash('md5', implode('', $files)); + return $relativePath[1]; } /** - * @return bool + * @param array $files + * @return string */ - private function isAssetPipelineEnabled() { - // asset management enabled? - $useAssetPipeline = OC_Config::getValue('asset-pipeline.enabled', false); - if (!$useAssetPipeline) { - return false; - } - // assets folder exists? - $assetDir = \OC::$SERVERROOT . '/assets'; - if (!is_dir($assetDir)) { - if (!mkdir($assetDir)) { - \OCP\Util::writeLog('assets', - "Folder <$assetDir> does not exist and/or could not be generated.", \OCP\Util::ERROR); - return false; - } + private static function hashFileNames($files) { + foreach($files as $i => $file) { + $files[$i] = self::convertToRelativePath($file[0]).'/'.$file[2]; } - // assets folder can be accessed? - if (!touch($assetDir."/.oc")) { - \OCP\Util::writeLog('assets', - "Folder <$assetDir> could not be accessed.", \OCP\Util::ERROR); - return false; - } - return $useAssetPipeline; + sort($files); + // include the apps' versions hash to invalidate the cached assets + $files[] = self::$versionHash; + return hash('md5', implode('', $files)); } } diff --git a/lib/private/util.php b/lib/private/util.php index c0a68c56223..d6515872c5a 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -115,16 +115,6 @@ class OC_Util { return $storage; }); - // copy skeleton for local storage only - if (!isset($objectStore)) { - $userRoot = OC_User::getHome($user); - $userDirectory = $userRoot . '/files'; - if (!is_dir($userDirectory)) { - mkdir($userDirectory, 0755, true); - OC_Util::copySkeleton($userDirectory); - } - } - $userDir = '/' . $user . '/files'; //jail the user into his "home" directory @@ -133,6 +123,9 @@ class OC_Util { $fileOperationProxy = new OC_FileProxy_FileOperations(); OC_FileProxy::register($fileOperationProxy); + //trigger creation of user home and /files folder + \OC::$server->getUserFolder($user); + OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $userDir)); } return true; @@ -208,33 +201,44 @@ class OC_Util { } /** - * copies the user skeleton files into the fresh user home files + * copies the skeleton to the users /files * - * @param string $userDirectory + * @param \OC\User\User $user + * @param \OCP\Files\Folder $userDirectory */ - public static function copySkeleton($userDirectory) { - $skeletonDirectory = OC_Config::getValue('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton'); + public static function copySkeleton(\OC\User\User $user, \OCP\Files\Folder $userDirectory) { + + $skeletonDirectory = \OCP\Config::getSystemValue('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton'); + if (!empty($skeletonDirectory)) { - OC_Util::copyr($skeletonDirectory, $userDirectory); + \OCP\Util::writeLog( + 'files_skeleton', + 'copying skeleton for '.$user->getUID().' from '.$skeletonDirectory.' to '.$userDirectory->getFullPath('/'), + \OCP\Util::DEBUG + ); + self::copyr($skeletonDirectory, $userDirectory); + // update the file cache + $userDirectory->getStorage()->getScanner()->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE); } } /** - * copies a directory recursively + * copies a directory recursively by using streams * * @param string $source - * @param string $target + * @param \OCP\Files\Folder $target * @return void */ - public static function copyr($source, $target) { + public static function copyr($source, \OCP\Files\Folder $target) { $dir = opendir($source); - @mkdir($target); while (false !== ($file = readdir($dir))) { if (!\OC\Files\Filesystem::isIgnoredDir($file)) { if (is_dir($source . '/' . $file)) { - OC_Util::copyr($source . '/' . $file, $target . '/' . $file); + $child = $target->newFolder($file); + self::copyr($source . '/' . $file, $child); } else { - copy($source . '/' . $file, $target . '/' . $file); + $child = $target->newFile($file); + stream_copy_to_stream(fopen($source . '/' . $file,'r'), $child->fopen('w')); } } } diff --git a/lib/repair/assetcache.php b/lib/repair/assetcache.php new file mode 100644 index 00000000000..d7677a10d11 --- /dev/null +++ b/lib/repair/assetcache.php @@ -0,0 +1,30 @@ +<?php +/** + * Copyright (c) 2014 Thomas Müller <deepdiver@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Repair; + +use Doctrine\DBAL\Platforms\MySqlPlatform; +use OC\Hooks\BasicEmitter; + +class AssetCache extends BasicEmitter implements \OC\RepairStep { + + public function getName() { + return 'Clear asset cache after upgrade'; + } + + public function run() { + if (!\OC_Template::isAssetPipelineEnabled()) { + $this->emit('\OC\Repair', 'info', array('Asset pipeline disabled -> nothing to do')); + return; + } + $assetDir = \OC::$SERVERROOT . '/assets'; + \OC_Helper::rmdirr($assetDir, false); + $this->emit('\OC\Repair', 'info', array('Asset cache cleared.')); + } +} + diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php index 93c2ae997f8..3bd242df07d 100644 --- a/settings/l10n/ar.php +++ b/settings/l10n/ar.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "مفعلة", "Authentication error" => "لم يتم التأكد من الشخصية بنجاح", "Your full name has been changed." => "اسمك الكامل تم تغييره.", "Unable to change full name" => "لم يتم التمكن من تغيير اسمك الكامل", @@ -24,6 +25,7 @@ $TRANSLATIONS = array( "Unable to change password" => "لا يمكن تغيير كلمة المرور", "Saved" => "حفظ", "test email settings" => "إعدادات البريد التجريبي", +"If you received this email, the settings seem to be correct." => "تبدوا الاعدادت صحيحة اذا تلقيت هذا البريد الالكتروني", "Email sent" => "تم ارسال البريد الالكتروني", "Are you really sure you want add \"{domain}\" as trusted domain?" => "هل أنت متأكد انك تريد إضافة \"{domain}\" كنطاق موثوق فيه.", "Sending..." => "جاري الارسال ...", @@ -101,6 +103,7 @@ $TRANSLATIONS = array( "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\">رخصة أفيرو العمومية</abbr></a>.", +"by" => "من قبل", "Documentation:" => "التوثيق", "User Documentation" => "كتاب توثيق المستخدم", "Uninstall App" => "أزالة تطبيق", diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php index bc79b9e49b0..6daed3ecf05 100644 --- a/settings/l10n/ast.php +++ b/settings/l10n/ast.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Habilitar", "Authentication error" => "Fallu d'autenticación", "Your full name has been changed." => "Camudóse'l nome completu.", "Unable to change full name" => "Nun pue camudase'l nome completu", @@ -31,6 +32,7 @@ $TRANSLATIONS = array( "Unable to change password" => "Nun pudo camudase la contraseña", "Saved" => "Guardáu", "test email settings" => "probar configuración de corréu", +"If you received this email, the settings seem to be correct." => "Si recibisti esti mensaxe de corréu-e, la to configuración ta correuta.", "Email sent" => "Corréu-e unviáu", "You need to set your user email before being able to send test emails." => "Tienes de configurar la direición de corréu-e enantes de poder unviar mensaxes de prueba.", "Sending..." => "Unviando...", @@ -145,6 +147,7 @@ $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>." => "Desendolcáu pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">códigu fonte</a> ta baxo llicencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"by" => "por", "Documentation:" => "Documentación:", "User Documentation" => "Documentación d'usuariu", "Admin Documentation" => "Documentación p'alministradores", diff --git a/settings/l10n/az.php b/settings/l10n/az.php index 95156f184f1..1241cf06dfe 100644 --- a/settings/l10n/az.php +++ b/settings/l10n/az.php @@ -31,6 +31,7 @@ $TRANSLATIONS = array( "Unable to change password" => "Şifrəni dəyişmək olmur", "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.", "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.", "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?", @@ -93,6 +94,7 @@ $TRANSLATIONS = array( "Encryption" => "Şifrələnmə", "Authentication method" => "Qeydiyyat metodikası", "More" => "Yenə", +"by" => "onunla", "User Documentation" => "İstifadəçi sənədləri", "Admin Documentation" => "İnzibatçı sənədləri", "Uninstall App" => "Proqram təminatını sil", diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php index 82cad890e4e..b8388944756 100644 --- a/settings/l10n/bg_BG.php +++ b/settings/l10n/bg_BG.php @@ -1,5 +1,8 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Включено", +"Not enabled" => "Изключено", +"Recommended" => "Препоръчано", "Authentication error" => "Възникна проблем с идентификацията", "Your full name has been changed." => "Пълното ти име е променено.", "Unable to change full name" => "Неуспешна промяна на пълното име.", @@ -31,6 +34,8 @@ $TRANSLATIONS = array( "Unable to change password" => "Неуспешна смяна на паролата.", "Saved" => "Запис", "test email settings" => "провери имейл настройките", +"If you received this email, the settings seem to be correct." => "Ако си получил този имейл, настройките са правилни.", +"A problem occurred while sending the email. Please revise your settings." => "Настъпи проблем при изпращането на имейла. Моля, провери настройките.", "Email sent" => "Имейлът е изпратен", "You need to set your user email before being able to send test emails." => "Трябва да зададеш своя имейл преди да можеш да изпратиш проверяващи имейли.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Сигурен ли си, че искащ да добавиш \"{domain}\" сигурен домейн?", @@ -146,6 +151,7 @@ $TRANSLATIONS = array( "Credentials" => "Потр. име и парола", "SMTP Username" => "SMTP Потребителско Име", "SMTP Password" => "SMTP Парола", +"Store credentials" => "Запазвай креденциите", "Test email settings" => "Настройки на проверяващия имейл", "Send email" => "Изпрати имейл", "Log" => "Доклад", @@ -154,9 +160,14 @@ $TRANSLATIONS = array( "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>.", +"More apps" => "Още приложения", +"Add your app" => "Добавете Ваше приложение", +"by" => "от", +"licensed" => "лицензирано", "Documentation:" => "Документация:", "User Documentation" => "Потребителска Документация", "Admin Documentation" => "Админ Документация", +"Update to %s" => "Обнови до %s", "Enable only for specific groups" => "Включи само за определени групи", "Uninstall App" => "Премахни Приложението", "Administrator Documentation" => "Административна Документация", diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php index 558510daf3c..e5711e81014 100644 --- a/settings/l10n/bn_BD.php +++ b/settings/l10n/bn_BD.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "কার্যকর", "Authentication error" => "অনুমোদন ঘটিত সমস্যা", "Your full name has been changed." => "আপনার পূর্ণ নাম পরিবর্তন করা হয়েছে।", "Group already exists" => "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান", @@ -22,6 +23,7 @@ $TRANSLATIONS = array( "No user supplied" => "ব্যবহারকারী দেয়া হয়নি", "Saved" => "সংরক্ষণ করা হলো", "test email settings" => "ইমেইল নিয়ামকসমূহ পরীক্ষা করুন", +"If you received this email, the settings seem to be correct." => "এই ইমেইলের অর্থ নিয়ামকসমূহ সঠিক।", "Email sent" => "ই-মেইল পাঠানো হয়েছে", "All" => "সবাই", "Error while disabling app" => "অ্যাপ অকার্যকর করতে সমস্যা দেখা দিয়েছে ", @@ -62,6 +64,7 @@ $TRANSLATIONS = array( "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 href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> এর অধীনে লাইসেন্সকৃত।", +"by" => "কর্তৃক", "User Documentation" => "ব্যবহারকারী সহায়িকা", "Administrator Documentation" => "প্রশাসক সহায়িকা", "Online Documentation" => "অনলাইন সহায়িকা", diff --git a/settings/l10n/bn_IN.php b/settings/l10n/bn_IN.php index 325b868b117..160df13779d 100644 --- a/settings/l10n/bn_IN.php +++ b/settings/l10n/bn_IN.php @@ -2,6 +2,7 @@ $TRANSLATIONS = array( "Saved" => "সংরক্ষিত", "Delete" => "মুছে ফেলা", +"by" => "দ্বারা", "Get the apps to sync your files" => "আপনার ফাইল সিঙ্ক করার অ্যাপ পান", "Cancel" => "বাতিল করা", "Username" => "ইউজারনেম" diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php index 895091738ec..accca49c7fc 100644 --- a/settings/l10n/ca.php +++ b/settings/l10n/ca.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Activat", "Authentication error" => "Error d'autenticació", "Your full name has been changed." => "El vostre nom complet ha canviat.", "Unable to change full name" => "No s'ha pogut canviar el nom complet", @@ -31,6 +32,7 @@ $TRANSLATIONS = array( "Unable to change password" => "No es pot canviar la contrasenya", "Saved" => "Desat", "test email settings" => "prova l'arranjament del correu", +"If you received this email, the settings seem to be correct." => "Si rebeu aquest correu sembla que l'arranjament del correu és correcte.", "Email sent" => "El correu electrónic s'ha enviat", "You need to set your user email before being able to send test emails." => "Heu d'establir un nom d'usuari abans de poder enviar correus de prova.", "Sending..." => "Enviant...", @@ -144,6 +146,8 @@ $TRANSLATIONS = array( "Less" => "Menys", "Version" => "Versió", "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>." => "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"More apps" => "Més aplicacions", +"by" => "per", "Documentation:" => "Documentació:", "User Documentation" => "Documentació d'usuari", "Admin Documentation" => "Documentació d'administrador", diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php index 7f7d43fc05b..31189dc4633 100644 --- a/settings/l10n/cs_CZ.php +++ b/settings/l10n/cs_CZ.php @@ -1,5 +1,8 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Povoleno", +"Not enabled" => "Vypnuto", +"Recommended" => "Doporučeno", "Authentication error" => "Chyba přihlášení", "Your full name has been changed." => "Vaše celé jméno bylo změněno.", "Unable to change full name" => "Nelze změnit celé jméno", @@ -31,6 +34,8 @@ $TRANSLATIONS = array( "Unable to change password" => "Změna hesla se nezdařila", "Saved" => "Uloženo", "test email settings" => "otestovat nastavení e-mailu", +"If you received this email, the settings seem to be correct." => "Pokud jste obdrželi tento e-mail, nastavení se zdají být v pořádku.", +"A problem occurred while sending the email. Please revise your settings." => "Při odesílání e-mailu nastala chyba. Překontrolujte prosím svá nastavení.", "Email sent" => "E-mail odeslán", "You need to set your user email before being able to send test emails." => "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit svou e-mailovou adresu.", "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?", @@ -146,6 +151,7 @@ $TRANSLATIONS = array( "Credentials" => "Přihlašovací údaje", "SMTP Username" => "SMTP uživatelské jméno ", "SMTP Password" => "SMTP heslo", +"Store credentials" => "Ukládat přihlašovací údaje", "Test email settings" => "Otestovat nastavení e-mailu", "Send email" => "Odeslat e-mail", "Log" => "Záznam", @@ -154,9 +160,14 @@ $TRANSLATIONS = array( "Less" => "Méně", "Version" => "Verze", "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>." => "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"More apps" => "Více aplikací", +"Add your app" => "Přidat vlastní aplikaci", +"by" => "sdílí", +"licensed" => "licencováno", "Documentation:" => "Dokumentace:", "User Documentation" => "Uživatelská dokumentace", "Admin Documentation" => "Dokumentace pro administrátory", +"Update to %s" => "Aktualizovat na %s", "Enable only for specific groups" => "Povolit pouze pro vybrané skupiny", "Uninstall App" => "Odinstalovat aplikaci", "Administrator Documentation" => "Dokumentace správce", diff --git a/settings/l10n/cy_GB.php b/settings/l10n/cy_GB.php index 0efe0361c84..e8928d6fc27 100644 --- a/settings/l10n/cy_GB.php +++ b/settings/l10n/cy_GB.php @@ -12,6 +12,7 @@ $TRANSLATIONS = array( "Security Warning" => "Rhybudd Diogelwch", "Please double check the <a href='%s'>installation guides</a>." => "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto.", "Encryption" => "Amgryptiad", +"by" => "gan", "Password" => "Cyfrinair", "New password" => "Cyfrinair newydd", "Email" => "E-bost", diff --git a/settings/l10n/da.php b/settings/l10n/da.php index 0631c6f73af..61f4516f2a9 100644 --- a/settings/l10n/da.php +++ b/settings/l10n/da.php @@ -1,5 +1,8 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Aktiveret", +"Not enabled" => "Slået fra", +"Recommended" => "Anbefalet", "Authentication error" => "Adgangsfejl", "Your full name has been changed." => "Dit fulde navn er blevet ændret.", "Unable to change full name" => "Ikke i stand til at ændre dit fulde navn", @@ -31,6 +34,8 @@ $TRANSLATIONS = array( "Unable to change password" => "Kunne ikke ændre kodeord", "Saved" => "Gemt", "test email settings" => "test e-mailindstillinger", +"If you received this email, the settings seem to be correct." => "Hvis du har modtaget denne e-mail, så lader indstillinger til at være korrekte.", +"A problem occurred while sending the email. Please revise your settings." => "Der opstod en fejl under afsendelse af e-mailen. Gennemse venligst dine indstillinger.", "Email sent" => "E-mail afsendt", "You need to set your user email before being able to send test emails." => "Du skal angive din bruger-e-mail før der kan sendes test-e-mail.", "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?", @@ -146,6 +151,7 @@ $TRANSLATIONS = array( "Credentials" => "Brugeroplysninger", "SMTP Username" => "SMTP Brugernavn", "SMTP Password" => "SMTP Kodeord", +"Store credentials" => "Gem brugeroplysninger", "Test email settings" => "Test e-mail-indstillinger", "Send email" => "Send e-mail", "Log" => "Log", @@ -154,9 +160,14 @@ $TRANSLATIONS = array( "Less" => "Mindre", "Version" => "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"More apps" => "Flere programmer", +"Add your app" => "Tilføj din app", +"by" => "af", +"licensed" => "licenseret", "Documentation:" => "Dokumentation:", "User Documentation" => "Brugerdokumentation", "Admin Documentation" => "Administrator Dokumentation", +"Update to %s" => "Opdatér til %s", "Enable only for specific groups" => "Aktivér kun for udvalgte grupper", "Uninstall App" => "Afinstallér app", "Administrator Documentation" => "Administrator Dokumentation", diff --git a/settings/l10n/de.php b/settings/l10n/de.php index 2756b6da584..240b1c0f63d 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -1,5 +1,8 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Aktiviert", +"Not enabled" => "Nicht aktiviert", +"Recommended" => "Empfohlen", "Authentication error" => "Fehler bei der Anmeldung", "Your full name has been changed." => "Dein vollständiger Name ist geändert worden.", "Unable to change full name" => "Der vollständige Name konnte nicht geändert werden", @@ -31,6 +34,8 @@ $TRANSLATIONS = array( "Unable to change password" => "Passwort konnte nicht geändert werden", "Saved" => "Gespeichert", "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 email. Please revise your settings." => "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfe deine Einstellungen.", "Email sent" => "E-Mail wurde verschickt", "You need to set your user email before being able to send test emails." => "Du musst zunächst deine Benutzer-E-Mail-Adresse setzen, bevor du Test-E-Mail verschicken kannst.", "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?", @@ -146,6 +151,7 @@ $TRANSLATIONS = array( "Credentials" => "Zugangsdaten", "SMTP Username" => "SMTP Benutzername", "SMTP Password" => "SMTP Passwort", +"Store credentials" => "Anmeldeinformationen speichern", "Test email settings" => "Teste E-Mail-Einstellungen", "Send email" => "Sende E-Mail", "Log" => "Log", @@ -154,9 +160,14 @@ $TRANSLATIONS = array( "Less" => "Weniger", "Version" => "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.", +"More apps" => "Mehr Apps", +"Add your app" => "Fügen Sie Ihre App hinzu", +"by" => "von", +"licensed" => "Lizenziert", "Documentation:" => "Dokumentation:", "User Documentation" => "Dokumentation für Benutzer", "Admin Documentation" => "Admin-Dokumentation", +"Update to %s" => "Aktualisierung auf %s", "Enable only for specific groups" => "Nur für spezifizierte Gruppen aktivieren", "Uninstall App" => "App deinstallieren", "Administrator Documentation" => "Dokumentation für Administratoren", diff --git a/settings/l10n/de_AT.php b/settings/l10n/de_AT.php index 2f4be525fe2..f82d87ef739 100644 --- a/settings/l10n/de_AT.php +++ b/settings/l10n/de_AT.php @@ -6,6 +6,8 @@ $TRANSLATIONS = array( "__language_name__" => "Deutsch (Österreich)", "Server address" => "Adresse des Servers", "Port" => "Port", +"More apps" => "Mehr Apps", +"by" => "von", "Password" => "Passwort", "Email" => "E-Mail", "Cancel" => "Abbrechen", diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php index 0139b3b0970..f6e38644691 100644 --- a/settings/l10n/de_CH.php +++ b/settings/l10n/de_CH.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Aktiviert", "Authentication error" => "Authentifizierungs-Fehler", "Group already exists" => "Die Gruppe existiert bereits", "Unable to add group" => "Die Gruppe konnte nicht angelegt werden", @@ -62,6 +63,8 @@ $TRANSLATIONS = array( "Less" => "Weniger", "Version" => "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.", +"More apps" => "Mehr Apps", +"by" => "von", "User Documentation" => "Dokumentation für Benutzer", "Administrator Documentation" => "Dokumentation für Administratoren", "Online Documentation" => "Online-Dokumentation", diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php index 8760da2006e..563a99ec364 100644 --- a/settings/l10n/de_DE.php +++ b/settings/l10n/de_DE.php @@ -1,5 +1,8 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Aktiviert", +"Not enabled" => "Nicht aktiviert", +"Recommended" => "Empfohlen", "Authentication error" => "Authentifizierungs-Fehler", "Your full name has been changed." => "Ihr vollständiger Name ist geändert worden.", "Unable to change full name" => "Der vollständige Name konnte nicht geändert werden", @@ -31,6 +34,8 @@ $TRANSLATIONS = array( "Unable to change password" => "Passwort konnte nicht geändert werden", "Saved" => "Gespeichert", "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, scheinen die Einstellungen richtig zu sein.", +"A problem occurred while sending the email. Please revise your settings." => "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfen Sie Ihre Einstellungen.", "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.", "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?", @@ -146,6 +151,7 @@ $TRANSLATIONS = array( "Credentials" => "Zugangsdaten", "SMTP Username" => "SMTP Benutzername", "SMTP Password" => "SMTP Passwort", +"Store credentials" => "Anmeldeinformationen speichern", "Test email settings" => "E-Mail-Einstellungen testen", "Send email" => "E-Mail senden", "Log" => "Log", @@ -154,9 +160,14 @@ $TRANSLATIONS = array( "Less" => "Weniger", "Version" => "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.", +"More apps" => "Mehr Apps", +"Add your app" => "Füge Deine App hinzu", +"by" => "von", +"licensed" => "Lizenziert", "Documentation:" => "Dokumentation:", "User Documentation" => "Dokumentation für Benutzer", "Admin Documentation" => "Dokumentation für Administratoren", +"Update to %s" => "Aktualisierung auf %s", "Enable only for specific groups" => "Nur für bestimmte Gruppen aktivieren", "Uninstall App" => "App deinstallieren", "Administrator Documentation" => "Dokumentation für Administratoren", diff --git a/settings/l10n/el.php b/settings/l10n/el.php index 20e5279c0af..93115ef2178 100644 --- a/settings/l10n/el.php +++ b/settings/l10n/el.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Ενεργοποιημένο", "Authentication error" => "Σφάλμα πιστοποίησης", "Your full name has been changed." => "Το πλήρες όνομά σας άλλαξε.", "Unable to change full name" => "Δεν ήταν δυνατή η αλλαγή του πλήρους ονόματός σας", @@ -31,6 +32,7 @@ $TRANSLATIONS = array( "Unable to change password" => "Αδυναμία αλλαγής συνθηματικού", "Saved" => "Αποθηκεύτηκαν", "test email settings" => "δοκιμή ρυθμίσεων email", +"If you received this email, the settings seem to be correct." => "Εάν λάβατε αυτό το email, οι ρυθμίσεις δείχνουν να είναι σωστές.", "Email sent" => "Το Email απεστάλη ", "You need to set your user email before being able to send test emails." => "Πρέπει να ορίσετε το email του χρήστη πριν να είστε σε θέση να στείλετε δοκιμαστικά emails.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Είστε πραγματικά σίγουροι ότι θέλετε να προσθέσετε το \"{domain}\" σαν αξιόπιστη περιοχή;", @@ -154,6 +156,7 @@ $TRANSLATIONS = array( "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>.", +"by" => "από", "Documentation:" => "Τεκμηρίωση:", "User Documentation" => "Τεκμηρίωση Χρήστη", "Admin Documentation" => "Τεκμηρίωση Διαχειριστή", diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php index 942b51d2002..321e652649e 100644 --- a/settings/l10n/en_GB.php +++ b/settings/l10n/en_GB.php @@ -1,5 +1,8 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Enabled", +"Not enabled" => "Not enabled", +"Recommended" => "Recommended", "Authentication error" => "Authentication error", "Your full name has been changed." => "Your full name has been changed.", "Unable to change full name" => "Unable to change full name", @@ -31,6 +34,8 @@ $TRANSLATIONS = array( "Unable to change password" => "Unable to change password", "Saved" => "Saved", "test email settings" => "test email settings", +"If you received this email, the settings seem to be correct." => "If you received this email, the settings seem to be correct.", +"A problem occurred while sending the email. Please revise your settings." => "A problem occurred whilst sending the email. Please revise your settings.", "Email sent" => "Email sent", "You need to set your user email before being able to send test emails." => "You need to set your user email before being able to send test emails.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Are you really sure you want add \"{domain}\" as a trusted domain?", @@ -146,6 +151,7 @@ $TRANSLATIONS = array( "Credentials" => "Credentials", "SMTP Username" => "SMTP Username", "SMTP Password" => "SMTP Password", +"Store credentials" => "Store credentials", "Test email settings" => "Test email settings", "Send email" => "Send email", "Log" => "Log", @@ -154,9 +160,14 @@ $TRANSLATIONS = array( "Less" => "Less", "Version" => "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "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 Licence\">AGPL</abbr></a>.", +"More apps" => "More apps", +"Add your app" => "Add your app", +"by" => "by", +"licensed" => "licensed", "Documentation:" => "Documentation:", "User Documentation" => "User Documentation", "Admin Documentation" => "Admin Documentation", +"Update to %s" => "Update to %s", "Enable only for specific groups" => "Enable only for specific groups", "Uninstall App" => "Uninstall App", "Administrator Documentation" => "Administrator Documentation", diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php index ddfa33a6f6a..3d8fac31ef0 100644 --- a/settings/l10n/eo.php +++ b/settings/l10n/eo.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Kapabligita", "Authentication error" => "Aŭtentiga eraro", "Your full name has been changed." => "Via plena nomo ŝanĝitas.", "Unable to change full name" => "Ne eblis ŝanĝi la plenan nomon", @@ -96,6 +97,7 @@ $TRANSLATIONS = array( "Less" => "Malpli", "Version" => "Eldono", "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>." => "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"by" => "de", "Documentation:" => "Dokumentaro:", "User Documentation" => "Dokumentaro por uzantoj", "Admin Documentation" => "Administra dokumentaro", diff --git a/settings/l10n/es.php b/settings/l10n/es.php index 1a7ad06db4a..7cd822bff53 100644 --- a/settings/l10n/es.php +++ b/settings/l10n/es.php @@ -1,5 +1,8 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Habilitar", +"Not enabled" => "No habilitado", +"Recommended" => "Recomendado", "Authentication error" => "Error de autenticación", "Your full name has been changed." => "Se ha cambiado su nombre completo.", "Unable to change full name" => "No se puede cambiar el nombre completo", @@ -30,7 +33,9 @@ $TRANSLATIONS = array( "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", "Saved" => "Guardado", -"test email settings" => "probar configuración de correo", +"test email settings" => "probar configuración de correo electrónico", +"If you received this email, the settings seem to be correct." => "Si recibió este mensaje de correo electrónico, su configuración debe estar correcta.", +"A problem occurred while sending the email. Please revise your settings." => "Ocurrió un problema al mandar el mensaje. Revise la configuración.", "Email sent" => "Correo electrónico enviado", "You need to set your user email before being able to send test emails." => "Tiene que configurar su dirección de correo electrónico antes de poder enviar mensajes de prueba.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "¿Está seguro de querer agregar \"{domain}\" como un dominio de confianza?", @@ -146,6 +151,7 @@ $TRANSLATIONS = array( "Credentials" => "Credenciales", "SMTP Username" => "Nombre de usuario SMTP", "SMTP Password" => "Contraseña SMTP", +"Store credentials" => "Almacenar credenciales", "Test email settings" => "Probar configuración de correo electrónico", "Send email" => "Enviar mensaje", "Log" => "Registro", @@ -154,9 +160,14 @@ $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>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"More apps" => "Más aplicaciones", +"Add your app" => "Agregue su aplicación", +"by" => "por", +"licensed" => "licenciado", "Documentation:" => "Documentación:", "User Documentation" => "Documentación de usuario", "Admin Documentation" => "Documentación para administradores", +"Update to %s" => "Actualizado a %s", "Enable only for specific groups" => "Activar solamente para grupos específicos", "Uninstall App" => "Desinstalar aplicación", "Administrator Documentation" => "Documentación de administrador", diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php index 5262fdf249e..6bb1c20f38a 100644 --- a/settings/l10n/es_AR.php +++ b/settings/l10n/es_AR.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Habilitado", "Authentication error" => "Error al autenticar", "Your full name has been changed." => "Su nombre completo ha sido cambiado.", "Unable to change full name" => "Imposible cambiar el nombre completo", @@ -24,6 +25,7 @@ $TRANSLATIONS = array( "Unable to change password" => "Imposible cambiar la contraseña", "Saved" => "Guardado", "test email settings" => "Configuración de correo de prueba.", +"If you received this email, the settings seem to be correct." => "Si recibió este correo, la configuración parece estar correcta.", "Email sent" => "e-mail mandado", "You need to set your user email before being able to send test emails." => "Necesita especificar el usuario de correo electrónico antes de poder enviar correos electrónicos de prueba.", "Sending..." => "Enviando...", @@ -110,6 +112,7 @@ $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>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"by" => "por", "Documentation:" => "Documentación:", "User Documentation" => "Documentación de Usuario", "Admin Documentation" => "Documentación de Administrador.", diff --git a/settings/l10n/es_MX.php b/settings/l10n/es_MX.php index 96352aa5ed8..600b804d827 100644 --- a/settings/l10n/es_MX.php +++ b/settings/l10n/es_MX.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Habilitar", "Authentication error" => "Error de autenticación", "Your full name has been changed." => "Se ha cambiado su nombre completo.", "Unable to change full name" => "No se puede cambiar el nombre completo", @@ -83,6 +84,7 @@ $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>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"by" => "por", "User Documentation" => "Documentación de usuario", "Administrator Documentation" => "Documentación de administrador", "Online Documentation" => "Documentación en línea", diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php index 1256d74e24d..d1515065bc4 100644 --- a/settings/l10n/et_EE.php +++ b/settings/l10n/et_EE.php @@ -1,5 +1,8 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Sisse lülitatud", +"Not enabled" => "Pole sisse lülitatud", +"Recommended" => "Soovitatud", "Authentication error" => "Autentimise viga", "Your full name has been changed." => "Sinu täispikk nimi on muudetud.", "Unable to change full name" => "Täispika nime muutmine ebaõnnestus", @@ -31,6 +34,8 @@ $TRANSLATIONS = array( "Unable to change password" => "Ei suuda parooli muuta", "Saved" => "Salvestatud", "test email settings" => "testi e-posti seadeid", +"If you received this email, the settings seem to be correct." => "Kui said selle kirja, siis on seadistus korrektne.", +"A problem occurred while sending the email. Please revise your settings." => "Kirja saatmisel tekkis tõrge. Palun kontrolli üle oma seadistus.", "Email sent" => "E-kiri on saadetud", "You need to set your user email before being able to send test emails." => "Pead seadistama oma e-postienne kui on võimalik saata test-kirju.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Oled sa kindel, et soovid lisada domeeni \"{domain}\" usaldusväärseks domeeniks?", @@ -105,6 +110,8 @@ $TRANSLATIONS = array( "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.", "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\")", +"Connectivity checks" => "Ühenduse kontrollimine", +"No problems found" => "Ühtegi probleemi ei leitud", "Please double check the <a href='%s'>installation guides</a>." => "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.", "Cron" => "Cron", "Last cron was executed at %s." => "Cron käivitati viimati %s.", @@ -144,6 +151,7 @@ $TRANSLATIONS = array( "Credentials" => "Kasutajatunnused", "SMTP Username" => "SMTP kasutajatunnus", "SMTP Password" => "SMTP parool", +"Store credentials" => "Säilita kasutajaandmed", "Test email settings" => "Testi e-posti seadeid", "Send email" => "Saada kiri", "Log" => "Logi", @@ -152,9 +160,14 @@ $TRANSLATIONS = array( "Less" => "Vähem", "Version" => "Versioon", "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>." => "Arendatud <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kogukonna</a> poolt. <a href=\"https://github.com/owncloud\" target=\"_blank\">Lähtekood</a> on avaldatud ja kaetud <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> litsentsiga.", +"More apps" => "Rohkem rakendusi", +"Add your app" => "Lisa oma rakendus", +"by" => "lisas", +"licensed" => "litsenseeritud", "Documentation:" => "Dokumentatsioon:", "User Documentation" => "Kasutaja dokumentatsioon", "Admin Documentation" => "Admin dokumentatsioon", +"Update to %s" => "Uuenda versioonile %s", "Enable only for specific groups" => "Luba ainult kindlad grupid", "Uninstall App" => "Eemada rakend", "Administrator Documentation" => "Administraatori dokumentatsioon", diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php index 1c2153d24ac..fe62796e1ac 100644 --- a/settings/l10n/eu.php +++ b/settings/l10n/eu.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Gaitua", "Authentication error" => "Autentifikazio errorea", "Your full name has been changed." => "Zure izena aldatu egin da.", "Unable to change full name" => "Ezin izan da izena aldatu", @@ -31,6 +32,7 @@ $TRANSLATIONS = array( "Unable to change password" => "Ezin izan da pasahitza aldatu", "Saved" => "Gordeta", "test email settings" => "probatu eposta ezarpenak", +"If you received this email, the settings seem to be correct." => "Eposta hau jaso baduzu, zure ezarpenak egokiak direnaren seinale", "Email sent" => "Eposta bidalia", "You need to set your user email before being able to send test emails." => "Epostaren erabiltzailea zehaztu behar duzu probako eposta bidali aurretik.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Ziur zaude gehitu nahi duzula \"{domain}\" domeinu fidagarri gisa?", @@ -151,6 +153,8 @@ $TRANSLATIONS = array( "Less" => "Gutxiago", "Version" => "Bertsioa", "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 komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.", +"More apps" => "App gehiago", +"by" => " Egilea:", "Documentation:" => "Dokumentazioa:", "User Documentation" => "Erabiltzaile dokumentazioa", "Admin Documentation" => "Administrazio dokumentazioa", diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php index 840de096558..b964c18c51a 100644 --- a/settings/l10n/fa.php +++ b/settings/l10n/fa.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "فعال شده", "Authentication error" => "خطا در اعتبار سنجی", "Your full name has been changed." => "نام کامل شما تغییر یافت", "Unable to change full name" => "امکان تغییر نام کامل وجود ندارد", @@ -127,6 +128,7 @@ $TRANSLATIONS = array( "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>, the <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>.", +"by" => "با", "Documentation:" => "مستند سازی:", "User Documentation" => "مستندات کاربر", "Admin Documentation" => "مستند سازی مدیر", diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php index e5c1ce516c0..e82bc039f22 100644 --- a/settings/l10n/fi_FI.php +++ b/settings/l10n/fi_FI.php @@ -1,5 +1,8 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Käytössä", +"Not enabled" => "Ei käytössä", +"Recommended" => "Suositeltu", "Authentication error" => "Tunnistautumisvirhe", "Your full name has been changed." => "Koko nimesi on muutettu.", "Unable to change full name" => "Koko nimen muuttaminen epäonnistui", @@ -31,6 +34,8 @@ $TRANSLATIONS = array( "Unable to change password" => "Salasanan vaihto ei onnistunut", "Saved" => "Tallennettu", "test email settings" => "testaa sähköpostiasetukset", +"If you received this email, the settings seem to be correct." => "Jos sait tämän sähköpostin, kaikki asetukset vaikuttavat olevan kunnossa.", +"A problem occurred while sending the email. Please revise your settings." => "Sähköpostia lähettäessä tapahtui virhe. Tarkista asetukset.", "Email sent" => "Sähköposti lähetetty", "You need to set your user email before being able to send test emails." => "Aseta sähköpostiosoite, jotta voit testata sähköpostin toimivuutta.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Haluatko varmasti liittää kohteen \"{domain}\" luotetuksi toimialueeksi?", @@ -138,6 +143,7 @@ $TRANSLATIONS = array( "Credentials" => "Tilitiedot", "SMTP Username" => "SMTP-käyttäjätunnus", "SMTP Password" => "SMTP-salasana", +"Store credentials" => "Säilytä tilitiedot", "Test email settings" => "Testaa sähköpostiasetukset", "Send email" => "Lähetä sähköpostiviesti", "Log" => "Loki", @@ -146,9 +152,14 @@ $TRANSLATIONS = array( "Less" => "Vähemmän", "Version" => "Versio", "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>." => "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.", +"More apps" => "Lisää sovelluksia", +"Add your app" => "Lisää sovelluksesi", +"by" => " Kirjoittaja:", +"licensed" => "lisensoitu", "Documentation:" => "Ohjeistus:", "User Documentation" => "Käyttäjäohjeistus", "Admin Documentation" => "Ylläpitäjän ohjeistus", +"Update to %s" => "Päivitä versioon %s", "Enable only for specific groups" => "Salli vain tietyille ryhmille", "Uninstall App" => "Poista sovelluksen asennus", "Administrator Documentation" => "Ylläpito-ohjeistus", diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php index a498030a15e..e4931523d8f 100644 --- a/settings/l10n/fr.php +++ b/settings/l10n/fr.php @@ -1,5 +1,8 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Activer", +"Not enabled" => "Désactivé", +"Recommended" => "Recommandé", "Authentication error" => "Erreur d'authentification", "Your full name has been changed." => "Votre nom complet a été modifié.", "Unable to change full name" => "Impossible de changer le nom complet", @@ -31,6 +34,8 @@ $TRANSLATIONS = array( "Unable to change password" => "Impossible de modifier le mot de passe", "Saved" => "Sauvegardé", "test email settings" => "tester les paramètres d'e-mail", +"If you received this email, the settings seem to be correct." => "Si vous recevez cet email, c'est que les paramètres sont corrects", +"A problem occurred while sending the email. Please revise your settings." => "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez vérifier vos paramètres.", "Email sent" => "Email envoyé", "You need to set your user email before being able to send test emails." => "Vous devez configurer votre e-mail d'utilisateur avant de pouvoir envoyer des e-mails de test.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?", @@ -146,6 +151,7 @@ $TRANSLATIONS = array( "Credentials" => "Informations d'identification", "SMTP Username" => "Nom d'utilisateur SMTP", "SMTP Password" => "Mot de passe SMTP", +"Store credentials" => "Identifiants du magasin", "Test email settings" => "Tester les paramètres e-mail", "Send email" => "Envoyer un e-mail", "Log" => "Log", @@ -154,9 +160,14 @@ $TRANSLATIONS = array( "Less" => "Moins", "Version" => "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"More apps" => "Plus d'applications", +"Add your app" => "Ajouter votre application", +"by" => "par", +"licensed" => "Sous licence", "Documentation:" => "Documentation :", "User Documentation" => "Documentation utilisateur", "Admin Documentation" => "Documentation administrateur", +"Update to %s" => "Mise à jour jusqu'à %s", "Enable only for specific groups" => "Activer uniquement pour certains groupes", "Uninstall App" => "Désinstaller l'application", "Administrator Documentation" => "Documentation administrateur", diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php index c2fac946544..6886b876ed8 100644 --- a/settings/l10n/gl.php +++ b/settings/l10n/gl.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Activado", "Authentication error" => "Produciuse un erro de autenticación", "Your full name has been changed." => "O seu nome completo foi cambiado", "Unable to change full name" => "Non é posíbel cambiar o nome completo", @@ -31,6 +32,7 @@ $TRANSLATIONS = array( "Unable to change password" => "Non é posíbel cambiar o contrasinal", "Saved" => "Gardado", "test email settings" => "correo de proba dos axustes", +"If you received this email, the settings seem to be correct." => "Se recibiu este correo, semella que a configuración é correcta.", "Email sent" => "Correo enviado", "You need to set your user email before being able to send test emails." => "É necesario configurar o correo do usuario antes de poder enviar mensaxes de correo de proba.", "Sending..." => "Enviando...", @@ -149,6 +151,8 @@ $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>.", +"More apps" => "Máis aplicativos", +"by" => "por", "Documentation:" => "Documentación:", "User Documentation" => "Documentación do usuario", "Admin Documentation" => "Documentación do administrador", diff --git a/settings/l10n/he.php b/settings/l10n/he.php index e761cead850..8974c1fb1e1 100644 --- a/settings/l10n/he.php +++ b/settings/l10n/he.php @@ -55,6 +55,8 @@ $TRANSLATIONS = array( "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>.", +"More apps" => "יישומים נוספים", +"by" => "על ידי", "User Documentation" => "תיעוד משתמש", "Administrator Documentation" => "תיעוד מנהלים", "Online Documentation" => "תיעוד מקוון", diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php index d37f8beccf2..1fe1adb36a0 100644 --- a/settings/l10n/hr.php +++ b/settings/l10n/hr.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Aktivirano", "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.", @@ -31,6 +32,7 @@ $TRANSLATIONS = array( "Unable to change password" => "Promjena lozinke nije moguća", "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.", "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.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Jeste li doista sigurni da želite dodati \"{domain}\" kao pouzdanu domenu?", @@ -152,6 +154,7 @@ $TRANSLATIONS = array( "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.", +"by" => "od strane", "Documentation:" => "Dokumentacija:", "User Documentation" => "Korisnička dokumentacija", "Admin Documentation" => "Admin dokumentacija", diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php index 2f1d9db9e85..a404340941c 100644 --- a/settings/l10n/hu_HU.php +++ b/settings/l10n/hu_HU.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Bekapcsolva", "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", @@ -31,6 +32,7 @@ $TRANSLATIONS = array( "Unable to change password" => "Nem sikerült megváltoztatni a jelszót", "Saved" => "Elmentve", "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.", "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.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Biztos abban, hogy hozzá akarja adni \"{domain}\"-t a megbízható tartományokhoz?", @@ -151,6 +153,7 @@ $TRANSLATIONS = array( "Less" => "Kevesebb", "Version" => "Verzió", "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 programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud közösség</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forráskód</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltételei mellett használható föl.", +"by" => "közreadta:", "Documentation:" => "Leírások:", "User Documentation" => "Felhasználói leírás", "Admin Documentation" => "Adminisztrátori leírás", diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php index b2f50db8cb6..f348af78212 100644 --- a/settings/l10n/ia.php +++ b/settings/l10n/ia.php @@ -16,6 +16,7 @@ $TRANSLATIONS = array( "Security Warning" => "Aviso de securitate", "Log" => "Registro", "More" => "Plus", +"by" => "per", "Get the apps to sync your files" => "Obtene le apps (applicationes) pro synchronizar tu files", "Password" => "Contrasigno", "Unable to change your password" => "Non pote cambiar tu contrasigno", diff --git a/settings/l10n/id.php b/settings/l10n/id.php index 08544547ddd..441586a0f1a 100644 --- a/settings/l10n/id.php +++ b/settings/l10n/id.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Diaktifkan", "Authentication error" => "Galat saat autentikasi", "Your full name has been changed." => "Nama lengkap Anda telah diubah", "Unable to change full name" => "Tidak dapat mengubah nama lengkap", @@ -22,6 +23,7 @@ $TRANSLATIONS = array( "Unable to change password" => "Tidak dapat mengubah sandi", "Saved" => "Disimpan", "test email settings" => "pengaturan email percobaan", +"If you received this email, the settings seem to be correct." => "Jika Anda menerma email ini, pengaturan tampaknya sudah benar.", "Email sent" => "Email terkirim", "You need to set your user email before being able to send test emails." => "Anda perlu menetapkan email pengguna Anda sebelum dapat mengirim email percobaan.", "Sending..." => "Mengirim", @@ -108,6 +110,7 @@ $TRANSLATIONS = array( "Less" => "Ciutkan", "Version" => "Versi", "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>." => "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"by" => "oleh", "Documentation:" => "Dokumentasi:", "User Documentation" => "Dokumentasi Pengguna", "Admin Documentation" => "Dokumentasi Admin", diff --git a/settings/l10n/is.php b/settings/l10n/is.php index b28a15cf903..263926500d5 100644 --- a/settings/l10n/is.php +++ b/settings/l10n/is.php @@ -32,6 +32,7 @@ $TRANSLATIONS = array( "Less" => "Minna", "Version" => "Útgáfa", "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>." => "Þróað af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfélaginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kóðinn</a> er skráðu með <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"by" => "af", "User Documentation" => "Notenda handbók", "Administrator Documentation" => "Stjórnenda handbók", "Online Documentation" => "Handbók á netinu", diff --git a/settings/l10n/it.php b/settings/l10n/it.php index d140819e454..9b523c87ff3 100644 --- a/settings/l10n/it.php +++ b/settings/l10n/it.php @@ -1,5 +1,8 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Abilitata", +"Not enabled" => "Non abilitata", +"Recommended" => "Consigliata", "Authentication error" => "Errore di autenticazione", "Your full name has been changed." => "Il tuo nome completo è stato cambiato.", "Unable to change full name" => "Impossibile cambiare il nome completo", @@ -31,6 +34,8 @@ $TRANSLATIONS = array( "Unable to change password" => "Impossibile cambiare la password", "Saved" => "Salvato", "test email settings" => "prova impostazioni email", +"If you received this email, the settings seem to be correct." => "Se hai ricevuto questa email, le impostazioni dovrebbero essere corrette.", +"A problem occurred while sending the email. Please revise your settings." => "Si è verificato un problema durante l'invio dell'email. Controlla le tue impostazioni.", "Email sent" => "Email inviata", "You need to set your user email before being able to send test emails." => "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio delle email.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Sei sicuro di voler aggiungere \"{domain}\" come dominio attendibile?", @@ -146,6 +151,7 @@ $TRANSLATIONS = array( "Credentials" => "Credenziali", "SMTP Username" => "Nome utente SMTP", "SMTP Password" => "Password SMTP", +"Store credentials" => "Memorizza le credenziali", "Test email settings" => "Prova impostazioni email", "Send email" => "Invia email", "Log" => "Log", @@ -154,9 +160,14 @@ $TRANSLATIONS = array( "Less" => "Meno", "Version" => "Versione", "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>." => "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è rilasciato nei termini della licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"More apps" => "Altre applicazioni", +"Add your app" => "Aggiungi la tua applicazione", +"by" => "di", +"licensed" => "sotto licenza", "Documentation:" => "Documentazione:", "User Documentation" => "Documentazione utente", "Admin Documentation" => "Documentazione di amministrazione", +"Update to %s" => "Aggiornato a %s", "Enable only for specific groups" => "Abilita solo per gruppi specifici", "Uninstall App" => "Disinstalla applicazione", "Administrator Documentation" => "Documentazione amministratore", diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php index c3a828206dc..9d70f721c38 100644 --- a/settings/l10n/ja.php +++ b/settings/l10n/ja.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "有効", "Authentication error" => "認証エラー", "Your full name has been changed." => "名前を変更しました。", "Unable to change full name" => "名前を変更できません", @@ -31,6 +32,7 @@ $TRANSLATIONS = array( "Unable to change password" => "パスワードを変更できません", "Saved" => "保存されました", "test email settings" => "メール設定をテスト", +"If you received this email, the settings seem to be correct." => "このメールを受け取ったら、設定は正しいはずです。", "Email sent" => "メールを送信しました", "You need to set your user email before being able to send test emails." => "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。", "Are you really sure you want add \"{domain}\" as trusted domain?" => "\"{domain}\" を信頼するドメインに追加してもよろしいでしょうか？", @@ -154,6 +156,8 @@ $TRANSLATIONS = array( "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> ライセンスの下で提供されています。", +"More apps" => "他のアプリ", +"by" => "により", "Documentation:" => "ドキュメント:", "User Documentation" => "ユーザードキュメント", "Admin Documentation" => "管理者ドキュメント", diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php index bea73e94943..f59e85d144d 100644 --- a/settings/l10n/ka_GE.php +++ b/settings/l10n/ka_GE.php @@ -56,6 +56,7 @@ $TRANSLATIONS = array( "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 community</a>–ის მიერ. <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> ვრცელდება <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ლიცენზიის ფარგლებში.", +"by" => "მიერ", "User Documentation" => "მომხმარებლის დოკუმენტაცია", "Administrator Documentation" => "ადმინისტრატორის დოკუმენტაცია", "Online Documentation" => "ონლაინ დოკუმენტაცია", diff --git a/settings/l10n/km.php b/settings/l10n/km.php index 74df3711c0d..67703a0ed2d 100644 --- a/settings/l10n/km.php +++ b/settings/l10n/km.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "បានបើក", "Authentication error" => "កំហុសការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវ", "Group already exists" => "មានក្រុមនេះរួចហើយ", "Unable to add group" => "មិនអាចបន្ថែមក្រុម", @@ -16,6 +17,7 @@ $TRANSLATIONS = array( "Wrong password" => "ខុសពាក្យសម្ងាត់", "Saved" => "បានរក្សាទុក", "test email settings" => "សាកល្បងការកំណត់អ៊ីមែល", +"If you received this email, the settings seem to be correct." => "ប្រសិនបើអ្នកទទួលបានអ៊ីមែលនេះ មានន័យថាការកំណត់គឺបានត្រឹមមត្រូវហើយ។", "Email sent" => "បានផ្ញើអ៊ីមែល", "You need to set your user email before being able to send test emails." => "អ្នកត្រូវតែកំណត់អ៊ីមែលរបស់អ្នកមុននឹងអាចផ្ញើអ៊ីមែលសាកល្បងបាន។", "Sending..." => "កំពុងផ្ញើ...", @@ -71,6 +73,7 @@ $TRANSLATIONS = array( "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\">source code</a> គឺស្ថិតក្នុងអាជ្ញាប័ណ្ណ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>។", +"by" => "ដោយ", "User Documentation" => "ឯកសារសម្រាប់អ្នកប្រើប្រាស់", "Admin Documentation" => "កម្រងឯកសារអភិបាល", "Administrator Documentation" => "ឯកសារសម្រាប់អ្នកគ្រប់គ្រងប្រព័ន្ធ", diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php index 689c6d27bde..ebea9e4432c 100644 --- a/settings/l10n/ko.php +++ b/settings/l10n/ko.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "활성화", "Authentication error" => "인증 오류", "Your full name has been changed." => "전체 이름이 변경되었습니다.", "Unable to change full name" => "전체 이름을 변경할 수 없음", @@ -112,6 +113,7 @@ $TRANSLATIONS = array( "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>에 따라 사용이 허가됩니다.", +"by" => "작성:", "Documentation:" => "문서", "User Documentation" => "사용자 문서", "Admin Documentation" => "운영자 문서", diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php index 01ca81e68c2..947831a7044 100644 --- a/settings/l10n/ku_IQ.php +++ b/settings/l10n/ku_IQ.php @@ -6,6 +6,7 @@ $TRANSLATIONS = array( "Login" => "چوونەژوورەوە", "Encryption" => "نهێنیکردن", "Server address" => "ناونیشانی ڕاژه", +"by" => "لهلایهن", "Password" => "وشەی تێپەربو", "New password" => "وشەی نهێنی نوێ", "Email" => "ئیمهیل", diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php index 82edc1748db..eb7fd44b5e5 100644 --- a/settings/l10n/lb.php +++ b/settings/l10n/lb.php @@ -30,6 +30,7 @@ $TRANSLATIONS = array( "Log" => "Log", "More" => "Méi", "Less" => "Manner", +"by" => "vun", "Password" => "Passwuert", "Unable to change your password" => "Konnt däin Passwuert net änneren", "Current password" => "Momentan 't Passwuert", diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php index ebc255c461e..2617679390b 100644 --- a/settings/l10n/lt_LT.php +++ b/settings/l10n/lt_LT.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Įjungta", "Authentication error" => "Autentikacijos klaida", "Group already exists" => "Grupė jau egzistuoja", "Unable to add group" => "Nepavyko pridėti grupės", @@ -72,6 +73,8 @@ $TRANSLATIONS = array( "Less" => "Mažiau", "Version" => "Versija", "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>." => "Sukurta <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud bendruomenės</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">pirminis kodas</a> platinamas pagal <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"More apps" => "Daugiau programų", +"by" => " ", "User Documentation" => "Naudotojo dokumentacija", "Administrator Documentation" => "Administratoriaus dokumentacija", "Online Documentation" => "Dokumentacija tinkle", diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php index 2fde1034818..4182bad26e9 100644 --- a/settings/l10n/lv.php +++ b/settings/l10n/lv.php @@ -61,6 +61,8 @@ $TRANSLATIONS = array( "Less" => "Mazāk", "Version" => "Versija", "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>." => "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurš ir licencēts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"More apps" => "Vairāk programmu", +"by" => "līdz", "User Documentation" => "Lietotāja dokumentācija", "Administrator Documentation" => "Administratora dokumentācija", "Online Documentation" => "Tiešsaistes dokumentācija", diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php index bc90e8d343d..c3e062caeee 100644 --- a/settings/l10n/mk.php +++ b/settings/l10n/mk.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Овозможен", "Authentication error" => "Грешка во автентикација", "Your full name has been changed." => "Вашето целосно име е променето.", "Unable to change full name" => "Не можам да го променам целото име", @@ -106,6 +107,7 @@ $TRANSLATIONS = array( "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>.", +"by" => "од", "Documentation:" => "Документација:", "User Documentation" => "Корисничка документација", "Admin Documentation" => "Админстраторска документација", diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php index 98869363e95..c20dcae9ea0 100644 --- a/settings/l10n/ms_MY.php +++ b/settings/l10n/ms_MY.php @@ -17,6 +17,7 @@ $TRANSLATIONS = array( "Log" => "Log", "Log level" => "Tahap Log", "More" => "Lanjutan", +"by" => "oleh", "Password" => "Kata laluan", "Unable to change your password" => "Gagal mengubah kata laluan anda ", "Current password" => "Kata laluan semasa", diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php index f10f8e8fe44..14ecd314946 100644 --- a/settings/l10n/nb_NO.php +++ b/settings/l10n/nb_NO.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Aktiv", "Authentication error" => "Autentiseringsfeil", "Your full name has been changed." => "Ditt fulle navn er blitt endret.", "Unable to change full name" => "Klarte ikke å endre fullt navn", @@ -31,6 +32,7 @@ $TRANSLATIONS = array( "Unable to change password" => "Kunne ikke endre passord", "Saved" => "Lagret", "test email settings" => "Test av innstillinger for e-post", +"If you received this email, the settings seem to be correct." => "Hvis du mottar denne e-posten er innstillingene tydeligvis korrekte.", "Email sent" => "E-post sendt", "You need to set your user email before being able to send test emails." => "Du må sette e-postadressen for brukeren din før du kan teste sending av e-post.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Ønsker du virkelig å legge til \"{domain}\" som tiltrodd domene?", @@ -154,6 +156,7 @@ $TRANSLATIONS = array( "Less" => "Mindre", "Version" => "Versjon", "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>." => "Utviklet av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"by" => "av", "Documentation:" => "Dokumentasjon:", "User Documentation" => "Brukerdokumentasjon", "Admin Documentation" => "Admin-dokumentasjon", diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php index 666b34981f6..b9f3e2ed89d 100644 --- a/settings/l10n/nl.php +++ b/settings/l10n/nl.php @@ -1,5 +1,8 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Geactiveerd", +"Not enabled" => "Niet ingeschakeld", +"Recommended" => "Aanbevolen", "Authentication error" => "Authenticatie fout", "Your full name has been changed." => "Uw volledige naam is gewijzigd.", "Unable to change full name" => "Kan de volledige naam niet wijzigen", @@ -31,6 +34,8 @@ $TRANSLATIONS = array( "Unable to change password" => "Kan wachtwoord niet wijzigen", "Saved" => "Bewaard", "test email settings" => "test e-mailinstellingen", +"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 email. Please revise 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 invoeren voordat u testberichten kunt versturen.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Weet u zeker dat u \"{domain}\" als een vertrouwd domein wilt toevoegen?", @@ -146,6 +151,7 @@ $TRANSLATIONS = array( "Credentials" => "Inloggegevens", "SMTP Username" => "SMTP gebruikersnaam", "SMTP Password" => "SMTP wachtwoord", +"Store credentials" => "Opslaan inloggegevens", "Test email settings" => "Test e-mailinstellingen", "Send email" => "Versturen e-mail", "Log" => "Log", @@ -154,9 +160,14 @@ $TRANSLATIONS = array( "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\">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>.", +"More apps" => "Meer applicaties", +"Add your app" => "Voeg uw app toe", +"by" => "door", +"licensed" => "gelicenseerd", "Documentation:" => "Documentatie:", "User Documentation" => "Gebruikersdocumentatie", "Admin Documentation" => "Beheerdocumentatie", +"Update to %s" => "Bijgewerkt naar %s", "Enable only for specific groups" => "Alleen voor bepaalde groepen activeren", "Uninstall App" => "De-installeren app", "Administrator Documentation" => "Beheerdersdocumentatie", diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php index b8d0d23ca84..0c4a196313f 100644 --- a/settings/l10n/nn_NO.php +++ b/settings/l10n/nn_NO.php @@ -69,6 +69,7 @@ $TRANSLATIONS = array( "Less" => "Mindre", "Version" => "Utgåve", "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=\"https://github.com/owncloud\" target=\"_blank\">Kjeldekoden</a>, utvikla av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>, er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"by" => "av", "User Documentation" => "Brukardokumentasjon", "Administrator Documentation" => "Administratordokumentasjon", "Online Documentation" => "Dokumentasjon på nett", diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php index 4fc9968a384..fba58f1b559 100644 --- a/settings/l10n/oc.php +++ b/settings/l10n/oc.php @@ -26,6 +26,7 @@ $TRANSLATIONS = array( "Sharing" => "Al partejar", "Log" => "Jornal", "More" => "Mai d'aquò", +"by" => "per", "Password" => "Senhal", "Your password was changed" => "Ton senhal a cambiat", "Unable to change your password" => "Pas possible de cambiar ton senhal", diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php index 3e2ca7d26e1..4dac77e30b4 100644 --- a/settings/l10n/pl.php +++ b/settings/l10n/pl.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Włączone", "Authentication error" => "Błąd uwierzytelniania", "Your full name has been changed." => "Twoja pełna nazwa została zmieniona.", "Unable to change full name" => "Nie można zmienić pełnej nazwy", @@ -31,6 +32,7 @@ $TRANSLATIONS = array( "Unable to change password" => "Nie można zmienić hasła", "Saved" => "Zapisano", "test email settings" => "przetestuj ustawienia email", +"If you received this email, the settings seem to be correct." => "Jeśli otrzymałeś ten email, ustawienia wydają się być poprawne.", "Email sent" => "E-mail wysłany", "You need to set your user email before being able to send test emails." => "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Czy jesteś pewien/pewna że chcesz dodać \"{domain}\" jako zaufaną domenę?", @@ -154,6 +156,8 @@ $TRANSLATIONS = array( "Less" => "Mniej", "Version" => "Wersja", "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>." => "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"More apps" => "Więcej aplikacji", +"by" => "przez", "Documentation:" => "Dokumentacja:", "User Documentation" => "Dokumentacja użytkownika", "Admin Documentation" => "Dokumentacja Administratora", diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php index 2e9a1a2c016..7544c8d83c3 100644 --- a/settings/l10n/pt_BR.php +++ b/settings/l10n/pt_BR.php @@ -1,5 +1,8 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Habilitado", +"Not enabled" => "Desabilitado", +"Recommended" => "Recomendado", "Authentication error" => "Erro de autenticação", "Your full name has been changed." => "Seu nome completo foi alterado.", "Unable to change full name" => "Não é possível alterar o nome completo", @@ -31,6 +34,8 @@ $TRANSLATIONS = array( "Unable to change password" => "Impossível modificar senha", "Saved" => "Salvo", "test email settings" => "testar configurações de email", +"If you received this email, the settings seem to be correct." => "Se você recebeu este e-mail, as configurações parecem estar corretas.", +"A problem occurred while sending the email. Please revise your settings." => "Ocorreu um problema ao enviar o e-mail. Por favor, revise suas configurações.", "Email sent" => "E-mail enviado", "You need to set your user email before being able to send test emails." => "Você precisa configurar seu e-mail de usuário antes de ser capaz de enviar e-mails de teste.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Você tem certeza que você quer adicionar \"{domain}\" como domínio confiável?", @@ -146,6 +151,7 @@ $TRANSLATIONS = array( "Credentials" => "Credenciais", "SMTP Username" => "Nome do Usuário SMTP", "SMTP Password" => "Senha SMTP", +"Store credentials" => "Armazenar credenciais", "Test email settings" => "Configurações de e-mail de teste", "Send email" => "Enviar email", "Log" => "Registro", @@ -154,9 +160,14 @@ $TRANSLATIONS = array( "Less" => "Menos", "Version" => "Versão", "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 pela <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á licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"More apps" => "Mais aplicativos", +"Add your app" => "Adicionar seu aplicativo", +"by" => "por", +"licensed" => "licenciado", "Documentation:" => "Documentação:", "User Documentation" => "Documentação de Usuário", "Admin Documentation" => "Documentação de Administrador", +"Update to %s" => "Atualizado para %s", "Enable only for specific groups" => "Ativar apenas para grupos específicos", "Uninstall App" => "Desinstalar Aplicativo", "Administrator Documentation" => "Documentação de Administrador", diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php index d4a24cf29bd..6c1e9c8b53a 100644 --- a/settings/l10n/pt_PT.php +++ b/settings/l10n/pt_PT.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Ativada", "Authentication error" => "Erro na autenticação", "Your full name has been changed." => "O seu nome completo foi alterado.", "Unable to change full name" => "Não foi possível alterar o seu nome completo", @@ -31,6 +32,7 @@ $TRANSLATIONS = array( "Unable to change password" => "Não foi possível alterar a sua password", "Saved" => "Guardado", "test email settings" => "testar configurações de email", +"If you received this email, the settings seem to be correct." => "Se você recebeu este e-mail as configurações parecem estar correctas", "Email sent" => "E-mail enviado", "You need to set your user email before being able to send test emails." => "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?", @@ -153,6 +155,7 @@ $TRANSLATIONS = array( "Less" => "Menos", "Version" => "Versão", "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 pela <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á licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"by" => "por", "Documentation:" => "Documentação:", "User Documentation" => "Documentação de Utilizador", "Admin Documentation" => "Documentação de administrador.", diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php index 3bc87d1f8c6..1e8c073d36b 100644 --- a/settings/l10n/ro.php +++ b/settings/l10n/ro.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Activat", "Authentication error" => "Eroare la autentificare", "Your full name has been changed." => "Numele tău complet a fost schimbat.", "Unable to change full name" => "Nu s-a puput schimba numele complet", @@ -23,6 +24,7 @@ $TRANSLATIONS = array( "Unable to change password" => "Imposibil de schimbat parola", "Saved" => "Salvat", "test email settings" => "verifică setările de e-mail", +"If you received this email, the settings seem to be correct." => "Dacă ai primit acest e-mail atunci setările par a fi corecte.", "Email sent" => "Mesajul a fost expediat", "Sending..." => "Se expediază...", "All" => "Toate ", @@ -86,6 +88,7 @@ $TRANSLATIONS = array( "Less" => "Mai puțin", "Version" => "Versiunea", "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>." => "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"by" => "după", "User Documentation" => "Documentație utilizator", "Administrator Documentation" => "Documentație administrator", "Online Documentation" => "Documentație online", diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php index b1559c0c14e..49ae9a28a9a 100644 --- a/settings/l10n/ru.php +++ b/settings/l10n/ru.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Включено", "Authentication error" => "Ошибка аутентификации", "Your full name has been changed." => "Ваше полное имя было изменено.", "Unable to change full name" => "Невозможно изменить полное имя", @@ -31,6 +32,7 @@ $TRANSLATIONS = array( "Unable to change password" => "Невозможно изменить пароль", "Saved" => "Сохранено", "test email settings" => "проверить настройки почты", +"If you received this email, the settings seem to be correct." => "Если вы получили это письмо, настройки верны.", "Email sent" => "Письмо отправлено", "You need to set your user email before being able to send test emails." => "Вы должны настроить свой e-mail пользователя прежде чем отправлять тестовые сообщения.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Вы действительно хотите добавить домен \"{domain}\" как доверенный?", @@ -154,6 +156,8 @@ $TRANSLATIONS = array( "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>.", +"More apps" => "Ещё приложения", +"by" => ":", "Documentation:" => "Документация:", "User Documentation" => "Пользовательская документация", "Admin Documentation" => "Документация администратора", diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php index 5c63346a64d..744c60a610b 100644 --- a/settings/l10n/si_LK.php +++ b/settings/l10n/si_LK.php @@ -30,6 +30,7 @@ $TRANSLATIONS = array( "More" => "වැඩි", "Less" => "අඩු", "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>, the <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> යටතේ.", +"by" => "විසින්", "Password" => "මුර පදය", "Your password was changed" => "ඔබගේ මුර පදය වෙනස් කෙරුණි", "Unable to change your password" => "මුර පදය වෙනස් කළ නොහැකි විය", diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php index 281434452ee..900a707a62c 100644 --- a/settings/l10n/sk_SK.php +++ b/settings/l10n/sk_SK.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Povolené", "Authentication error" => "Chyba autentifikácie", "Your full name has been changed." => "Vaše meno a priezvisko bolo zmenené.", "Unable to change full name" => "Nemožno zmeniť meno a priezvisko", @@ -31,6 +32,7 @@ $TRANSLATIONS = array( "Unable to change password" => "Zmena hesla sa nepodarila", "Saved" => "Uložené", "test email settings" => "nastavenia testovacieho emailu", +"If you received this email, the settings seem to be correct." => "Ak ste dostali tento email, nastavenie je správne.", "Email sent" => "Email odoslaný", "You need to set your user email before being able to send test emails." => "Musíte nastaviť svoj používateľský email, než budete môcť odoslať testovací email.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Ste si istí, že chcete pridať \"{domain}\" medzi dôveryhodné domény?", @@ -152,6 +154,8 @@ $TRANSLATIONS = array( "Less" => "Menej", "Version" => "Verzia", "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>." => "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"More apps" => "Viac aplikácií", +"by" => "od", "Documentation:" => "Dokumentácia:", "User Documentation" => "Príručka používateľa", "Admin Documentation" => "Príručka administrátora", diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php index 1efc9f8661a..a9298d61f9e 100644 --- a/settings/l10n/sl.php +++ b/settings/l10n/sl.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Omogočeno", "Authentication error" => "Napaka med overjanjem", "Your full name has been changed." => "Vaše polno ime je spremenjeno.", "Unable to change full name" => "Ni mogoče spremeniti polnega imena", @@ -28,6 +29,7 @@ $TRANSLATIONS = array( "Unable to change password" => "Ni mogoče spremeniti gesla", "Saved" => "Shranjeno", "test email settings" => "preizkusi nastavitve elektronske pošte", +"If you received this email, the settings seem to be correct." => "Če ste prejeli to sporočilo, so nastavitve pravilne.", "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.", "Add trusted domain" => "Dodaj varno domeno", @@ -131,6 +133,7 @@ $TRANSLATIONS = array( "Less" => "Manj", "Version" => "Različica", "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>." => "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošnega javnega dovoljenja Affero\">AGPL</abbr></a>.", +"by" => "od", "Documentation:" => "Dokumentacija:", "User Documentation" => "Uporabniška dokumentacija", "Admin Documentation" => "Skrbniška dokumentacija", diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php index 8c505d99700..5d1961b2271 100644 --- a/settings/l10n/sq.php +++ b/settings/l10n/sq.php @@ -70,6 +70,7 @@ $TRANSLATIONS = array( "Less" => "M'pak", "Version" => "Versioni", "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>." => "Zhvilluar nga <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Komuniteti OwnCloud</a>, gjithashtu <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> është licensuar me anë të <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"by" => "nga", "Documentation:" => "Dokumentacioni:", "User Documentation" => "Dokumentacion përdoruesi", "Administrator Documentation" => "Dokumentacion administratori", diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php index ff0c9f80464..8086949a7ec 100644 --- a/settings/l10n/sr.php +++ b/settings/l10n/sr.php @@ -53,6 +53,7 @@ $TRANSLATIONS = array( "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)\">АГПЛ лиценцом</abbr></a>.", +"by" => "од", "User Documentation" => "Корисничка документација", "Administrator Documentation" => "Администраторска документација", "Online Documentation" => "Мрежна документација", diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php index 2d3e61065c8..7116283bed3 100644 --- a/settings/l10n/sr@latin.php +++ b/settings/l10n/sr@latin.php @@ -12,6 +12,7 @@ $TRANSLATIONS = array( "Delete" => "Obriši", "Groups" => "Grupe", "Security Warning" => "Bezbednosno upozorenje", +"by" => "od", "Password" => "Lozinka", "Unable to change your password" => "Ne mogu da izmenim vašu lozinku", "Current password" => "Trenutna lozinka", diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php index 9e1d4f71313..a87611b59f4 100644 --- a/settings/l10n/sv.php +++ b/settings/l10n/sv.php @@ -1,5 +1,8 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Aktiverad", +"Not enabled" => "Inte aktiverad", +"Recommended" => "Rekomenderad", "Authentication error" => "Fel vid autentisering", "Your full name has been changed." => "Hela ditt namn har ändrats", "Unable to change full name" => "Kunde inte ändra hela namnet", @@ -31,6 +34,7 @@ $TRANSLATIONS = array( "Unable to change password" => "Kunde inte ändra lösenord", "Saved" => "Sparad", "test email settings" => "testa e-post inställningar", +"If you received this email, the settings seem to be correct." => "Om du mottog detta e-postmeddelande, verkar dina inställningar vara korrekta.", "Email sent" => "E-post skickat", "You need to set your user email before being able to send test emails." => "Du behöver ställa in din användares e-postadress före du kan skicka test e-post.", "Are you really sure you want add \"{domain}\" as trusted domain?" => "Är du verkligen säker på att du vill lägga till \"{domain}\" som en trusted domian?", @@ -145,9 +149,12 @@ $TRANSLATIONS = array( "Less" => "Mindre", "Version" => "Version", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Community</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"More apps" => "Fler appar", +"by" => "av", "Documentation:" => "Dokumentation:", "User Documentation" => "Användardokumentation", "Admin Documentation" => "Administratörsdokumentation", +"Update to %s" => "Uppdatera till %s", "Enable only for specific groups" => "Aktivera endast för specifika grupper", "Uninstall App" => "Avinstallera Applikation", "Administrator Documentation" => "Administratörsdokumentation", @@ -156,6 +163,7 @@ $TRANSLATIONS = array( "Bugtracker" => "Bugtracker", "Commercial Support" => "Kommersiell support", "Get the apps to sync your files" => "Skaffa apparna för att synkronisera dina filer", +"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>!" => "Om du vill stödja projektet\n<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">hjälp till med utvecklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sprid budskapet vidare</a>!", "Show First Run Wizard again" => "Visa Första uppstarts-guiden igen", "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>", "Password" => "Lösenord", diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php index a4c8c850ddc..1c628363232 100644 --- a/settings/l10n/ta_LK.php +++ b/settings/l10n/ta_LK.php @@ -30,6 +30,7 @@ $TRANSLATIONS = array( "More" => "மேலதிக", "Less" => "குறைவான", "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>." => "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>.", +"by" => "மூலம்", "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்", "Password" => "கடவுச்சொல்", "Your password was changed" => "உங்களுடைய கடவுச்சொல் மாற்றப்பட்டுள்ளது", diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php index 3cc80ffbd67..407307cd763 100644 --- a/settings/l10n/th_TH.php +++ b/settings/l10n/th_TH.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "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>." => "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <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>.", +"by" => "โดย", "User Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน", "Administrator Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ", "Online Documentation" => "เอกสารคู่มือการใช้งานออนไลน์", diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php index 3e1ad733de8..66b84e079e0 100644 --- a/settings/l10n/tr.php +++ b/settings/l10n/tr.php @@ -1,5 +1,8 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Etkin", +"Not enabled" => "Etkin değil", +"Recommended" => "Önerilen", "Authentication error" => "Kimlik doğrulama hatası", "Your full name has been changed." => "Tam adınız değiştirildi.", "Unable to change full name" => "Tam adınız değiştirilirken hata", @@ -31,6 +34,8 @@ $TRANSLATIONS = array( "Unable to change password" => "Parola değiştirilemiyor", "Saved" => "Kaydedildi", "test email settings" => "e-posta ayarlarını sına", +"If you received this email, the settings seem to be correct." => "Eğer bu e-postayı aldıysanız, ayarlar doğru gibi görünüyor.", +"A problem occurred while sending the email. Please revise your settings." => "E-posta gönderilirken bir sorun oluştu. Lütfen ayarlarınızı gözden geçirin.", "Email sent" => "E-posta gönderildi", "You need to set your user email before being able to send test emails." => "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarlamanız gerekiyor.", "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?", @@ -146,6 +151,7 @@ $TRANSLATIONS = array( "Credentials" => "Kimlik Bilgileri", "SMTP Username" => "SMTP Kullanıcı Adı", "SMTP Password" => "SMTP Parolası", +"Store credentials" => "Kimlik bilgilerini depola", "Test email settings" => "E-posta ayarlarını sına", "Send email" => "E-posta gönder", "Log" => "Günlük", @@ -154,9 +160,14 @@ $TRANSLATIONS = array( "Less" => "Daha az", "Version" => "Sürüm", "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 topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır.", +"More apps" => "Daha fazla Uygulama", +"Add your app" => "Uygulamanızı ekleyin", +"by" => "oluşturan", +"licensed" => "lisanslı", "Documentation:" => "Belgelendirme:", "User Documentation" => "Kullanıcı Belgelendirmesi", "Admin Documentation" => "Yönetici Belgelendirmesi", +"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", "Administrator Documentation" => "Yönetici Belgelendirmesi", diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php index 64f8a61c781..ddf67ce8ebe 100644 --- a/settings/l10n/ug.php +++ b/settings/l10n/ug.php @@ -45,6 +45,7 @@ $TRANSLATIONS = array( "More" => "تېخىمۇ كۆپ", "Less" => "ئاز", "Version" => "نەشرى", +"by" => "سەنئەتكار", "User Documentation" => "ئىشلەتكۈچى قوللانمىسى", "Administrator Documentation" => "باشقۇرغۇچى قوللانمىسى", "Online Documentation" => "توردىكى قوللانما", diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php index 904ce92ea8b..427fd91f3e7 100644 --- a/settings/l10n/uk.php +++ b/settings/l10n/uk.php @@ -1,72 +1,182 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Увімкнено", +"Not enabled" => "Вимкнено", +"Recommended" => "Рекомендуємо", "Authentication error" => "Помилка автентифікації", +"Your full name has been changed." => "Ваше ім'я було змінене", +"Unable to change full name" => "Неможливо змінити ім'я", "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.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", +"Couldn't remove app." => "Неможливо видалити додаток.", "Email saved" => "Адресу збережено", "Invalid email" => "Невірна адреса", "Unable to delete group" => "Не вдалося видалити групу", "Unable to delete user" => "Не вдалося видалити користувача", +"Backups restored successfully" => "Резервна копія успішно відновлена", +"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Неможливо відновити ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log", "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" => "Неможливо змінити пароль", +"Saved" => "Збереженно", +"test email settings" => "перевірити налаштування електронної пошти", +"If you received this email, the settings seem to be correct." => "Якщо ви отримали цього листа, налаштування вірні.", +"A problem occurred while sending the email. Please revise your settings." => "Під час надсилання листа виникли проблеми. Будь ласка перевірте налаштування.", "Email sent" => "Ел. пошта надіслана", +"You need to set your user email before being able to send test emails." => "Перед надсиланням тестових повідомлень ви повинні вказати свою електронну адресу.", +"Are you really sure you want add \"{domain}\" as trusted domain?" => "Ви дійсно бажаєте додати \"{domain}\" як довірений домен?", +"Add trusted domain" => "Додати довірений домен", +"Sending..." => "Надсилання...", "All" => "Всі", "Please wait...." => "Зачекайте, будь ласка...", +"Error while disabling app" => "Помилка відключення додатка", "Disable" => "Вимкнути", "Enable" => "Включити", +"Error while enabling app" => "Помилка підключення додатка", "Updating...." => "Оновлюється...", "Error while updating app" => "Помилка при оновленні програми", "Updated" => "Оновлено", +"Uninstalling ...." => "Видалення...", +"Error while uninstalling app" => "Помилка видалення додатка", +"Uninstall" => "Видалити", +"Select a profile picture" => "Обрати зображення облікового запису", "Very weak password" => "Дуже слабкий пароль", "Weak password" => "Слабкий пароль", +"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." => "Відновити ключі шифрування.", "Groups" => "Групи", +"Unable to delete {objName}" => "Не вдалося видалити {objName}", +"Error creating group" => "Помилка створення групи", +"A valid group name must be provided" => "Потрібно задати вірне ім'я групи", +"deleted {groupName}" => "видалено {groupName}", "undo" => "відмінити", "Group Admin" => "Адміністратор групи", "never" => "ніколи", +"deleted {userName}" => "видалено {userName}", "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__" => "__language_name__", +"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." => "Ви звертаєтесь до %s за допомогою HTTP. Ми наполегливо рекомендуємо вам налаштувати сервер на використання 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, наданий з ownCloud, не працює. Ми наполегливо рекомендуємо Вам налаштувати свій веб-сервер таким чином, щоб каталог data більше не був доступний, або перемістити каталог data за межі кореневого каталогу документів веб-сервера.", "Setup Warning" => "Попередження при Налаштуванні", +"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'", "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. Це може викликати проблеми іменами файлів, які містять нелатинські символи. Ми наполегливо рекомендуємо змінити значення перемінної 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.", +"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\")" => "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію overwritewebroot файла config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")", +"Connectivity checks" => "Перевірка з'єднання", +"No problems found" => "Проблем не виявленно", "Please double check the <a href='%s'>installation guides</a>." => "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.", "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. Минуло вже більше години, здається щось не так.", +"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 зареєстрований в службі webcron та буде викликатися кожні 15 хвилин через HTTP.", +"Use system's cron service to call the cron.php file every 15 minutes." => "Використовувати системний cron для виклику cron.php кожні 15 хвилин.", "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" => "Дозволити перевідкривати спільний доступ", +"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." => "Ці групи зможуть отримувати спільні файли, але не зможуть відправляти їх.", "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.", +"Email Server" => "Сервер електронної пошти", +"This is used for sending out notifications." => "Використовується для відсилання повідомлень.", +"Send mode" => "Надіслати повідомлення", "Encryption" => "Шифрування", +"From address" => "Адреса відправника", +"mail" => "пошта", +"Authentication method" => "Метод перевірки автентифікації", +"Authentication required" => "Потрібна аутентифікація", "Server address" => "Адреса сервера", "Port" => "Порт", "Credentials" => "Облікові дані", +"SMTP Username" => "Ім'я користувача SMTP", +"SMTP Password" => "Пароль SMTP", +"Store credentials" => "Зберігання облікових даних", +"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>.", +"More apps" => "Більше додатків", +"Add your app" => "Додати свій додаток", +"by" => "по", +"licensed" => "Ліцензовано", +"Documentation:" => "Документація:", "User Documentation" => "Документація Користувача", +"Admin Documentation" => "Документація Адміністратора", +"Update to %s" => "Оновити до %s", +"Enable only for specific groups" => "Включити тільки для конкретних груп", +"Uninstall App" => "Видалити додаток", "Administrator Documentation" => "Документація Адміністратора", "Online Documentation" => "Он-Лайн Документація", "Forum" => "Форум", "Bugtracker" => "БагТрекер", "Commercial Support" => "Комерційна підтримка", "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⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥target=\"_blank\">приєднуйтесь до розробки</a>\n⇥⇥або\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥target=\"_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>", "Password" => "Пароль", @@ -75,20 +185,52 @@ $TRANSLATIONS = array( "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" => "Допомогти з перекладом", "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" => "Пароль адміністратора для відновлення", +"Enter the recovery password in order to recover the users files during password change" => "Введіть пароль для того, щоб відновити файли користувачів при зміні паролю", +"Search Users and Groups" => "Шукати користувачів та групи", +"Add Group" => "Додати групу", +"Group" => "Група", +"Everyone" => "Всі", +"Admins" => "Адміністратори", "Default Quota" => "Квота за замовчуванням", +"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Будь ласка, вкажіть розмір сховища (наприклад: \"512 MB\" або \"12 GB\")", "Unlimited" => "Необмежено", "Other" => "Інше", "Username" => "Ім'я користувача", "Quota" => "Квота", +"Storage Location" => "Місцезнаходження сховища", +"Last Login" => "Останній вхід", +"change full name" => "змінити ім'я", "set new password" => "встановити новий пароль", "Default" => "За замовчуванням" ); diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php index cbddc4b7347..6b0fc92c26d 100644 --- a/settings/l10n/vi.php +++ b/settings/l10n/vi.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "Bật", "Authentication error" => "Lỗi xác thực", "Your full name has been changed." => "Họ và tên đã được thay đổi.", "Unable to change full name" => "Họ và tên không thể đổi ", @@ -47,6 +48,7 @@ $TRANSLATIONS = array( "Less" => "ít", "Version" => "Phiên bả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>." => "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.", +"by" => "bởi", "User Documentation" => "Tài liệu người sử dụng", "Administrator Documentation" => "Tài liệu quản trị", "Online Documentation" => "Tài liệu trực tuyến", diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php index 393902ac375..8e05cd4f7d8 100644 --- a/settings/l10n/zh_CN.php +++ b/settings/l10n/zh_CN.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "开启", "Authentication error" => "认证错误", "Your full name has been changed." => "您的全名已修改。", "Unable to change full name" => "无法修改全名", @@ -31,6 +32,7 @@ $TRANSLATIONS = array( "Unable to change password" => "不能更改密码", "Saved" => "已保存", "test email settings" => "测试电子邮件设置", +"If you received this email, the settings seem to be correct." => "如果您收到了这封邮件，看起来设置没有问题。", "Email sent" => "邮件已发送", "You need to set your user email before being able to send test emails." => "在发送测试邮件前您需要设置您的用户电子邮件。", "Are you really sure you want add \"{domain}\" as trusted domain?" => "你真的希望添加 \"{domain}\" 为信任域？", @@ -154,6 +156,8 @@ $TRANSLATIONS = array( "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>许可证下发布。", +"More apps" => "更多应用", +"by" => "被", "Documentation:" => "文档：", "User Documentation" => "用户文档", "Admin Documentation" => "管理员文档", diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php index 4927561edc6..6139dad2795 100644 --- a/settings/l10n/zh_HK.php +++ b/settings/l10n/zh_HK.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "啟用", "Wrong password" => "密碼錯誤", "Saved" => "已儲存", "Email sent" => "郵件已傳", diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php index d861294620f..86a2661404b 100644 --- a/settings/l10n/zh_TW.php +++ b/settings/l10n/zh_TW.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Enabled" => "已啓用", "Authentication error" => "認證錯誤", "Your full name has been changed." => "您的全名已變更。", "Unable to change full name" => "無法變更全名", @@ -26,6 +27,7 @@ $TRANSLATIONS = array( "Unable to change password" => "無法修改密碼", "Saved" => "已儲存", "test email settings" => "測試郵件設定", +"If you received this email, the settings seem to be correct." => "假如您收到這個郵件，此設定看起來是正確的。", "Email sent" => "Email 已寄出", "You need to set your user email before being able to send test emails." => "在準備要寄出測試郵件時您需要設定您的使用者郵件。", "Sending..." => "寄送中...", @@ -115,6 +117,8 @@ $TRANSLATIONS = array( "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> 授權許可下發布。", +"More apps" => "更多 Apps", +"by" => "由", "Documentation:" => "文件:", "User Documentation" => "用戶說明文件", "Admin Documentation" => "管理者文件", diff --git a/tests/lib/group/manager.php b/tests/lib/group/manager.php index 70d9783946a..8fd19513c0a 100644 --- a/tests/lib/group/manager.php +++ b/tests/lib/group/manager.php @@ -190,7 +190,7 @@ class Manager extends \PHPUnit_Framework_TestCase { $groups = $manager->search('1'); $this->assertEquals(1, count($groups)); - $group1 = $groups[0]; + $group1 = reset($groups); $this->assertEquals('group1', $group1->getGID()); } @@ -229,8 +229,8 @@ class Manager extends \PHPUnit_Framework_TestCase { $groups = $manager->search('1'); $this->assertEquals(2, count($groups)); - $group1 = $groups[0]; - $group12 = $groups[1]; + $group1 = reset($groups); + $group12 = next($groups); $this->assertEquals('group1', $group1->getGID()); $this->assertEquals('group12', $group12->getGID()); } @@ -270,8 +270,8 @@ class Manager extends \PHPUnit_Framework_TestCase { $groups = $manager->search('1', 2, 1); $this->assertEquals(2, count($groups)); - $group1 = $groups[0]; - $group12 = $groups[1]; + $group1 = reset($groups); + $group12 = next($groups); $this->assertEquals('group1', $group1->getGID()); $this->assertEquals('group12', $group12->getGID()); } @@ -300,7 +300,7 @@ class Manager extends \PHPUnit_Framework_TestCase { $groups = $manager->getUserGroups(new User('user1', $userBackend)); $this->assertEquals(1, count($groups)); - $group1 = $groups[0]; + $group1 = reset($groups); $this->assertEquals('group1', $group1->getGID()); } @@ -340,8 +340,8 @@ class Manager extends \PHPUnit_Framework_TestCase { $groups = $manager->getUserGroups(new User('user1', $userBackend)); $this->assertEquals(2, count($groups)); - $group1 = $groups[0]; - $group2 = $groups[1]; + $group1 = reset($groups); + $group2 = next($groups); $this->assertEquals('group1', $group1->getGID()); $this->assertEquals('group2', $group2->getGID()); } @@ -369,15 +369,6 @@ class Manager extends \PHPUnit_Framework_TestCase { } })); - $backend->expects($this->once()) - ->method('implementsActions') - ->will($this->returnValue(true)); - - $backend->expects($this->once()) - ->method('countUsersInGroup') - ->with('testgroup', '') - ->will($this->returnValue(2)); - /** * @var \OC\User\Manager $userManager */ @@ -496,9 +487,9 @@ class Manager extends \PHPUnit_Framework_TestCase { ->with('testgroup') ->will($this->returnValue(true)); - $backend->expects($this->any()) - ->method('InGroup') - ->will($this->returnCallback(function($uid, $gid) { + $backend->expects($this->any()) + ->method('inGroup') + ->will($this->returnCallback(function($uid) { switch($uid) { case 'user1' : return false; case 'user2' : return true; @@ -521,9 +512,12 @@ class Manager extends \PHPUnit_Framework_TestCase { ->with('user3') ->will($this->returnCallback(function($search, $limit, $offset) use ($userBackend) { switch($offset) { - case 0 : return array('user3' => new User('user3', $userBackend), - 'user33' => new User('user33', $userBackend)); - case 2 : return array('user333' => new User('user333', $userBackend)); + case 0 : + return array( + 'user3' => new User('user3', $userBackend), + 'user33' => new User('user33', $userBackend), + 'user333' => new User('user333', $userBackend) + ); } })); @@ -727,7 +721,7 @@ class Manager extends \PHPUnit_Framework_TestCase { // check result $groups = $manager->getUserGroups($user1); $this->assertEquals(1, count($groups)); - $group1 = $groups[0]; + $group1 = reset($groups); $this->assertEquals('group1', $group1->getGID()); } @@ -768,7 +762,7 @@ class Manager extends \PHPUnit_Framework_TestCase { $user1 = new User('user1', null); $groups = $manager->getUserGroups($user1); $this->assertEquals(1, count($groups)); - $group1 = $groups[0]; + $group1 = reset($groups); $this->assertEquals('group1', $group1->getGID()); // remove user diff --git a/tests/lib/templatelayout.php b/tests/lib/templatelayout.php new file mode 100644 index 00000000000..0335c7c88ee --- /dev/null +++ b/tests/lib/templatelayout.php @@ -0,0 +1,68 @@ +<?php +/** + * Copyright (c) 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. + */ + +namespace OC\Test; + +/** + * @package OC\Test + */ +class OC_TemplateLayout extends \PHPUnit_Framework_TestCase { + + private $oldServerUri; + private $oldScriptName; + + public function setUp() { + $this->oldServerURI = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : null; + $this->oldScriptName = $_SERVER['SCRIPT_NAME']; + } + + public function tearDown() { + if ($this->oldServerURI === null) { + unset($_SERVER['REQUEST_URI']); + } else { + $_SERVER['REQUEST_URI'] = $this->oldServerURI; + } + $_SERVER['SCRIPT_NAME'] = $this->oldScriptName; + } + + /** + * Contains valid file paths in the scheme array($absolutePath, $expectedPath) + * @return array + */ + public function validFilePathProvider() { + return array( + array(\OC::$SERVERROOT . '/apps/files/js/fancyJS.js', '/apps/files/js/fancyJS.js'), + array(\OC::$SERVERROOT. '/test.js', '/test.js'), + array(\OC::$SERVERROOT . '/core/test.js', '/core/test.js'), + array(\OC::$SERVERROOT, ''), + ); + } + + /** + * @dataProvider validFilePathProvider + */ + public function testConvertToRelativePath($absolutePath, $expected) { + $_SERVER['REQUEST_URI'] = $expected; + $_SERVER['SCRIPT_NAME'] = '/'; + + $relativePath = \Test_Helper::invokePrivate(new \OC_TemplateLayout('user'), 'convertToRelativePath', array($absolutePath)); + $this->assertEquals($expected, $relativePath); + } + + /** + * @expectedException \Exception + * @expectedExceptionMessage $filePath is not under the \OC::$SERVERROOT + */ + public function testInvalidConvertToRelativePath() { + $invalidFile = '/this/file/is/invalid'; + $_SERVER['REQUEST_URI'] = $invalidFile; + $_SERVER['SCRIPT_NAME'] = '/'; + + \Test_Helper::invokePrivate(new \OC_TemplateLayout('user'), 'convertToRelativePath', array($invalidFile)); + } +} |