diff options
Diffstat (limited to 'apps')
168 files changed, 678 insertions, 352 deletions
diff --git a/apps/dav/appinfo/app.php b/apps/dav/appinfo/app.php index 5cccab98f17..b5bf9bd0e73 100644 --- a/apps/dav/appinfo/app.php +++ b/apps/dav/appinfo/app.php @@ -19,10 +19,9 @@ * */ -use OCA\DAV\CardDAV\CardDavBackend; -use OCA\DAV\CardDAV\SyncService; +use OCA\Dav\AppInfo\Application; -$app = new \OCA\Dav\AppInfo\Application(); +$app = new Application(); $app->registerHooks(); \OC::$server->registerService('CardDAVSyncService', function() use ($app) { diff --git a/apps/dav/appinfo/application.php b/apps/dav/appinfo/application.php index b681e273b59..2a27dbeb016 100644 --- a/apps/dav/appinfo/application.php +++ b/apps/dav/appinfo/application.php @@ -22,6 +22,7 @@ namespace OCA\Dav\AppInfo; use OCA\DAV\CardDAV\CardDavBackend; use OCA\DAV\CardDAV\ContactsManager; +use OCA\DAV\CardDAV\SyncJob; use OCA\DAV\CardDAV\SyncService; use OCA\DAV\HookManager; use \OCP\AppFramework\App; @@ -95,4 +96,9 @@ class Application extends App { return $this->getContainer()->query('SyncService'); } + public function setupCron() { + $jl = $this->getContainer()->getServer()->getJobList(); + $jl->add(new SyncJob()); + } + } diff --git a/apps/dav/appinfo/install.php b/apps/dav/appinfo/install.php new file mode 100644 index 00000000000..aaa36052cd2 --- /dev/null +++ b/apps/dav/appinfo/install.php @@ -0,0 +1,25 @@ +<?php +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +use OCA\Dav\AppInfo\Application; + +$app = new Application(); +$app->setupCron(); diff --git a/apps/dav/appinfo/update.php b/apps/dav/appinfo/update.php new file mode 100644 index 00000000000..aaa36052cd2 --- /dev/null +++ b/apps/dav/appinfo/update.php @@ -0,0 +1,25 @@ +<?php +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +use OCA\Dav\AppInfo\Application; + +$app = new Application(); +$app->setupCron(); diff --git a/apps/dav/lib/carddav/syncjob.php b/apps/dav/lib/carddav/syncjob.php new file mode 100644 index 00000000000..0554af6fbf1 --- /dev/null +++ b/apps/dav/lib/carddav/syncjob.php @@ -0,0 +1,40 @@ +<?php +/** + * @author Thomas Müller <thomas.mueller@tmit.eu> + * + * @copyright Copyright (c) 2016, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +namespace OCA\DAV\CardDAV; + +use OC\BackgroundJob\TimedJob; +use OCA\Dav\AppInfo\Application; + +class SyncJob extends TimedJob { + + public function __construct() { + // Run once a day + $this->setInterval(24 * 60 * 60); + } + + protected function run($argument) { + $app = new Application(); + /** @var SyncService $ss */ + $ss = $app->getSyncService(); + $ss->syncInstance(); + } +} diff --git a/apps/dav/lib/carddav/syncservice.php b/apps/dav/lib/carddav/syncservice.php index d66d316f6f7..4b5907620e6 100644 --- a/apps/dav/lib/carddav/syncservice.php +++ b/apps/dav/lib/carddav/syncservice.php @@ -240,11 +240,13 @@ class SyncService { return $this->localSystemAddressBook; } - public function syncInstance(\Closure $progressCallback) { + public function syncInstance(\Closure $progressCallback = null) { $systemAddressBook = $this->getLocalSystemAddressBook(); $this->userManager->callForAllUsers(function($user) use ($systemAddressBook, $progressCallback) { $this->updateUser($user); - $progressCallback(); + if (!is_null($progressCallback)) { + $progressCallback(); + } }); // remove no longer existing diff --git a/apps/dav/lib/hookmanager.php b/apps/dav/lib/hookmanager.php index 7902bf31459..d2199bec598 100644 --- a/apps/dav/lib/hookmanager.php +++ b/apps/dav/lib/hookmanager.php @@ -54,6 +54,10 @@ class HookManager { 'post_deleteUser', $this, 'postDeleteUser'); + Util::connectHook('OC_User', + 'changeUser', + $this, + 'changeUser'); } public function postCreateUser($params) { @@ -64,6 +68,7 @@ class HookManager { public function preDeleteUser($params) { $this->usersToDelete[$params['uid']] = $this->userManager->get($params['uid']); } + public function postDeleteUser($params) { $uid = $params['uid']; if (isset($this->usersToDelete[$uid])){ @@ -71,4 +76,8 @@ class HookManager { } } + public function changeUser($params) { + $user = $params['user']; + $this->syncService->updateUser($user); + } } diff --git a/apps/encryption/l10n/pt_PT.js b/apps/encryption/l10n/pt_PT.js index a9e3c8bbbb4..c30f81065fa 100644 --- a/apps/encryption/l10n/pt_PT.js +++ b/apps/encryption/l10n/pt_PT.js @@ -25,11 +25,15 @@ OC.L10N.register( "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente", "Encryption App is enabled and ready" : "A aplicação de encriptação está ativa e pronta", + "one-time password for server-side-encryption" : "palavra-passe de uso único para encriptação do lado do servidor", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível desencriptar este ficheiro, provavelmente é um ficheiro partilhado. Por favor, peça ao proprietário do ficheiro para voltar a partilhar o ficheiro consigo.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível ler este ficheiro, provavelmente isto é um ficheiro compartilhado. Por favor, peça ao dono do ficheiro para voltar a partilhar o ficheiro consigo.", + "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Olá,\n\no administrador ativou a encriptação do lado do servidor. Os teus ficheiros foram encriptados usando a palavra-passe '%s'.\n\nPor favor, faz login via browser, vai à secção 'Módulo de encriptação básica ownCloud' nas tuas definições pessoais e atualiza a tua palavra-passe de encriptação ao introduzir esta palavra-passe no campo 'palavra-passe antiga' e também a tua palavra-passe atual.\n\n", "The share will expire on %s." : "Esta partilha irá expirar em %s.", "Cheers!" : "Parabéns!", + "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Olá,<br><br>o administrador ativou a encriptação do lado do servidor. Os teus ficheiros foram encriptados usando a palavra-passe <strong>%s</strong>.<br><br>Por favor, faz login via browser, vai à secção 'Módulo de encriptação básica ownCloud' nas tuas definições pessoais e atualiza a tua palavra-passe de encriptação ao introduzir esta palavra-passe no campo 'palavra-passe antiga' e também a tua palavra-passe atual.<br><br>", "Encrypt the home storage" : "Encriptar o armazenamento do início", + "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ativando esta opção todos os ficheiros armazenados no armazenamento principal serão encriptados, senão serão encriptados todos os ficheiros no armazenamento externo", "Enable recovery key" : "Ativar a chave de recuperação", "Disable recovery key" : "Desativar a chave de recuperação", "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperação é uma chave de encriptação extra que é utilizada para encriptar os ficheiros. Esta permite a recuperação dos ficheiros do utilizador se este esquecer a sua senha.", diff --git a/apps/encryption/l10n/pt_PT.json b/apps/encryption/l10n/pt_PT.json index e744a7bac6f..34086acf56c 100644 --- a/apps/encryption/l10n/pt_PT.json +++ b/apps/encryption/l10n/pt_PT.json @@ -23,11 +23,15 @@ "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.", "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente", "Encryption App is enabled and ready" : "A aplicação de encriptação está ativa e pronta", + "one-time password for server-side-encryption" : "palavra-passe de uso único para encriptação do lado do servidor", "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível desencriptar este ficheiro, provavelmente é um ficheiro partilhado. Por favor, peça ao proprietário do ficheiro para voltar a partilhar o ficheiro consigo.", "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível ler este ficheiro, provavelmente isto é um ficheiro compartilhado. Por favor, peça ao dono do ficheiro para voltar a partilhar o ficheiro consigo.", + "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Olá,\n\no administrador ativou a encriptação do lado do servidor. Os teus ficheiros foram encriptados usando a palavra-passe '%s'.\n\nPor favor, faz login via browser, vai à secção 'Módulo de encriptação básica ownCloud' nas tuas definições pessoais e atualiza a tua palavra-passe de encriptação ao introduzir esta palavra-passe no campo 'palavra-passe antiga' e também a tua palavra-passe atual.\n\n", "The share will expire on %s." : "Esta partilha irá expirar em %s.", "Cheers!" : "Parabéns!", + "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Olá,<br><br>o administrador ativou a encriptação do lado do servidor. Os teus ficheiros foram encriptados usando a palavra-passe <strong>%s</strong>.<br><br>Por favor, faz login via browser, vai à secção 'Módulo de encriptação básica ownCloud' nas tuas definições pessoais e atualiza a tua palavra-passe de encriptação ao introduzir esta palavra-passe no campo 'palavra-passe antiga' e também a tua palavra-passe atual.<br><br>", "Encrypt the home storage" : "Encriptar o armazenamento do início", + "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Ativando esta opção todos os ficheiros armazenados no armazenamento principal serão encriptados, senão serão encriptados todos os ficheiros no armazenamento externo", "Enable recovery key" : "Ativar a chave de recuperação", "Disable recovery key" : "Desativar a chave de recuperação", "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperação é uma chave de encriptação extra que é utilizada para encriptar os ficheiros. Esta permite a recuperação dos ficheiros do utilizador se este esquecer a sua senha.", diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 9588faebc3b..61148428f79 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -682,8 +682,6 @@ table tr.summary td { margin-left: 90px; } -#scanning-message{ top:40%; left:40%; position:absolute; display:none; } - table.dragshadow { width:auto; } diff --git a/apps/files/l10n/af_ZA.js b/apps/files/l10n/af_ZA.js index ddc06b6c11f..7e5e98ed493 100644 --- a/apps/files/l10n/af_ZA.js +++ b/apps/files/l10n/af_ZA.js @@ -1,6 +1,7 @@ OC.L10N.register( "files", { + "Unshare" : "Deel terug neem", "Folder" : "Omslag", "Settings" : "Instellings" }, diff --git a/apps/files/l10n/af_ZA.json b/apps/files/l10n/af_ZA.json index bad49a673e0..1f27a43719c 100644 --- a/apps/files/l10n/af_ZA.json +++ b/apps/files/l10n/af_ZA.json @@ -1,4 +1,5 @@ { "translations": { + "Unshare" : "Deel terug neem", "Folder" : "Omslag", "Settings" : "Instellings" },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/apps/files/l10n/ar.js b/apps/files/l10n/ar.js index 021c6b52b32..a2329a0b57d 100644 --- a/apps/files/l10n/ar.js +++ b/apps/files/l10n/ar.js @@ -90,8 +90,6 @@ OC.L10N.register( "Select all" : "تحديد الكل ", "Upload too large" : "حجم الترفيع أعلى من المسموح", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم.", - "Files are being scanned, please wait." : "يرجى الانتظار , جاري فحص الملفات .", - "Currently scanning" : "حالياً يقوم بالفحص", "No favorites" : "لا يوجد مفضلات ", "Files and folders you mark as favorite will show up here" : "الملفات والمجلدات التي حددتها كامفضلة سوف تظهر هنا ", "Text file" : "ملف نصي", diff --git a/apps/files/l10n/ar.json b/apps/files/l10n/ar.json index 53385598c24..fbc3f2e21d5 100644 --- a/apps/files/l10n/ar.json +++ b/apps/files/l10n/ar.json @@ -88,8 +88,6 @@ "Select all" : "تحديد الكل ", "Upload too large" : "حجم الترفيع أعلى من المسموح", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم.", - "Files are being scanned, please wait." : "يرجى الانتظار , جاري فحص الملفات .", - "Currently scanning" : "حالياً يقوم بالفحص", "No favorites" : "لا يوجد مفضلات ", "Files and folders you mark as favorite will show up here" : "الملفات والمجلدات التي حددتها كامفضلة سوف تظهر هنا ", "Text file" : "ملف نصي", diff --git a/apps/files/l10n/ast.js b/apps/files/l10n/ast.js index 637adcebc75..2262d23345e 100644 --- a/apps/files/l10n/ast.js +++ b/apps/files/l10n/ast.js @@ -100,8 +100,6 @@ OC.L10N.register( "Select all" : "Esbillar too", "Upload too large" : "La xuba ye abondo grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los ficheros que tas intentando xubir perpasen el tamañu máximu pa les xubíes de ficheros nesti servidor.", - "Files are being scanned, please wait." : "Tan escaniándose los ficheros, espera por favor.", - "Currently scanning" : "Anguaño escaneando", "No favorites" : "Nengún favoritu", "Files and folders you mark as favorite will show up here" : "Los ficheros y carpetes que marque como favoritos apaecerán equí", "Text file" : "Ficheru de testu", diff --git a/apps/files/l10n/ast.json b/apps/files/l10n/ast.json index 352fbd9fac3..53a2c6f8d86 100644 --- a/apps/files/l10n/ast.json +++ b/apps/files/l10n/ast.json @@ -98,8 +98,6 @@ "Select all" : "Esbillar too", "Upload too large" : "La xuba ye abondo grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los ficheros que tas intentando xubir perpasen el tamañu máximu pa les xubíes de ficheros nesti servidor.", - "Files are being scanned, please wait." : "Tan escaniándose los ficheros, espera por favor.", - "Currently scanning" : "Anguaño escaneando", "No favorites" : "Nengún favoritu", "Files and folders you mark as favorite will show up here" : "Los ficheros y carpetes que marque como favoritos apaecerán equí", "Text file" : "Ficheru de testu", diff --git a/apps/files/l10n/az.js b/apps/files/l10n/az.js index 302bb051407..57db9be81be 100644 --- a/apps/files/l10n/az.js +++ b/apps/files/l10n/az.js @@ -97,8 +97,6 @@ OC.L10N.register( "Select all" : "Hamısıı seç", "Upload too large" : "Yüklənmə şox böyükdür", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Yükləmək istədiyiniz faylların həcmi, bu serverdə izin verilmiş maksimal yüklənmə həcmindən böyükdür.", - "Files are being scanned, please wait." : "Faylların skanı başlanıb, xahiş olunur gözləyəsiniz.", - "Currently scanning" : "Hal-hazırda skan edilir", "No favorites" : "Seçilmiş yoxdur", "Files and folders you mark as favorite will show up here" : "İstəkli qeyd etdiyiniz fayllar və qovluqlar burda göstəriləcək", "Text file" : "Tekst faylı", diff --git a/apps/files/l10n/az.json b/apps/files/l10n/az.json index b213c86cb2f..e1539015a83 100644 --- a/apps/files/l10n/az.json +++ b/apps/files/l10n/az.json @@ -95,8 +95,6 @@ "Select all" : "Hamısıı seç", "Upload too large" : "Yüklənmə şox böyükdür", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Yükləmək istədiyiniz faylların həcmi, bu serverdə izin verilmiş maksimal yüklənmə həcmindən böyükdür.", - "Files are being scanned, please wait." : "Faylların skanı başlanıb, xahiş olunur gözləyəsiniz.", - "Currently scanning" : "Hal-hazırda skan edilir", "No favorites" : "Seçilmiş yoxdur", "Files and folders you mark as favorite will show up here" : "İstəkli qeyd etdiyiniz fayllar və qovluqlar burda göstəriləcək", "Text file" : "Tekst faylı", diff --git a/apps/files/l10n/bg_BG.js b/apps/files/l10n/bg_BG.js index b30f670e310..dcc4508e2e2 100644 --- a/apps/files/l10n/bg_BG.js +++ b/apps/files/l10n/bg_BG.js @@ -34,6 +34,8 @@ OC.L10N.register( "Download" : "Изтегли", "Rename" : "Преименуване", "Delete" : "Изтрий", + "Disconnect storage" : "Извади дисковото устройство.", + "Unshare" : "Премахване на споделяне", "Details" : "Подробности", "Select" : "Избери", "Pending" : "Чакащо", @@ -87,8 +89,6 @@ OC.L10N.register( "Select all" : "Избери всички", "Upload too large" : "Прекалено голям файл за качване.", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файловете, които се опитваш да качиш са по-големи от позволеното на този сървър.", - "Files are being scanned, please wait." : "Файловете се сканирват, изчакайте.", - "Currently scanning" : "В момента се търси", "No favorites" : "Няма любими", "Files and folders you mark as favorite will show up here" : "Файловете и папките които отбелязваш като любими ще се показват тук", "Text file" : "Текстов файл" diff --git a/apps/files/l10n/bg_BG.json b/apps/files/l10n/bg_BG.json index e676d27fcba..88370db84f7 100644 --- a/apps/files/l10n/bg_BG.json +++ b/apps/files/l10n/bg_BG.json @@ -32,6 +32,8 @@ "Download" : "Изтегли", "Rename" : "Преименуване", "Delete" : "Изтрий", + "Disconnect storage" : "Извади дисковото устройство.", + "Unshare" : "Премахване на споделяне", "Details" : "Подробности", "Select" : "Избери", "Pending" : "Чакащо", @@ -85,8 +87,6 @@ "Select all" : "Избери всички", "Upload too large" : "Прекалено голям файл за качване.", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файловете, които се опитваш да качиш са по-големи от позволеното на този сървър.", - "Files are being scanned, please wait." : "Файловете се сканирват, изчакайте.", - "Currently scanning" : "В момента се търси", "No favorites" : "Няма любими", "Files and folders you mark as favorite will show up here" : "Файловете и папките които отбелязваш като любими ще се показват тук", "Text file" : "Текстов файл" diff --git a/apps/files/l10n/bn_BD.js b/apps/files/l10n/bn_BD.js index 0ee56888df0..e9020ade843 100644 --- a/apps/files/l10n/bn_BD.js +++ b/apps/files/l10n/bn_BD.js @@ -60,7 +60,6 @@ OC.L10N.register( "Cancel upload" : "আপলোড বাতিল কর", "Upload too large" : "আপলোডের আকারটি অনেক বড়", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন ", - "Files are being scanned, please wait." : "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।", "Text file" : "টেক্সট ফাইল" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/bn_BD.json b/apps/files/l10n/bn_BD.json index 15ec2b4b826..1cd65349314 100644 --- a/apps/files/l10n/bn_BD.json +++ b/apps/files/l10n/bn_BD.json @@ -58,7 +58,6 @@ "Cancel upload" : "আপলোড বাতিল কর", "Upload too large" : "আপলোডের আকারটি অনেক বড়", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন ", - "Files are being scanned, please wait." : "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।", "Text file" : "টেক্সট ফাইল" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/bs.js b/apps/files/l10n/bs.js index 278b6371771..a164132aeff 100644 --- a/apps/files/l10n/bs.js +++ b/apps/files/l10n/bs.js @@ -70,8 +70,6 @@ OC.L10N.register( "Select all" : "Označi sve", "Upload too large" : "Učitavanje je preveliko", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke koje pokušavate učitati prelaze maksimalnu veličinu za učitavanje datoteka na ovom serveru.", - "Files are being scanned, please wait." : "Datoteke se provjeravaju, molim pričekajte.", - "Currently scanning" : "Provjera u toku", "No favorites" : "Nema favorita", "Files and folders you mark as favorite will show up here" : "Datoteke i direktorij koje ste označili kao favorite će biti prikazane ovdje", "Text file" : "Tekstualna datoteka" diff --git a/apps/files/l10n/bs.json b/apps/files/l10n/bs.json index 678bedcbe36..3e7bb70cee8 100644 --- a/apps/files/l10n/bs.json +++ b/apps/files/l10n/bs.json @@ -68,8 +68,6 @@ "Select all" : "Označi sve", "Upload too large" : "Učitavanje je preveliko", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke koje pokušavate učitati prelaze maksimalnu veličinu za učitavanje datoteka na ovom serveru.", - "Files are being scanned, please wait." : "Datoteke se provjeravaju, molim pričekajte.", - "Currently scanning" : "Provjera u toku", "No favorites" : "Nema favorita", "Files and folders you mark as favorite will show up here" : "Datoteke i direktorij koje ste označili kao favorite će biti prikazane ovdje", "Text file" : "Tekstualna datoteka" diff --git a/apps/files/l10n/ca.js b/apps/files/l10n/ca.js index 88ad7224161..70626bb1ffa 100644 --- a/apps/files/l10n/ca.js +++ b/apps/files/l10n/ca.js @@ -34,6 +34,8 @@ OC.L10N.register( "Download" : "Baixa", "Rename" : "Reanomena", "Delete" : "Esborra", + "Disconnect storage" : "Desonnecta l'emmagatzematge", + "Unshare" : "Deixa de compartir", "Details" : "Detalls", "Select" : "Selecciona", "Pending" : "Pendent", @@ -90,8 +92,6 @@ OC.L10N.register( "Select all" : "Seleccionar tot", "Upload too large" : "La pujada és massa gran", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor", - "Files are being scanned, please wait." : "S'estan escanejant els fitxers, espereu", - "Currently scanning" : "Actualment escanejant", "No favorites" : "No hi ha favorits", "Files and folders you mark as favorite will show up here" : "Aquí apareixeran els arxius i carpetes que vostè marqui com favorits", "Text file" : "Fitxer de text" diff --git a/apps/files/l10n/ca.json b/apps/files/l10n/ca.json index 4eee482e835..3a9dae4e75e 100644 --- a/apps/files/l10n/ca.json +++ b/apps/files/l10n/ca.json @@ -32,6 +32,8 @@ "Download" : "Baixa", "Rename" : "Reanomena", "Delete" : "Esborra", + "Disconnect storage" : "Desonnecta l'emmagatzematge", + "Unshare" : "Deixa de compartir", "Details" : "Detalls", "Select" : "Selecciona", "Pending" : "Pendent", @@ -88,8 +90,6 @@ "Select all" : "Seleccionar tot", "Upload too large" : "La pujada és massa gran", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor", - "Files are being scanned, please wait." : "S'estan escanejant els fitxers, espereu", - "Currently scanning" : "Actualment escanejant", "No favorites" : "No hi ha favorits", "Files and folders you mark as favorite will show up here" : "Aquí apareixeran els arxius i carpetes que vostè marqui com favorits", "Text file" : "Fitxer de text" diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js index aa0a8515517..bf7eb4c895a 100644 --- a/apps/files/l10n/cs_CZ.js +++ b/apps/files/l10n/cs_CZ.js @@ -113,8 +113,6 @@ OC.L10N.register( "Select all" : "Vybrat vše", "Upload too large" : "Odesílaný soubor je příliš velký", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.", - "Files are being scanned, please wait." : "Soubory se prohledávají, prosím čekejte.", - "Currently scanning" : "Prohledává se", "No favorites" : "Žádné oblíbené", "Files and folders you mark as favorite will show up here" : "Soubory a adresáře označené jako oblíbené budou zobrazeny zde", "Text file" : "Textový soubor", diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json index e2acc3b8abc..97444abc876 100644 --- a/apps/files/l10n/cs_CZ.json +++ b/apps/files/l10n/cs_CZ.json @@ -111,8 +111,6 @@ "Select all" : "Vybrat vše", "Upload too large" : "Odesílaný soubor je příliš velký", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.", - "Files are being scanned, please wait." : "Soubory se prohledávají, prosím čekejte.", - "Currently scanning" : "Prohledává se", "No favorites" : "Žádné oblíbené", "Files and folders you mark as favorite will show up here" : "Soubory a adresáře označené jako oblíbené budou zobrazeny zde", "Text file" : "Textový soubor", diff --git a/apps/files/l10n/cy_GB.js b/apps/files/l10n/cy_GB.js index 983df98f350..e3879890b86 100644 --- a/apps/files/l10n/cy_GB.js +++ b/apps/files/l10n/cy_GB.js @@ -20,6 +20,7 @@ OC.L10N.register( "Download" : "Llwytho i lawr", "Rename" : "Ailenwi", "Delete" : "Dileu", + "Unshare" : "Dad-rannu", "Details" : "Manylion", "Pending" : "I ddod", "Name" : "Enw", @@ -39,7 +40,6 @@ OC.L10N.register( "Cancel upload" : "Diddymu llwytho i fyny", "Upload too large" : "Maint llwytho i fyny'n rhy fawr", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn.", - "Files are being scanned, please wait." : "Arhoswch, mae ffeiliau'n cael eu sganio.", "Text file" : "Ffeil destun" }, "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"); diff --git a/apps/files/l10n/cy_GB.json b/apps/files/l10n/cy_GB.json index b8b87b31dea..7d217d631ae 100644 --- a/apps/files/l10n/cy_GB.json +++ b/apps/files/l10n/cy_GB.json @@ -18,6 +18,7 @@ "Download" : "Llwytho i lawr", "Rename" : "Ailenwi", "Delete" : "Dileu", + "Unshare" : "Dad-rannu", "Details" : "Manylion", "Pending" : "I ddod", "Name" : "Enw", @@ -37,7 +38,6 @@ "Cancel upload" : "Diddymu llwytho i fyny", "Upload too large" : "Maint llwytho i fyny'n rhy fawr", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn.", - "Files are being scanned, please wait." : "Arhoswch, mae ffeiliau'n cael eu sganio.", "Text file" : "Ffeil destun" },"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;" }
\ No newline at end of file diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js index 2c27835f917..6b406fed534 100644 --- a/apps/files/l10n/da.js +++ b/apps/files/l10n/da.js @@ -34,6 +34,8 @@ OC.L10N.register( "Download" : "Download", "Rename" : "Omdøb", "Delete" : "Slet", + "Disconnect storage" : "Frakobl lager", + "Unshare" : "Fjern deling", "Details" : "Detaljer", "Select" : "Vælg", "Pending" : "Afventer", @@ -98,8 +100,6 @@ OC.L10N.register( "Select all" : "Vælg alle", "Upload too large" : "Upload er for stor", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.", - "Files are being scanned, please wait." : "Filerne bliver indlæst, vent venligst.", - "Currently scanning" : "Skanning er i gang", "No favorites" : "Ingen foretrukne", "Files and folders you mark as favorite will show up here" : "Filer og mapper som du har markeret som foretrukne, vil blive vist her", "Text file" : "Tekstfil", diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json index 33663829721..e186674656c 100644 --- a/apps/files/l10n/da.json +++ b/apps/files/l10n/da.json @@ -32,6 +32,8 @@ "Download" : "Download", "Rename" : "Omdøb", "Delete" : "Slet", + "Disconnect storage" : "Frakobl lager", + "Unshare" : "Fjern deling", "Details" : "Detaljer", "Select" : "Vælg", "Pending" : "Afventer", @@ -96,8 +98,6 @@ "Select all" : "Vælg alle", "Upload too large" : "Upload er for stor", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.", - "Files are being scanned, please wait." : "Filerne bliver indlæst, vent venligst.", - "Currently scanning" : "Skanning er i gang", "No favorites" : "Ingen foretrukne", "Files and folders you mark as favorite will show up here" : "Filer og mapper som du har markeret som foretrukne, vil blive vist her", "Text file" : "Tekstfil", diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js index 966c94e182c..960edf5b718 100644 --- a/apps/files/l10n/de.js +++ b/apps/files/l10n/de.js @@ -111,8 +111,6 @@ OC.L10N.register( "Select all" : "Alle auswählen", "Upload too large" : "Der Upload ist zu groß", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.", - "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten.", - "Currently scanning" : "Durchsuchen läuft", "No favorites" : "Keine Favoriten", "Files and folders you mark as favorite will show up here" : "Dateien und Ordner, die Du als Favoriten markierst, werden hier erscheinen", "Text file" : "Textdatei", diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json index 9d40e2dc31b..3d1e061781e 100644 --- a/apps/files/l10n/de.json +++ b/apps/files/l10n/de.json @@ -109,8 +109,6 @@ "Select all" : "Alle auswählen", "Upload too large" : "Der Upload ist zu groß", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.", - "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten.", - "Currently scanning" : "Durchsuchen läuft", "No favorites" : "Keine Favoriten", "Files and folders you mark as favorite will show up here" : "Dateien und Ordner, die Du als Favoriten markierst, werden hier erscheinen", "Text file" : "Textdatei", diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js index 517799c1bcb..15b82e0f181 100644 --- a/apps/files/l10n/de_DE.js +++ b/apps/files/l10n/de_DE.js @@ -109,8 +109,6 @@ OC.L10N.register( "Select all" : "Alle auswählen", "Upload too large" : "Der Upload ist zu groß", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.", - "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten.", - "Currently scanning" : "Durchsuchen läuft", "No favorites" : "Keine Favoriten", "Files and folders you mark as favorite will show up here" : "Dateien und Ordner, die Sie als Favoriten kennzeichnen, werden hier erscheinen", "Text file" : "Textdatei", diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json index 90e499bec2f..87e47454b62 100644 --- a/apps/files/l10n/de_DE.json +++ b/apps/files/l10n/de_DE.json @@ -107,8 +107,6 @@ "Select all" : "Alle auswählen", "Upload too large" : "Der Upload ist zu groß", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.", - "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten.", - "Currently scanning" : "Durchsuchen läuft", "No favorites" : "Keine Favoriten", "Files and folders you mark as favorite will show up here" : "Dateien und Ordner, die Sie als Favoriten kennzeichnen, werden hier erscheinen", "Text file" : "Textdatei", diff --git a/apps/files/l10n/el.js b/apps/files/l10n/el.js index 265381cd670..20b57e415b0 100644 --- a/apps/files/l10n/el.js +++ b/apps/files/l10n/el.js @@ -109,8 +109,6 @@ OC.L10N.register( "Select all" : "Επιλογή όλων", "Upload too large" : "Πολύ μεγάλο αρχείο προς αποστολή", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.", - "Files are being scanned, please wait." : "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.", - "Currently scanning" : "Σάρωση σε εξέλιξη", "No favorites" : "Δεν υπάρχουν αγαπημένα", "Files and folders you mark as favorite will show up here" : "Τα αρχεία και οι φάκελοι που σημειώνονται ως αγαπημένα θα εμφανιστούν εδώ ", "Text file" : "Αρχείο κειμένου", diff --git a/apps/files/l10n/el.json b/apps/files/l10n/el.json index 1f0d997b3da..849b0ee8a09 100644 --- a/apps/files/l10n/el.json +++ b/apps/files/l10n/el.json @@ -107,8 +107,6 @@ "Select all" : "Επιλογή όλων", "Upload too large" : "Πολύ μεγάλο αρχείο προς αποστολή", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.", - "Files are being scanned, please wait." : "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.", - "Currently scanning" : "Σάρωση σε εξέλιξη", "No favorites" : "Δεν υπάρχουν αγαπημένα", "Files and folders you mark as favorite will show up here" : "Τα αρχεία και οι φάκελοι που σημειώνονται ως αγαπημένα θα εμφανιστούν εδώ ", "Text file" : "Αρχείο κειμένου", diff --git a/apps/files/l10n/en_GB.js b/apps/files/l10n/en_GB.js index 96c5acf9170..03358df97a7 100644 --- a/apps/files/l10n/en_GB.js +++ b/apps/files/l10n/en_GB.js @@ -90,8 +90,6 @@ OC.L10N.register( "Select all" : "Select all", "Upload too large" : "Upload too large", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "The files you are trying to upload exceed the maximum size for file uploads on this server.", - "Files are being scanned, please wait." : "Files are being scanned, please wait.", - "Currently scanning" : "Currently scanning", "No favorites" : "No favourites", "Files and folders you mark as favorite will show up here" : "Files and folders you mark as favourite will show up here", "Text file" : "Text file" diff --git a/apps/files/l10n/en_GB.json b/apps/files/l10n/en_GB.json index 4b0762f8b70..f7b5e5e76f8 100644 --- a/apps/files/l10n/en_GB.json +++ b/apps/files/l10n/en_GB.json @@ -88,8 +88,6 @@ "Select all" : "Select all", "Upload too large" : "Upload too large", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "The files you are trying to upload exceed the maximum size for file uploads on this server.", - "Files are being scanned, please wait." : "Files are being scanned, please wait.", - "Currently scanning" : "Currently scanning", "No favorites" : "No favourites", "Files and folders you mark as favorite will show up here" : "Files and folders you mark as favourite will show up here", "Text file" : "Text file" diff --git a/apps/files/l10n/eo.js b/apps/files/l10n/eo.js index 398d2f669b0..4d52e391112 100644 --- a/apps/files/l10n/eo.js +++ b/apps/files/l10n/eo.js @@ -68,7 +68,6 @@ OC.L10N.register( "Select all" : "Elekti ĉion", "Upload too large" : "Alŝuto tro larĝa", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.", - "Files are being scanned, please wait." : "Dosieroj estas skanataj, bonvolu atendi.", "Text file" : "Tekstodosiero" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/eo.json b/apps/files/l10n/eo.json index 2a76d0ab2c9..844da285e2b 100644 --- a/apps/files/l10n/eo.json +++ b/apps/files/l10n/eo.json @@ -66,7 +66,6 @@ "Select all" : "Elekti ĉion", "Upload too large" : "Alŝuto tro larĝa", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.", - "Files are being scanned, please wait." : "Dosieroj estas skanataj, bonvolu atendi.", "Text file" : "Tekstodosiero" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js index 449334e7cc5..9b8b43ad5a1 100644 --- a/apps/files/l10n/es.js +++ b/apps/files/l10n/es.js @@ -113,8 +113,6 @@ OC.L10N.register( "Select all" : "Seleccionar todo", "Upload too large" : "Subida demasido grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que está intentando subir sobrepasan el tamaño máximo permitido en este servidor.", - "Files are being scanned, please wait." : "Los archivos se están escaneando, por favor espere.", - "Currently scanning" : "Escaneando en este momento", "No favorites" : "No hay favoritos", "Files and folders you mark as favorite will show up here" : "Aquí aparecerán los archivos y carpetas que usted marque como favoritos", "Text file" : "Archivo de texto", diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json index 7d0d2be207c..f0649db14b2 100644 --- a/apps/files/l10n/es.json +++ b/apps/files/l10n/es.json @@ -111,8 +111,6 @@ "Select all" : "Seleccionar todo", "Upload too large" : "Subida demasido grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que está intentando subir sobrepasan el tamaño máximo permitido en este servidor.", - "Files are being scanned, please wait." : "Los archivos se están escaneando, por favor espere.", - "Currently scanning" : "Escaneando en este momento", "No favorites" : "No hay favoritos", "Files and folders you mark as favorite will show up here" : "Aquí aparecerán los archivos y carpetas que usted marque como favoritos", "Text file" : "Archivo de texto", diff --git a/apps/files/l10n/es_AR.js b/apps/files/l10n/es_AR.js index 6c6b0d49853..bd4504592f1 100644 --- a/apps/files/l10n/es_AR.js +++ b/apps/files/l10n/es_AR.js @@ -34,6 +34,7 @@ OC.L10N.register( "Download" : "Descargar", "Rename" : "Cambiar nombre", "Delete" : "Borrar", + "Unshare" : "Dejar de compartir", "Details" : "Detalles", "Select" : "Seleccionar", "Pending" : "Pendientes", @@ -73,7 +74,6 @@ OC.L10N.register( "Cancel upload" : "Cancelar subida", "Upload too large" : "El tamaño del archivo que querés subir es demasiado grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que intentás subir sobrepasan el tamaño máximo ", - "Files are being scanned, please wait." : "Se están escaneando los archivos, por favor esperá.", "Text file" : "Archivo de texto" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/es_AR.json b/apps/files/l10n/es_AR.json index ad492b4048a..81898bf489d 100644 --- a/apps/files/l10n/es_AR.json +++ b/apps/files/l10n/es_AR.json @@ -32,6 +32,7 @@ "Download" : "Descargar", "Rename" : "Cambiar nombre", "Delete" : "Borrar", + "Unshare" : "Dejar de compartir", "Details" : "Detalles", "Select" : "Seleccionar", "Pending" : "Pendientes", @@ -71,7 +72,6 @@ "Cancel upload" : "Cancelar subida", "Upload too large" : "El tamaño del archivo que querés subir es demasiado grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que intentás subir sobrepasan el tamaño máximo ", - "Files are being scanned, please wait." : "Se están escaneando los archivos, por favor esperá.", "Text file" : "Archivo de texto" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/es_MX.js b/apps/files/l10n/es_MX.js index 9d4924d1d50..780c206c622 100644 --- a/apps/files/l10n/es_MX.js +++ b/apps/files/l10n/es_MX.js @@ -60,7 +60,6 @@ OC.L10N.register( "Cancel upload" : "Cancelar subida", "Upload too large" : "Subida demasido grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.", - "Files are being scanned, please wait." : "Los archivos están siendo escaneados, por favor espere.", "Text file" : "Archivo de texto" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/es_MX.json b/apps/files/l10n/es_MX.json index 9abf30f0c7c..17d5cb74e87 100644 --- a/apps/files/l10n/es_MX.json +++ b/apps/files/l10n/es_MX.json @@ -58,7 +58,6 @@ "Cancel upload" : "Cancelar subida", "Upload too large" : "Subida demasido grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.", - "Files are being scanned, please wait." : "Los archivos están siendo escaneados, por favor espere.", "Text file" : "Archivo de texto" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/et_EE.js b/apps/files/l10n/et_EE.js index f577fa663fc..5c59cf614b7 100644 --- a/apps/files/l10n/et_EE.js +++ b/apps/files/l10n/et_EE.js @@ -100,8 +100,6 @@ OC.L10N.register( "Select all" : "Vali kõik", "Upload too large" : "Üleslaadimine on liiga suur", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.", - "Files are being scanned, please wait." : "Faile skannitakse, palun oota.", - "Currently scanning" : "Praegu skännimisel", "No favorites" : "Lemmikuid pole", "Files and folders you mark as favorite will show up here" : "Siin kuvatakse faile ja kaustasid, mille oled märkinud lemmikuteks", "Text file" : "Tekstifail", diff --git a/apps/files/l10n/et_EE.json b/apps/files/l10n/et_EE.json index 078b8d2d6d7..f438d07cdc8 100644 --- a/apps/files/l10n/et_EE.json +++ b/apps/files/l10n/et_EE.json @@ -98,8 +98,6 @@ "Select all" : "Vali kõik", "Upload too large" : "Üleslaadimine on liiga suur", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.", - "Files are being scanned, please wait." : "Faile skannitakse, palun oota.", - "Currently scanning" : "Praegu skännimisel", "No favorites" : "Lemmikuid pole", "Files and folders you mark as favorite will show up here" : "Siin kuvatakse faile ja kaustasid, mille oled märkinud lemmikuteks", "Text file" : "Tekstifail", diff --git a/apps/files/l10n/eu.js b/apps/files/l10n/eu.js index d7b9935ac5e..16d681ebeab 100644 --- a/apps/files/l10n/eu.js +++ b/apps/files/l10n/eu.js @@ -86,8 +86,6 @@ OC.L10N.register( "Select all" : "Hautatu dena", "Upload too large" : "Igoera handiegia da", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.", - "Files are being scanned, please wait." : "Fitxategiak eskaneatzen ari da, itxoin mezedez.", - "Currently scanning" : "Eskaneatzen une honetan", "No favorites" : "Gogokorik ez", "Files and folders you mark as favorite will show up here" : "Gogokotzat markatutako fitxategi eta karpeta hemen agertuko dira", "Text file" : "Testu fitxategia" diff --git a/apps/files/l10n/eu.json b/apps/files/l10n/eu.json index 71dc13b5741..f23d06bb5db 100644 --- a/apps/files/l10n/eu.json +++ b/apps/files/l10n/eu.json @@ -84,8 +84,6 @@ "Select all" : "Hautatu dena", "Upload too large" : "Igoera handiegia da", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.", - "Files are being scanned, please wait." : "Fitxategiak eskaneatzen ari da, itxoin mezedez.", - "Currently scanning" : "Eskaneatzen une honetan", "No favorites" : "Gogokorik ez", "Files and folders you mark as favorite will show up here" : "Gogokotzat markatutako fitxategi eta karpeta hemen agertuko dira", "Text file" : "Testu fitxategia" diff --git a/apps/files/l10n/fa.js b/apps/files/l10n/fa.js index 5f6c49e742a..0d6086e0900 100644 --- a/apps/files/l10n/fa.js +++ b/apps/files/l10n/fa.js @@ -98,8 +98,6 @@ OC.L10N.register( "Select all" : "انتخاب همه", "Upload too large" : "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد", - "Files are being scanned, please wait." : "پرونده ها در حال بازرسی هستند لطفا صبر کنید", - "Currently scanning" : "در حال اسکن", "No favorites" : "هیچ برگزیده", "Files and folders you mark as favorite will show up here" : "فایلها و پوشههای انتخاب شده به عنوان برگزیده توسط شما، در اینجا نمایش داده میشود", "Text file" : "فایل متنی" diff --git a/apps/files/l10n/fa.json b/apps/files/l10n/fa.json index a4d0add25ba..109dfbdb585 100644 --- a/apps/files/l10n/fa.json +++ b/apps/files/l10n/fa.json @@ -96,8 +96,6 @@ "Select all" : "انتخاب همه", "Upload too large" : "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد", - "Files are being scanned, please wait." : "پرونده ها در حال بازرسی هستند لطفا صبر کنید", - "Currently scanning" : "در حال اسکن", "No favorites" : "هیچ برگزیده", "Files and folders you mark as favorite will show up here" : "فایلها و پوشههای انتخاب شده به عنوان برگزیده توسط شما، در اینجا نمایش داده میشود", "Text file" : "فایل متنی" diff --git a/apps/files/l10n/fi_FI.js b/apps/files/l10n/fi_FI.js index 5e1327f7556..62386eb781d 100644 --- a/apps/files/l10n/fi_FI.js +++ b/apps/files/l10n/fi_FI.js @@ -113,8 +113,6 @@ OC.L10N.register( "Select all" : "Valitse kaikki", "Upload too large" : "Lähetettävä tiedosto on liian suuri", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.", - "Files are being scanned, please wait." : "Tiedostoja tarkistetaan, odota hetki.", - "Currently scanning" : "Tutkitaan parhaillaan", "No favorites" : "Ei suosikkeja", "Files and folders you mark as favorite will show up here" : "Suosikeiksi merkitsemäsi tiedostot ja kansiot näkyvät täällä", "Text file" : "Tekstitiedosto", diff --git a/apps/files/l10n/fi_FI.json b/apps/files/l10n/fi_FI.json index baf6c5d4499..0484e85edd2 100644 --- a/apps/files/l10n/fi_FI.json +++ b/apps/files/l10n/fi_FI.json @@ -111,8 +111,6 @@ "Select all" : "Valitse kaikki", "Upload too large" : "Lähetettävä tiedosto on liian suuri", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.", - "Files are being scanned, please wait." : "Tiedostoja tarkistetaan, odota hetki.", - "Currently scanning" : "Tutkitaan parhaillaan", "No favorites" : "Ei suosikkeja", "Files and folders you mark as favorite will show up here" : "Suosikeiksi merkitsemäsi tiedostot ja kansiot näkyvät täällä", "Text file" : "Tekstitiedosto", diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js index 16f95572933..7521e95d3cd 100644 --- a/apps/files/l10n/fr.js +++ b/apps/files/l10n/fr.js @@ -113,8 +113,6 @@ OC.L10N.register( "Select all" : "Tout sélectionner", "Upload too large" : "Téléversement trop volumineux", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Les fichiers que vous essayez d'envoyer dépassent la taille maximale d'envoi permise par ce serveur.", - "Files are being scanned, please wait." : "Les fichiers sont en cours d'analyse, veuillez patienter.", - "Currently scanning" : "Analyse en cours", "No favorites" : "Aucun favori", "Files and folders you mark as favorite will show up here" : "Les fichiers et dossiers ajoutés à vos favoris apparaîtront ici", "Text file" : "Fichier texte", diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json index 3f8cdf95538..79e8cd78fe6 100644 --- a/apps/files/l10n/fr.json +++ b/apps/files/l10n/fr.json @@ -111,8 +111,6 @@ "Select all" : "Tout sélectionner", "Upload too large" : "Téléversement trop volumineux", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Les fichiers que vous essayez d'envoyer dépassent la taille maximale d'envoi permise par ce serveur.", - "Files are being scanned, please wait." : "Les fichiers sont en cours d'analyse, veuillez patienter.", - "Currently scanning" : "Analyse en cours", "No favorites" : "Aucun favori", "Files and folders you mark as favorite will show up here" : "Les fichiers et dossiers ajoutés à vos favoris apparaîtront ici", "Text file" : "Fichier texte", diff --git a/apps/files/l10n/gl.js b/apps/files/l10n/gl.js index 3b71b1669e7..e463ef16b3d 100644 --- a/apps/files/l10n/gl.js +++ b/apps/files/l10n/gl.js @@ -34,6 +34,8 @@ OC.L10N.register( "Download" : "Descargar", "Rename" : "Renomear", "Delete" : "Eliminar", + "Disconnect storage" : "Desconectar o almacenamento", + "Unshare" : "Deixar de compartir", "Details" : "Detalles", "Select" : "Seleccionar", "Pending" : "Pendentes", @@ -94,8 +96,6 @@ OC.L10N.register( "Select all" : "Seleccionar todo", "Upload too large" : "Envío grande de máis", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor", - "Files are being scanned, please wait." : "Estanse analizando os ficheiros. Agarde.", - "Currently scanning" : "Análise actual", "No favorites" : "Non hai favoritos", "Files and folders you mark as favorite will show up here" : "Os ficheiros e cartafoles que marque como favoritos amosaranse aquí", "Text file" : "Ficheiro de texto" diff --git a/apps/files/l10n/gl.json b/apps/files/l10n/gl.json index 73e6e523e44..418767c5167 100644 --- a/apps/files/l10n/gl.json +++ b/apps/files/l10n/gl.json @@ -32,6 +32,8 @@ "Download" : "Descargar", "Rename" : "Renomear", "Delete" : "Eliminar", + "Disconnect storage" : "Desconectar o almacenamento", + "Unshare" : "Deixar de compartir", "Details" : "Detalles", "Select" : "Seleccionar", "Pending" : "Pendentes", @@ -92,8 +94,6 @@ "Select all" : "Seleccionar todo", "Upload too large" : "Envío grande de máis", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor", - "Files are being scanned, please wait." : "Estanse analizando os ficheiros. Agarde.", - "Currently scanning" : "Análise actual", "No favorites" : "Non hai favoritos", "Files and folders you mark as favorite will show up here" : "Os ficheiros e cartafoles que marque como favoritos amosaranse aquí", "Text file" : "Ficheiro de texto" diff --git a/apps/files/l10n/he.js b/apps/files/l10n/he.js index a13de0027cf..ceb7ae68032 100644 --- a/apps/files/l10n/he.js +++ b/apps/files/l10n/he.js @@ -112,8 +112,6 @@ OC.L10N.register( "Select all" : "לבחור הכול", "Upload too large" : "העלאה גדולה מידי", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.", - "Files are being scanned, please wait." : "הקבצים נסרקים, נא להמתין.", - "Currently scanning" : "בסריקה כרגע", "No favorites" : "אין מועדפים", "Files and folders you mark as favorite will show up here" : "קבצים ותיקיות שסומנו על ידך כמועדפים יוצגו כאן", "Text file" : "קובץ טקסט", diff --git a/apps/files/l10n/he.json b/apps/files/l10n/he.json index dc470432c51..5279886e423 100644 --- a/apps/files/l10n/he.json +++ b/apps/files/l10n/he.json @@ -110,8 +110,6 @@ "Select all" : "לבחור הכול", "Upload too large" : "העלאה גדולה מידי", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.", - "Files are being scanned, please wait." : "הקבצים נסרקים, נא להמתין.", - "Currently scanning" : "בסריקה כרגע", "No favorites" : "אין מועדפים", "Files and folders you mark as favorite will show up here" : "קבצים ותיקיות שסומנו על ידך כמועדפים יוצגו כאן", "Text file" : "קובץ טקסט", diff --git a/apps/files/l10n/hr.js b/apps/files/l10n/hr.js index 6f27879f125..746ee8ded91 100644 --- a/apps/files/l10n/hr.js +++ b/apps/files/l10n/hr.js @@ -34,6 +34,8 @@ OC.L10N.register( "Download" : "Preuzimanje", "Rename" : "Preimenujte", "Delete" : "Izbrišite", + "Disconnect storage" : "Isključite pohranu", + "Unshare" : "Prestanite dijeliti", "Details" : "Detalji", "Select" : "Selektiraj", "Pending" : "Na čekanju", @@ -84,8 +86,6 @@ OC.L10N.register( "Select all" : "Selektiraj sve", "Upload too large" : "Unos je prevelik", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke koje pokušavate učitati premašuju maksimalnu veličinu za unos datoteka na ovom poslužitelju.", - "Files are being scanned, please wait." : "Datoteke se provjeravaju, molimo pričekajte.", - "Currently scanning" : "Provjera u tijeku", "No favorites" : "Nema favorita", "Files and folders you mark as favorite will show up here" : "Fajlovi i folderi koje oznacite kao favorite ce se prikazati ovdje", "Text file" : "Tekstualna datoteka" diff --git a/apps/files/l10n/hr.json b/apps/files/l10n/hr.json index 9377b55ef6f..35bc43df7e0 100644 --- a/apps/files/l10n/hr.json +++ b/apps/files/l10n/hr.json @@ -32,6 +32,8 @@ "Download" : "Preuzimanje", "Rename" : "Preimenujte", "Delete" : "Izbrišite", + "Disconnect storage" : "Isključite pohranu", + "Unshare" : "Prestanite dijeliti", "Details" : "Detalji", "Select" : "Selektiraj", "Pending" : "Na čekanju", @@ -82,8 +84,6 @@ "Select all" : "Selektiraj sve", "Upload too large" : "Unos je prevelik", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke koje pokušavate učitati premašuju maksimalnu veličinu za unos datoteka na ovom poslužitelju.", - "Files are being scanned, please wait." : "Datoteke se provjeravaju, molimo pričekajte.", - "Currently scanning" : "Provjera u tijeku", "No favorites" : "Nema favorita", "Files and folders you mark as favorite will show up here" : "Fajlovi i folderi koje oznacite kao favorite ce se prikazati ovdje", "Text file" : "Tekstualna datoteka" diff --git a/apps/files/l10n/hu_HU.js b/apps/files/l10n/hu_HU.js index 321a02235b2..399c70932b7 100644 --- a/apps/files/l10n/hu_HU.js +++ b/apps/files/l10n/hu_HU.js @@ -113,8 +113,6 @@ OC.L10N.register( "Select all" : "Összes kijelölése", "Upload too large" : "A feltöltés túl nagy", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.", - "Files are being scanned, please wait." : "A fájllista ellenőrzése zajlik, kis türelmet!", - "Currently scanning" : "Mappaellenőrzés: ", "No favorites" : "Nincsenek kedvencek", "Files and folders you mark as favorite will show up here" : "A kedvencnek jelölt fájlokat és mappákat itt találod meg", "Text file" : "Szövegfájl", diff --git a/apps/files/l10n/hu_HU.json b/apps/files/l10n/hu_HU.json index d54eb151ae1..fdad8332499 100644 --- a/apps/files/l10n/hu_HU.json +++ b/apps/files/l10n/hu_HU.json @@ -111,8 +111,6 @@ "Select all" : "Összes kijelölése", "Upload too large" : "A feltöltés túl nagy", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.", - "Files are being scanned, please wait." : "A fájllista ellenőrzése zajlik, kis türelmet!", - "Currently scanning" : "Mappaellenőrzés: ", "No favorites" : "Nincsenek kedvencek", "Files and folders you mark as favorite will show up here" : "A kedvencnek jelölt fájlokat és mappákat itt találod meg", "Text file" : "Szövegfájl", diff --git a/apps/files/l10n/id.js b/apps/files/l10n/id.js index 07b33195d48..c67a74e43da 100644 --- a/apps/files/l10n/id.js +++ b/apps/files/l10n/id.js @@ -100,8 +100,6 @@ OC.L10N.register( "Select all" : "Pilih Semua", "Upload too large" : "Yang diunggah terlalu besar", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.", - "Files are being scanned, please wait." : "Berkas sedang dipindai, silakan tunggu.", - "Currently scanning" : "Pemindaian terbaru", "No favorites" : "Tidak ada favorit", "Files and folders you mark as favorite will show up here" : "Berkas dan folder yang Anda tandai sebagai favorit akan ditampilkan disini.", "Text file" : "Berkas teks", diff --git a/apps/files/l10n/id.json b/apps/files/l10n/id.json index efe7c4559e7..68f01e0393a 100644 --- a/apps/files/l10n/id.json +++ b/apps/files/l10n/id.json @@ -98,8 +98,6 @@ "Select all" : "Pilih Semua", "Upload too large" : "Yang diunggah terlalu besar", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.", - "Files are being scanned, please wait." : "Berkas sedang dipindai, silakan tunggu.", - "Currently scanning" : "Pemindaian terbaru", "No favorites" : "Tidak ada favorit", "Files and folders you mark as favorite will show up here" : "Berkas dan folder yang Anda tandai sebagai favorit akan ditampilkan disini.", "Text file" : "Berkas teks", diff --git a/apps/files/l10n/is.js b/apps/files/l10n/is.js index b768e0dfc75..ed1fce950b7 100644 --- a/apps/files/l10n/is.js +++ b/apps/files/l10n/is.js @@ -41,7 +41,6 @@ OC.L10N.register( "Select all" : "Velja allt", "Upload too large" : "Innsend skrá er of stór", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.", - "Files are being scanned, please wait." : "Verið er að skima skrár, vinsamlegast hinkraðu.", "Text file" : "Texta skrá" }, "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"); diff --git a/apps/files/l10n/is.json b/apps/files/l10n/is.json index b8f53405847..266a4f054bc 100644 --- a/apps/files/l10n/is.json +++ b/apps/files/l10n/is.json @@ -39,7 +39,6 @@ "Select all" : "Velja allt", "Upload too large" : "Innsend skrá er of stór", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.", - "Files are being scanned, please wait." : "Verið er að skima skrár, vinsamlegast hinkraðu.", "Text file" : "Texta skrá" },"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);" }
\ No newline at end of file diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js index d3a567e1d18..57e78597c54 100644 --- a/apps/files/l10n/it.js +++ b/apps/files/l10n/it.js @@ -113,8 +113,6 @@ OC.L10N.register( "Select all" : "Seleziona tutto", "Upload too large" : "Caricamento troppo grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "I file che stai provando a caricare superano la dimensione massima consentita su questo server.", - "Files are being scanned, please wait." : "Scansione dei file in corso, attendi", - "Currently scanning" : "Scansione in corso", "No favorites" : "Nessun preferito", "Files and folders you mark as favorite will show up here" : "I file e le cartelle che marchi come preferiti saranno mostrati qui", "Text file" : "File di testo", diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json index 611de295147..cdd7366fcc5 100644 --- a/apps/files/l10n/it.json +++ b/apps/files/l10n/it.json @@ -111,8 +111,6 @@ "Select all" : "Seleziona tutto", "Upload too large" : "Caricamento troppo grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "I file che stai provando a caricare superano la dimensione massima consentita su questo server.", - "Files are being scanned, please wait." : "Scansione dei file in corso, attendi", - "Currently scanning" : "Scansione in corso", "No favorites" : "Nessun preferito", "Files and folders you mark as favorite will show up here" : "I file e le cartelle che marchi come preferiti saranno mostrati qui", "Text file" : "File di testo", diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js index cd6f45f27b9..deb3a35b635 100644 --- a/apps/files/l10n/ja.js +++ b/apps/files/l10n/ja.js @@ -34,6 +34,8 @@ OC.L10N.register( "Download" : "ダウンロード", "Rename" : "名前の変更", "Delete" : "削除", + "Disconnect storage" : "ストレージを切断する", + "Unshare" : "共有解除", "Details" : "詳細", "Select" : "選択", "Pending" : "中断", @@ -111,8 +113,6 @@ OC.L10N.register( "Select all" : "すべて選択", "Upload too large" : "アップロードには大きすぎます。", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。", - "Files are being scanned, please wait." : "ファイルをスキャンしています、しばらくお待ちください。", - "Currently scanning" : "現在スキャン中", "No favorites" : "お気に入りなし", "Files and folders you mark as favorite will show up here" : "お気に入りに登録されたファイルやフォルダーは、ここに表示されます。", "Text file" : "テキストファイル", diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json index 01d93403c20..aa3c45dcaa3 100644 --- a/apps/files/l10n/ja.json +++ b/apps/files/l10n/ja.json @@ -32,6 +32,8 @@ "Download" : "ダウンロード", "Rename" : "名前の変更", "Delete" : "削除", + "Disconnect storage" : "ストレージを切断する", + "Unshare" : "共有解除", "Details" : "詳細", "Select" : "選択", "Pending" : "中断", @@ -109,8 +111,6 @@ "Select all" : "すべて選択", "Upload too large" : "アップロードには大きすぎます。", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。", - "Files are being scanned, please wait." : "ファイルをスキャンしています、しばらくお待ちください。", - "Currently scanning" : "現在スキャン中", "No favorites" : "お気に入りなし", "Files and folders you mark as favorite will show up here" : "お気に入りに登録されたファイルやフォルダーは、ここに表示されます。", "Text file" : "テキストファイル", diff --git a/apps/files/l10n/ka_GE.js b/apps/files/l10n/ka_GE.js index f5a57f44266..c54da5a206d 100644 --- a/apps/files/l10n/ka_GE.js +++ b/apps/files/l10n/ka_GE.js @@ -22,6 +22,7 @@ OC.L10N.register( "Download" : "ჩამოტვირთვა", "Rename" : "გადარქმევა", "Delete" : "წაშლა", + "Unshare" : "გაუზიარებადი", "Details" : "დეტალური ინფორმაცია", "Pending" : "მოცდის რეჟიმში", "Name" : "სახელი", @@ -44,7 +45,6 @@ OC.L10N.register( "Cancel upload" : "ატვირთვის გაუქმება", "Upload too large" : "ასატვირთი ფაილი ძალიან დიდია", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს.", - "Files are being scanned, please wait." : "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ.", "Text file" : "ტექსტური ფაილი" }, "nplurals=1; plural=0;"); diff --git a/apps/files/l10n/ka_GE.json b/apps/files/l10n/ka_GE.json index cb8f6dce6fd..cdc9cd03126 100644 --- a/apps/files/l10n/ka_GE.json +++ b/apps/files/l10n/ka_GE.json @@ -20,6 +20,7 @@ "Download" : "ჩამოტვირთვა", "Rename" : "გადარქმევა", "Delete" : "წაშლა", + "Unshare" : "გაუზიარებადი", "Details" : "დეტალური ინფორმაცია", "Pending" : "მოცდის რეჟიმში", "Name" : "სახელი", @@ -42,7 +43,6 @@ "Cancel upload" : "ატვირთვის გაუქმება", "Upload too large" : "ასატვირთი ფაილი ძალიან დიდია", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს.", - "Files are being scanned, please wait." : "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ.", "Text file" : "ტექსტური ფაილი" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files/l10n/kn.js b/apps/files/l10n/kn.js index f9fb8977f93..1e97d7ffa79 100644 --- a/apps/files/l10n/kn.js +++ b/apps/files/l10n/kn.js @@ -55,8 +55,6 @@ OC.L10N.register( "Select all" : "ಎಲ್ಲಾ ಆಯ್ಕೆ ಮಾಡಿ", "Upload too large" : "ದೊಡ್ಡ ಪ್ರಮಾಣದ ಪ್ರತಿಗಳನ್ನು ವರ್ಗಾವಣೆ ಮಾಡಲು ಸಾದ್ಯವಿಲ್ಲ", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ನೀವು ವರ್ಗಾಯಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿರುವ ಕಡತಗಳ ಗಾತ್ರ, ಈ ಗಣಕ ಕೋಶದ ಗರಿಷ್ಠ ಕಡತ ಮೀತಿಯಾನ್ನು ಮೀರುವಂತಿಲ್ಲ.", - "Files are being scanned, please wait." : "ಕಡತಗಳನ್ನು ಪರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ, ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ.", - "Currently scanning" : "ಪ್ರಸ್ತುತ ಪರೀಕ್ಷೆ", "No favorites" : "ಯಾವ ಅಚ್ಚುಮೆಚ್ಚಿನವುಗಳು ಇಲ್ಲ", "Files and folders you mark as favorite will show up here" : "ನೀವು ಗುರುತು ಮಾಡಿರುವ ನೆಚ್ಚಿನ ಕಡತ ಮತ್ತು ಕಡತಕೋಶಗಳನ್ನು ಇಲ್ಲಿ ತೋರಿಸಲಾಗುತ್ತಿದೆ", "Text file" : "ಸರಳಾಕ್ಷರದ ಕಡತ" diff --git a/apps/files/l10n/kn.json b/apps/files/l10n/kn.json index 12446a3f8b4..9ebd3cb619b 100644 --- a/apps/files/l10n/kn.json +++ b/apps/files/l10n/kn.json @@ -53,8 +53,6 @@ "Select all" : "ಎಲ್ಲಾ ಆಯ್ಕೆ ಮಾಡಿ", "Upload too large" : "ದೊಡ್ಡ ಪ್ರಮಾಣದ ಪ್ರತಿಗಳನ್ನು ವರ್ಗಾವಣೆ ಮಾಡಲು ಸಾದ್ಯವಿಲ್ಲ", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ನೀವು ವರ್ಗಾಯಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿರುವ ಕಡತಗಳ ಗಾತ್ರ, ಈ ಗಣಕ ಕೋಶದ ಗರಿಷ್ಠ ಕಡತ ಮೀತಿಯಾನ್ನು ಮೀರುವಂತಿಲ್ಲ.", - "Files are being scanned, please wait." : "ಕಡತಗಳನ್ನು ಪರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ, ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ.", - "Currently scanning" : "ಪ್ರಸ್ತುತ ಪರೀಕ್ಷೆ", "No favorites" : "ಯಾವ ಅಚ್ಚುಮೆಚ್ಚಿನವುಗಳು ಇಲ್ಲ", "Files and folders you mark as favorite will show up here" : "ನೀವು ಗುರುತು ಮಾಡಿರುವ ನೆಚ್ಚಿನ ಕಡತ ಮತ್ತು ಕಡತಕೋಶಗಳನ್ನು ಇಲ್ಲಿ ತೋರಿಸಲಾಗುತ್ತಿದೆ", "Text file" : "ಸರಳಾಕ್ಷರದ ಕಡತ" diff --git a/apps/files/l10n/ko.js b/apps/files/l10n/ko.js index e6d0f0a1b89..3bac96b5eb8 100644 --- a/apps/files/l10n/ko.js +++ b/apps/files/l10n/ko.js @@ -100,8 +100,6 @@ OC.L10N.register( "Select all" : "모두 선택", "Upload too large" : "업로드한 파일이 너무 큼", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.", - "Files are being scanned, please wait." : "파일을 검색하고 있습니다. 기다려 주십시오.", - "Currently scanning" : "현재 검사 중", "No favorites" : "책갈피 없음", "Files and folders you mark as favorite will show up here" : "책갈피에 추가한 파일과 폴더가 여기에 나타납니다", "Text file" : "텍스트 파일", diff --git a/apps/files/l10n/ko.json b/apps/files/l10n/ko.json index e695b9cd42c..e42745fc8b4 100644 --- a/apps/files/l10n/ko.json +++ b/apps/files/l10n/ko.json @@ -98,8 +98,6 @@ "Select all" : "모두 선택", "Upload too large" : "업로드한 파일이 너무 큼", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.", - "Files are being scanned, please wait." : "파일을 검색하고 있습니다. 기다려 주십시오.", - "Currently scanning" : "현재 검사 중", "No favorites" : "책갈피 없음", "Files and folders you mark as favorite will show up here" : "책갈피에 추가한 파일과 폴더가 여기에 나타납니다", "Text file" : "텍스트 파일", diff --git a/apps/files/l10n/lb.js b/apps/files/l10n/lb.js index 39e12b763cd..c6ee76819ec 100644 --- a/apps/files/l10n/lb.js +++ b/apps/files/l10n/lb.js @@ -17,6 +17,7 @@ OC.L10N.register( "Download" : "Download", "Rename" : "Ëmbenennen", "Delete" : "Läschen", + "Unshare" : "Net méi deelen", "Details" : "Detailer", "Select" : "Auswielen", "Name" : "Numm", @@ -36,7 +37,6 @@ OC.L10N.register( "Select all" : "All auswielen", "Upload too large" : "Upload ze grouss", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.", - "Files are being scanned, please wait." : "Fichieren gi gescannt, war weg.", "Text file" : "Text Fichier" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/lb.json b/apps/files/l10n/lb.json index 95148452566..59289599719 100644 --- a/apps/files/l10n/lb.json +++ b/apps/files/l10n/lb.json @@ -15,6 +15,7 @@ "Download" : "Download", "Rename" : "Ëmbenennen", "Delete" : "Läschen", + "Unshare" : "Net méi deelen", "Details" : "Detailer", "Select" : "Auswielen", "Name" : "Numm", @@ -34,7 +35,6 @@ "Select all" : "All auswielen", "Upload too large" : "Upload ze grouss", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.", - "Files are being scanned, please wait." : "Fichieren gi gescannt, war weg.", "Text file" : "Text Fichier" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/lt_LT.js b/apps/files/l10n/lt_LT.js index e93fb079d56..6e33b1ac7cc 100644 --- a/apps/files/l10n/lt_LT.js +++ b/apps/files/l10n/lt_LT.js @@ -34,6 +34,8 @@ OC.L10N.register( "Download" : "Atsisiųsti", "Rename" : "Pervadinti", "Delete" : "Ištrinti", + "Disconnect storage" : "Atjungti saugyklą", + "Unshare" : "Nebesidalinti", "Details" : "Informacija", "Select" : "Pasirinkiti", "Pending" : "Laukiantis", @@ -111,8 +113,6 @@ OC.L10N.register( "Select all" : "Pažymėti viską", "Upload too large" : "Įkėlimui failas per didelis", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje", - "Files are being scanned, please wait." : "Skenuojami failai, prašome palaukti.", - "Currently scanning" : "Šiuo metu skenuojama", "No favorites" : "Nėra mėgstamiausių", "Files and folders you mark as favorite will show up here" : "Failai ir aplankai, kuriuos pažymite mėgstamais, atsiras čia", "Text file" : "Teksto failas", diff --git a/apps/files/l10n/lt_LT.json b/apps/files/l10n/lt_LT.json index e6724be98cf..0d32d1dbb2a 100644 --- a/apps/files/l10n/lt_LT.json +++ b/apps/files/l10n/lt_LT.json @@ -32,6 +32,8 @@ "Download" : "Atsisiųsti", "Rename" : "Pervadinti", "Delete" : "Ištrinti", + "Disconnect storage" : "Atjungti saugyklą", + "Unshare" : "Nebesidalinti", "Details" : "Informacija", "Select" : "Pasirinkiti", "Pending" : "Laukiantis", @@ -109,8 +111,6 @@ "Select all" : "Pažymėti viską", "Upload too large" : "Įkėlimui failas per didelis", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje", - "Files are being scanned, please wait." : "Skenuojami failai, prašome palaukti.", - "Currently scanning" : "Šiuo metu skenuojama", "No favorites" : "Nėra mėgstamiausių", "Files and folders you mark as favorite will show up here" : "Failai ir aplankai, kuriuos pažymite mėgstamais, atsiras čia", "Text file" : "Teksto failas", diff --git a/apps/files/l10n/lv.js b/apps/files/l10n/lv.js index d615c8e5d28..f5533fd8995 100644 --- a/apps/files/l10n/lv.js +++ b/apps/files/l10n/lv.js @@ -34,6 +34,8 @@ OC.L10N.register( "Download" : "Lejupielādēt", "Rename" : "Pārsaukt", "Delete" : "Dzēst", + "Disconnect storage" : "Atvienot krātuvi", + "Unshare" : "Pārtraukt dalīšanos", "Details" : "Detaļas", "Select" : "Norādīt", "Pending" : "Gaida savu kārtu", @@ -86,8 +88,6 @@ OC.L10N.register( "Select all" : "Atzīmēt visu", "Upload too large" : "Datne ir par lielu, lai to augšupielādētu", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu", - "Files are being scanned, please wait." : "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.", - "Currently scanning" : "Pašlaik skenē", "No favorites" : "Nav favorītu", "Files and folders you mark as favorite will show up here" : "Faili un mapes, ko atzīmēsit kā favorītus, tiks rādīti šeit", "Text file" : "Teksta datne" diff --git a/apps/files/l10n/lv.json b/apps/files/l10n/lv.json index 0888d81ad64..18189049ed8 100644 --- a/apps/files/l10n/lv.json +++ b/apps/files/l10n/lv.json @@ -32,6 +32,8 @@ "Download" : "Lejupielādēt", "Rename" : "Pārsaukt", "Delete" : "Dzēst", + "Disconnect storage" : "Atvienot krātuvi", + "Unshare" : "Pārtraukt dalīšanos", "Details" : "Detaļas", "Select" : "Norādīt", "Pending" : "Gaida savu kārtu", @@ -84,8 +86,6 @@ "Select all" : "Atzīmēt visu", "Upload too large" : "Datne ir par lielu, lai to augšupielādētu", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu", - "Files are being scanned, please wait." : "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.", - "Currently scanning" : "Pašlaik skenē", "No favorites" : "Nav favorītu", "Files and folders you mark as favorite will show up here" : "Faili un mapes, ko atzīmēsit kā favorītus, tiks rādīti šeit", "Text file" : "Teksta datne" diff --git a/apps/files/l10n/mk.js b/apps/files/l10n/mk.js index 726938c57cd..ec8387af0f6 100644 --- a/apps/files/l10n/mk.js +++ b/apps/files/l10n/mk.js @@ -73,7 +73,6 @@ OC.L10N.register( "Select all" : "Избери се", "Upload too large" : "Фајлот кој се вчитува е преголем", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.", - "Files are being scanned, please wait." : "Се скенираат датотеки, ве молам почекајте.", "Files and folders you mark as favorite will show up here" : "Датотеките и папките кои ќе ги означите како чести, ќе се појават тука", "Text file" : "Текстуална датотека", "New text file.txt" : "Нова текстуална датотека file.txt" diff --git a/apps/files/l10n/mk.json b/apps/files/l10n/mk.json index 2c5b3a4d23d..e587f4883ef 100644 --- a/apps/files/l10n/mk.json +++ b/apps/files/l10n/mk.json @@ -71,7 +71,6 @@ "Select all" : "Избери се", "Upload too large" : "Фајлот кој се вчитува е преголем", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.", - "Files are being scanned, please wait." : "Се скенираат датотеки, ве молам почекајте.", "Files and folders you mark as favorite will show up here" : "Датотеките и папките кои ќе ги означите како чести, ќе се појават тука", "Text file" : "Текстуална датотека", "New text file.txt" : "Нова текстуална датотека file.txt" diff --git a/apps/files/l10n/ms_MY.js b/apps/files/l10n/ms_MY.js index b60faff6bd9..dcd0c8e15e8 100644 --- a/apps/files/l10n/ms_MY.js +++ b/apps/files/l10n/ms_MY.js @@ -33,7 +33,6 @@ OC.L10N.register( "Cancel upload" : "Batal muat naik", "Upload too large" : "Muatnaik terlalu besar", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server", - "Files are being scanned, please wait." : "Fail sedang diimbas, harap bersabar.", "Text file" : "Fail teks" }, "nplurals=1; plural=0;"); diff --git a/apps/files/l10n/ms_MY.json b/apps/files/l10n/ms_MY.json index fa78e9446b7..6f7b93d6ef1 100644 --- a/apps/files/l10n/ms_MY.json +++ b/apps/files/l10n/ms_MY.json @@ -31,7 +31,6 @@ "Cancel upload" : "Batal muat naik", "Upload too large" : "Muatnaik terlalu besar", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server", - "Files are being scanned, please wait." : "Fail sedang diimbas, harap bersabar.", "Text file" : "Fail teks" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js index 6152d599866..a49c7b1a3d8 100644 --- a/apps/files/l10n/nb_NO.js +++ b/apps/files/l10n/nb_NO.js @@ -113,8 +113,6 @@ OC.L10N.register( "Select all" : "Velg alle", "Upload too large" : "Filen er for stor", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filene du prøver å laste opp er for store til å laste opp til denne serveren.", - "Files are being scanned, please wait." : "Skanner filer, vennligst vent.", - "Currently scanning" : "Skanner nå", "No favorites" : "Ingen favoritter", "Files and folders you mark as favorite will show up here" : "Filer og mapper som du gjør til favoritter vises her", "Text file" : "Tekstfil", diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json index 9279b560f8e..860ac1633ab 100644 --- a/apps/files/l10n/nb_NO.json +++ b/apps/files/l10n/nb_NO.json @@ -111,8 +111,6 @@ "Select all" : "Velg alle", "Upload too large" : "Filen er for stor", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filene du prøver å laste opp er for store til å laste opp til denne serveren.", - "Files are being scanned, please wait." : "Skanner filer, vennligst vent.", - "Currently scanning" : "Skanner nå", "No favorites" : "Ingen favoritter", "Files and folders you mark as favorite will show up here" : "Filer og mapper som du gjør til favoritter vises her", "Text file" : "Tekstfil", diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js index d64dc68c474..41e1343f47e 100644 --- a/apps/files/l10n/nl.js +++ b/apps/files/l10n/nl.js @@ -112,8 +112,6 @@ OC.L10N.register( "Select all" : "Alles selecteren", "Upload too large" : "Upload is te groot", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server.", - "Files are being scanned, please wait." : "Bestanden worden gescand, even wachten.", - "Currently scanning" : "Nu aan het scannen", "No favorites" : "Geen favorieten", "Files and folders you mark as favorite will show up here" : "Bestanden en mappen die u favoriet vindt worden hier getoont", "Text file" : "Tekstbestand", diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json index 1268cc10863..5c6891d2d92 100644 --- a/apps/files/l10n/nl.json +++ b/apps/files/l10n/nl.json @@ -110,8 +110,6 @@ "Select all" : "Alles selecteren", "Upload too large" : "Upload is te groot", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server.", - "Files are being scanned, please wait." : "Bestanden worden gescand, even wachten.", - "Currently scanning" : "Nu aan het scannen", "No favorites" : "Geen favorieten", "Files and folders you mark as favorite will show up here" : "Bestanden en mappen die u favoriet vindt worden hier getoont", "Text file" : "Tekstbestand", diff --git a/apps/files/l10n/nn_NO.js b/apps/files/l10n/nn_NO.js index 519387d6baf..1e138d91b85 100644 --- a/apps/files/l10n/nn_NO.js +++ b/apps/files/l10n/nn_NO.js @@ -65,7 +65,6 @@ OC.L10N.register( "Cancel upload" : "Avbryt opplasting", "Upload too large" : "For stor opplasting", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.", - "Files are being scanned, please wait." : "Skannar filer, ver venleg og vent.", "Text file" : "Tekst fil" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/nn_NO.json b/apps/files/l10n/nn_NO.json index a29e272ebac..5645a61b6bc 100644 --- a/apps/files/l10n/nn_NO.json +++ b/apps/files/l10n/nn_NO.json @@ -63,7 +63,6 @@ "Cancel upload" : "Avbryt opplasting", "Upload too large" : "For stor opplasting", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.", - "Files are being scanned, please wait." : "Skannar filer, ver venleg og vent.", "Text file" : "Tekst fil" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/oc.js b/apps/files/l10n/oc.js index a6f59679a18..6fde5981b12 100644 --- a/apps/files/l10n/oc.js +++ b/apps/files/l10n/oc.js @@ -113,8 +113,6 @@ OC.L10N.register( "Select all" : "Seleccionar tot", "Upload too large" : "Mandadís tròp voluminós", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los fichièrs qu'ensajatz de mandar depassan la talha maximala de mandadís permesa per aqueste servidor.", - "Files are being scanned, please wait." : "Los fichièrs son en cors d'analisi, pacientatz.", - "Currently scanning" : "Analisi en cors", "No favorites" : "Pas cap de favorit", "Files and folders you mark as favorite will show up here" : "Los fichièrs e dorsièrs aponduts a vòstres favorits apareisseràn aicí", "Text file" : "Fichièr tèxte", diff --git a/apps/files/l10n/oc.json b/apps/files/l10n/oc.json index 61caa1724b5..37b2fc5f452 100644 --- a/apps/files/l10n/oc.json +++ b/apps/files/l10n/oc.json @@ -111,8 +111,6 @@ "Select all" : "Seleccionar tot", "Upload too large" : "Mandadís tròp voluminós", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los fichièrs qu'ensajatz de mandar depassan la talha maximala de mandadís permesa per aqueste servidor.", - "Files are being scanned, please wait." : "Los fichièrs son en cors d'analisi, pacientatz.", - "Currently scanning" : "Analisi en cors", "No favorites" : "Pas cap de favorit", "Files and folders you mark as favorite will show up here" : "Los fichièrs e dorsièrs aponduts a vòstres favorits apareisseràn aicí", "Text file" : "Fichièr tèxte", diff --git a/apps/files/l10n/pl.js b/apps/files/l10n/pl.js index de1d8581243..e28b7bc2581 100644 --- a/apps/files/l10n/pl.js +++ b/apps/files/l10n/pl.js @@ -87,8 +87,6 @@ OC.L10N.register( "Select all" : "Wybierz wszystko", "Upload too large" : "Ładowany plik jest za duży", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.", - "Files are being scanned, please wait." : "Skanowanie plików, proszę czekać.", - "Currently scanning" : "Aktualnie skanowane", "Text file" : "Plik tekstowy" }, "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/files/l10n/pl.json b/apps/files/l10n/pl.json index 491991c6f61..314caeb807a 100644 --- a/apps/files/l10n/pl.json +++ b/apps/files/l10n/pl.json @@ -85,8 +85,6 @@ "Select all" : "Wybierz wszystko", "Upload too large" : "Ładowany plik jest za duży", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.", - "Files are being scanned, please wait." : "Skanowanie plików, proszę czekać.", - "Currently scanning" : "Aktualnie skanowane", "Text file" : "Plik tekstowy" },"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js index 2cf4a3dbc80..aaa655baf5f 100644 --- a/apps/files/l10n/pt_BR.js +++ b/apps/files/l10n/pt_BR.js @@ -113,8 +113,6 @@ OC.L10N.register( "Select all" : "Selecionar tudo", "Upload too large" : "Arquivo muito grande para envio", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os arquivos que você está tentando enviar excedeu o tamanho máximo para arquivos no servidor.", - "Files are being scanned, please wait." : "Arquivos sendo escaneados, por favor aguarde.", - "Currently scanning" : "Atualmente escaneando", "No favorites" : "Sem favoritos", "Files and folders you mark as favorite will show up here" : "Arquivos e pastas que você marcou como favoritos são mostrados aqui", "Text file" : "Arquivo texto", diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json index be96373df6a..111695612ce 100644 --- a/apps/files/l10n/pt_BR.json +++ b/apps/files/l10n/pt_BR.json @@ -111,8 +111,6 @@ "Select all" : "Selecionar tudo", "Upload too large" : "Arquivo muito grande para envio", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os arquivos que você está tentando enviar excedeu o tamanho máximo para arquivos no servidor.", - "Files are being scanned, please wait." : "Arquivos sendo escaneados, por favor aguarde.", - "Currently scanning" : "Atualmente escaneando", "No favorites" : "Sem favoritos", "Files and folders you mark as favorite will show up here" : "Arquivos e pastas que você marcou como favoritos são mostrados aqui", "Text file" : "Arquivo texto", diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js index 6ef00a8f672..0e6c7d2b355 100644 --- a/apps/files/l10n/pt_PT.js +++ b/apps/files/l10n/pt_PT.js @@ -42,8 +42,17 @@ OC.L10N.register( "Unable to determine date" : "Impossível determinar a data", "This operation is forbidden" : "Esta operação é proibida", "This directory is unavailable, please check the logs or contact the administrator" : "Esta diretoria está indisponível, por favor, verifique os registos ou contacte o administrador", + "Could not move \"{file}\", target exists" : "Não foi possível mover \"{file}\", alvo já existe", "Could not move \"{file}\"" : "Não foi possivel mover o ficheiro \"{file}\"", "{newName} already exists" : "{newName} já existe", + "Could not rename \"{fileName}\", it does not exist any more" : "Não foi possível renomear \"{fileName}\", pois já não existe", + "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "O nome \"{targetName}\" já está em uso na pasta \"{dir}\". Por favor escolha um nome diferente.", + "Could not rename \"{fileName}\"" : "Não foi possível renomear \"{fileName}\"", + "Could not create file \"{file}\"" : "Não foi possível criar o ficheiro \"{file}\"", + "Could not create file \"{file}\" because it already exists" : "Não foi possível criar o ficheiro \"{file}\", porque este já existe", + "Could not create folder \"{dir}\"" : "Não foi possível criar a pasta \"{dir}\"", + "Could not create folder \"{dir}\" because it already exists" : "Não foi possível criar a pasta \"{dir}\", porque esta já existe", + "Error deleting file \"{fileName}\"." : "Erro ao apagar o ficheiro \"{fileName}\".", "No entries in this folder match '{filter}'" : "Nenhumas entradas nesta pasta correspondem a '{filter}'", "Name" : "Nome", "Size" : "Tamanho", @@ -92,6 +101,8 @@ OC.L10N.register( "Maximum upload size" : "Tamanho máximo de envio", "max. possible: " : "Máx. possível: ", "Save" : "Guardar", + "With PHP-FPM it might take 5 minutes for changes to be applied." : "Com o PHP-FPM pode demorar 5 minutos até que as alterações sejam aplicadas.", + "Missing permissions to edit from here." : "Faltam permissões para editar a partir daqui.", "Settings" : "Definições", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>", @@ -102,8 +113,6 @@ OC.L10N.register( "Select all" : "Seleccionar todos", "Upload too large" : "Upload muito grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.", - "Files are being scanned, please wait." : "Os ficheiros estão a ser analisados, por favor aguarde.", - "Currently scanning" : "A analisar", "No favorites" : "Sem favoritos", "Files and folders you mark as favorite will show up here" : "Os ficheiros e pastas que marcou como favoritos serão mostrados aqui", "Text file" : "Ficheiro de Texto", diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json index 4c40db8c3a9..1879f7b1ecf 100644 --- a/apps/files/l10n/pt_PT.json +++ b/apps/files/l10n/pt_PT.json @@ -40,8 +40,17 @@ "Unable to determine date" : "Impossível determinar a data", "This operation is forbidden" : "Esta operação é proibida", "This directory is unavailable, please check the logs or contact the administrator" : "Esta diretoria está indisponível, por favor, verifique os registos ou contacte o administrador", + "Could not move \"{file}\", target exists" : "Não foi possível mover \"{file}\", alvo já existe", "Could not move \"{file}\"" : "Não foi possivel mover o ficheiro \"{file}\"", "{newName} already exists" : "{newName} já existe", + "Could not rename \"{fileName}\", it does not exist any more" : "Não foi possível renomear \"{fileName}\", pois já não existe", + "The name \"{targetName}\" is already used in the folder \"{dir}\". Please choose a different name." : "O nome \"{targetName}\" já está em uso na pasta \"{dir}\". Por favor escolha um nome diferente.", + "Could not rename \"{fileName}\"" : "Não foi possível renomear \"{fileName}\"", + "Could not create file \"{file}\"" : "Não foi possível criar o ficheiro \"{file}\"", + "Could not create file \"{file}\" because it already exists" : "Não foi possível criar o ficheiro \"{file}\", porque este já existe", + "Could not create folder \"{dir}\"" : "Não foi possível criar a pasta \"{dir}\"", + "Could not create folder \"{dir}\" because it already exists" : "Não foi possível criar a pasta \"{dir}\", porque esta já existe", + "Error deleting file \"{fileName}\"." : "Erro ao apagar o ficheiro \"{fileName}\".", "No entries in this folder match '{filter}'" : "Nenhumas entradas nesta pasta correspondem a '{filter}'", "Name" : "Nome", "Size" : "Tamanho", @@ -90,6 +99,8 @@ "Maximum upload size" : "Tamanho máximo de envio", "max. possible: " : "Máx. possível: ", "Save" : "Guardar", + "With PHP-FPM it might take 5 minutes for changes to be applied." : "Com o PHP-FPM pode demorar 5 minutos até que as alterações sejam aplicadas.", + "Missing permissions to edit from here." : "Faltam permissões para editar a partir daqui.", "Settings" : "Definições", "WebDAV" : "WebDAV", "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>", @@ -100,8 +111,6 @@ "Select all" : "Seleccionar todos", "Upload too large" : "Upload muito grande", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.", - "Files are being scanned, please wait." : "Os ficheiros estão a ser analisados, por favor aguarde.", - "Currently scanning" : "A analisar", "No favorites" : "Sem favoritos", "Files and folders you mark as favorite will show up here" : "Os ficheiros e pastas que marcou como favoritos serão mostrados aqui", "Text file" : "Ficheiro de Texto", diff --git a/apps/files/l10n/ro.js b/apps/files/l10n/ro.js index e9114f5531e..bd869ce56d6 100644 --- a/apps/files/l10n/ro.js +++ b/apps/files/l10n/ro.js @@ -81,8 +81,6 @@ OC.L10N.register( "Select all" : "Selectează tot", "Upload too large" : "Fișierul încărcat este prea mare", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fișierele pe care încerci să le încarci depășesc limita de încărcare maximă admisă pe acest server.", - "Files are being scanned, please wait." : "Fișierele sunt scanate, te rog așteaptă.", - "Currently scanning" : "Acum scanează", "Text file" : "Fișier text" }, "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"); diff --git a/apps/files/l10n/ro.json b/apps/files/l10n/ro.json index ed4bf8e3851..b842342a09a 100644 --- a/apps/files/l10n/ro.json +++ b/apps/files/l10n/ro.json @@ -79,8 +79,6 @@ "Select all" : "Selectează tot", "Upload too large" : "Fișierul încărcat este prea mare", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fișierele pe care încerci să le încarci depășesc limita de încărcare maximă admisă pe acest server.", - "Files are being scanned, please wait." : "Fișierele sunt scanate, te rog așteaptă.", - "Currently scanning" : "Acum scanează", "Text file" : "Fișier text" },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));" }
\ No newline at end of file diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js index f262957fe55..510e8d8f08b 100644 --- a/apps/files/l10n/ru.js +++ b/apps/files/l10n/ru.js @@ -113,8 +113,6 @@ OC.L10N.register( "Select all" : "Выбрать все", "Upload too large" : "Файл слишком велик", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файлы, которые вы пытаетесь загрузить, превышают лимит максимального размера на этом сервере.", - "Files are being scanned, please wait." : "Идет сканирование файлов. Пожалуйста подождите.", - "Currently scanning" : "В настоящее время сканируется", "No favorites" : "Нет избранного", "Files and folders you mark as favorite will show up here" : "Здесь появятся файлы и каталоги, отмеченные как избранные", "Text file" : "Текстовый файл", diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json index 5c99a793ecd..f62125fa614 100644 --- a/apps/files/l10n/ru.json +++ b/apps/files/l10n/ru.json @@ -111,8 +111,6 @@ "Select all" : "Выбрать все", "Upload too large" : "Файл слишком велик", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файлы, которые вы пытаетесь загрузить, превышают лимит максимального размера на этом сервере.", - "Files are being scanned, please wait." : "Идет сканирование файлов. Пожалуйста подождите.", - "Currently scanning" : "В настоящее время сканируется", "No favorites" : "Нет избранного", "Files and folders you mark as favorite will show up here" : "Здесь появятся файлы и каталоги, отмеченные как избранные", "Text file" : "Текстовый файл", diff --git a/apps/files/l10n/si_LK.js b/apps/files/l10n/si_LK.js index 44e96c49fc6..4c26c421076 100644 --- a/apps/files/l10n/si_LK.js +++ b/apps/files/l10n/si_LK.js @@ -16,6 +16,7 @@ OC.L10N.register( "Download" : "බාන්න", "Rename" : "නැවත නම් කරන්න", "Delete" : "මකා දමන්න", + "Unshare" : "නොබෙදු", "Select" : "තෝරන්න", "Name" : "නම", "Size" : "ප්රමාණය", @@ -35,7 +36,6 @@ OC.L10N.register( "Cancel upload" : "උඩුගත කිරීම අත් හරින්න", "Upload too large" : "උඩුගත කිරීම විශාල වැඩිය", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය", - "Files are being scanned, please wait." : "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න", "Text file" : "පෙළ ගොනුව" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/si_LK.json b/apps/files/l10n/si_LK.json index 92bcea71587..2db6c10b75c 100644 --- a/apps/files/l10n/si_LK.json +++ b/apps/files/l10n/si_LK.json @@ -14,6 +14,7 @@ "Download" : "බාන්න", "Rename" : "නැවත නම් කරන්න", "Delete" : "මකා දමන්න", + "Unshare" : "නොබෙදු", "Select" : "තෝරන්න", "Name" : "නම", "Size" : "ප්රමාණය", @@ -33,7 +34,6 @@ "Cancel upload" : "උඩුගත කිරීම අත් හරින්න", "Upload too large" : "උඩුගත කිරීම විශාල වැඩිය", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය", - "Files are being scanned, please wait." : "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න", "Text file" : "පෙළ ගොනුව" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/sk_SK.js b/apps/files/l10n/sk_SK.js index ca7e107d1ca..52711dd9c7b 100644 --- a/apps/files/l10n/sk_SK.js +++ b/apps/files/l10n/sk_SK.js @@ -34,6 +34,8 @@ OC.L10N.register( "Download" : "Sťahovanie", "Rename" : "Premenovať", "Delete" : "Zmazať", + "Disconnect storage" : "Odpojiť úložisko", + "Unshare" : "Zrušiť zdieľanie", "Details" : "Podrobnosti", "Select" : "Vybrať", "Pending" : "Čaká", @@ -95,8 +97,6 @@ OC.L10N.register( "Select all" : "Vybrať všetko", "Upload too large" : "Nahrávanie je príliš veľké", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.", - "Files are being scanned, please wait." : "Čakajte, súbory sú prehľadávané.", - "Currently scanning" : "Prehľadáva sa", "No favorites" : "Žiadne obľúbené", "Files and folders you mark as favorite will show up here" : "Súbory a priečinky označené ako obľúbené budú zobrazené tu", "Text file" : "Textový súbor", diff --git a/apps/files/l10n/sk_SK.json b/apps/files/l10n/sk_SK.json index 4d03e18556a..ca371eb189c 100644 --- a/apps/files/l10n/sk_SK.json +++ b/apps/files/l10n/sk_SK.json @@ -32,6 +32,8 @@ "Download" : "Sťahovanie", "Rename" : "Premenovať", "Delete" : "Zmazať", + "Disconnect storage" : "Odpojiť úložisko", + "Unshare" : "Zrušiť zdieľanie", "Details" : "Podrobnosti", "Select" : "Vybrať", "Pending" : "Čaká", @@ -93,8 +95,6 @@ "Select all" : "Vybrať všetko", "Upload too large" : "Nahrávanie je príliš veľké", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.", - "Files are being scanned, please wait." : "Čakajte, súbory sú prehľadávané.", - "Currently scanning" : "Prehľadáva sa", "No favorites" : "Žiadne obľúbené", "Files and folders you mark as favorite will show up here" : "Súbory a priečinky označené ako obľúbené budú zobrazené tu", "Text file" : "Textový súbor", diff --git a/apps/files/l10n/sl.js b/apps/files/l10n/sl.js index 103b4861206..36cd3ba4f1b 100644 --- a/apps/files/l10n/sl.js +++ b/apps/files/l10n/sl.js @@ -40,6 +40,15 @@ OC.L10N.register( "Select" : "Izberi", "Pending" : "V čakanju ...", "Unable to determine date" : "Ni mogoče določiti datuma", + "Could not move \"{file}\"" : "Ni mogoče premakniti \"{file}\"", + "{newName} already exists" : "{newName} že obstaja", + "Could not rename \"{fileName}\", it does not exist any more" : "Ni mogoče preimenovati \"{fileName}\", ker datoteka ne obstaja več", + "Could not rename \"{fileName}\"" : "Ni mogoče preimenovati \"{fileName}\"", + "Could not create file \"{file}\"" : "Ni mogoče ustvariti datoteke \"{file}\"", + "Could not create file \"{file}\" because it already exists" : "Ni mogoče ustvariti datoteke \"{file}\", ker že obstaja", + "Could not create folder \"{dir}\"" : "Ni mogoče ustvariti mape \"{dir}\"", + "Could not create folder \"{dir}\" because it already exists" : "Ni mogoče ustvariti mape \"{dir}\", ker že obstaja", + "Error deleting file \"{fileName}\"." : "Napaka brisanja datoteke \"{fileName}\".", "No entries in this folder match '{filter}'" : "Ni zadetkov, ki bi bili skladni z nizom '{filter}'", "Name" : "Ime", "Size" : "Velikost", @@ -57,10 +66,13 @@ OC.L10N.register( "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Shramba uporabnika {owner} je polna ({usedSpacePercent}%).", "Your storage is almost full ({usedSpacePercent}%)" : "Prostor za shranjevanje je skoraj do konca zaseden ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["se sklada s filtrom '{filter}'","se skladata s filtrom '{filter}'","se skladajo s filtrom '{filter}'","se skladajo s filtrom '{filter}'"], + "Path" : "Pot", + "_%n byte_::_%n bytes_" : ["%n bajt","%n bajta","%n bajti","%n bajtov"], "Favorited" : "Označeno kot priljubljeno", "Favorite" : "Priljubljene", "Folder" : "Mapa", "New folder" : "Nova mapa", + "{newname} already exists" : "{newname} že obstaja", "Upload" : "Pošlji", "An error occurred while trying to update the tags" : "Prišlo je do napake med posodabljanjem oznak", "A new file or folder has been <strong>created</strong>" : "Nova datoteka ali mapa je <strong>ustvarjena</strong>", @@ -92,8 +104,6 @@ OC.L10N.register( "Select all" : "izberi vse", "Upload too large" : "Prekoračenje omejitve velikosti", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.", - "Files are being scanned, please wait." : "Poteka preučevanje datotek, počakajte ...", - "Currently scanning" : "Poteka preverjanje", "No favorites" : "Ni priljubljenih", "Files and folders you mark as favorite will show up here" : "Datoteke ali mape, ki so označene kot priljubljene, bodo izpisane tukaj.", "Text file" : "Besedilna datoteka" diff --git a/apps/files/l10n/sl.json b/apps/files/l10n/sl.json index ef5720b8be3..ea468b4e94d 100644 --- a/apps/files/l10n/sl.json +++ b/apps/files/l10n/sl.json @@ -38,6 +38,15 @@ "Select" : "Izberi", "Pending" : "V čakanju ...", "Unable to determine date" : "Ni mogoče določiti datuma", + "Could not move \"{file}\"" : "Ni mogoče premakniti \"{file}\"", + "{newName} already exists" : "{newName} že obstaja", + "Could not rename \"{fileName}\", it does not exist any more" : "Ni mogoče preimenovati \"{fileName}\", ker datoteka ne obstaja več", + "Could not rename \"{fileName}\"" : "Ni mogoče preimenovati \"{fileName}\"", + "Could not create file \"{file}\"" : "Ni mogoče ustvariti datoteke \"{file}\"", + "Could not create file \"{file}\" because it already exists" : "Ni mogoče ustvariti datoteke \"{file}\", ker že obstaja", + "Could not create folder \"{dir}\"" : "Ni mogoče ustvariti mape \"{dir}\"", + "Could not create folder \"{dir}\" because it already exists" : "Ni mogoče ustvariti mape \"{dir}\", ker že obstaja", + "Error deleting file \"{fileName}\"." : "Napaka brisanja datoteke \"{fileName}\".", "No entries in this folder match '{filter}'" : "Ni zadetkov, ki bi bili skladni z nizom '{filter}'", "Name" : "Ime", "Size" : "Velikost", @@ -55,10 +64,13 @@ "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Shramba uporabnika {owner} je polna ({usedSpacePercent}%).", "Your storage is almost full ({usedSpacePercent}%)" : "Prostor za shranjevanje je skoraj do konca zaseden ({usedSpacePercent}%)", "_matches '{filter}'_::_match '{filter}'_" : ["se sklada s filtrom '{filter}'","se skladata s filtrom '{filter}'","se skladajo s filtrom '{filter}'","se skladajo s filtrom '{filter}'"], + "Path" : "Pot", + "_%n byte_::_%n bytes_" : ["%n bajt","%n bajta","%n bajti","%n bajtov"], "Favorited" : "Označeno kot priljubljeno", "Favorite" : "Priljubljene", "Folder" : "Mapa", "New folder" : "Nova mapa", + "{newname} already exists" : "{newname} že obstaja", "Upload" : "Pošlji", "An error occurred while trying to update the tags" : "Prišlo je do napake med posodabljanjem oznak", "A new file or folder has been <strong>created</strong>" : "Nova datoteka ali mapa je <strong>ustvarjena</strong>", @@ -90,8 +102,6 @@ "Select all" : "izberi vse", "Upload too large" : "Prekoračenje omejitve velikosti", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.", - "Files are being scanned, please wait." : "Poteka preučevanje datotek, počakajte ...", - "Currently scanning" : "Poteka preverjanje", "No favorites" : "Ni priljubljenih", "Files and folders you mark as favorite will show up here" : "Datoteke ali mape, ki so označene kot priljubljene, bodo izpisane tukaj.", "Text file" : "Besedilna datoteka" diff --git a/apps/files/l10n/sq.js b/apps/files/l10n/sq.js index 023c06eb24b..f86f0af4937 100644 --- a/apps/files/l10n/sq.js +++ b/apps/files/l10n/sq.js @@ -113,8 +113,6 @@ OC.L10N.register( "Select all" : "Përzgjidhe krejt", "Upload too large" : "Ngarkim shumë i madh", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Kartelat që po rrekeni të ngarkoni e tejkalojnë madhësinë maksimale për ngarkime kartelash në këtë shërbyes.", - "Files are being scanned, please wait." : "Kartelat po kontrollohen, ju lutemi, pritni.", - "Currently scanning" : "Po kontrollohet", "No favorites" : "Pa të parapëlqyera", "Files and folders you mark as favorite will show up here" : "Këtu do të duken kartelat dhe dosjet që i shënoni si të parapëlqyera", "Text file" : "Kartelë tekst", diff --git a/apps/files/l10n/sq.json b/apps/files/l10n/sq.json index 8b15b6202c0..90f1af5b67f 100644 --- a/apps/files/l10n/sq.json +++ b/apps/files/l10n/sq.json @@ -111,8 +111,6 @@ "Select all" : "Përzgjidhe krejt", "Upload too large" : "Ngarkim shumë i madh", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Kartelat që po rrekeni të ngarkoni e tejkalojnë madhësinë maksimale për ngarkime kartelash në këtë shërbyes.", - "Files are being scanned, please wait." : "Kartelat po kontrollohen, ju lutemi, pritni.", - "Currently scanning" : "Po kontrollohet", "No favorites" : "Pa të parapëlqyera", "Files and folders you mark as favorite will show up here" : "Këtu do të duken kartelat dhe dosjet që i shënoni si të parapëlqyera", "Text file" : "Kartelë tekst", diff --git a/apps/files/l10n/sr.js b/apps/files/l10n/sr.js index 6a97b5f282f..fbfa08ecf86 100644 --- a/apps/files/l10n/sr.js +++ b/apps/files/l10n/sr.js @@ -100,8 +100,6 @@ OC.L10N.register( "Select all" : "Означи све", "Upload too large" : "Отпремање је превелико", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Фајлови које желите да отпремите превазилазе ограничење отпремања на овом серверу.", - "Files are being scanned, please wait." : "Скенирам фајлове, сачекајте.", - "Currently scanning" : "Тренутно скенирам", "No favorites" : "Нема омиљених", "Files and folders you mark as favorite will show up here" : "Фајлови и фасцикле које обележите као омиљене појавиће се овде", "Text file" : "текстуални фајл", diff --git a/apps/files/l10n/sr.json b/apps/files/l10n/sr.json index 7f319f6ab48..d231c5416c8 100644 --- a/apps/files/l10n/sr.json +++ b/apps/files/l10n/sr.json @@ -98,8 +98,6 @@ "Select all" : "Означи све", "Upload too large" : "Отпремање је превелико", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Фајлови које желите да отпремите превазилазе ограничење отпремања на овом серверу.", - "Files are being scanned, please wait." : "Скенирам фајлове, сачекајте.", - "Currently scanning" : "Тренутно скенирам", "No favorites" : "Нема омиљених", "Files and folders you mark as favorite will show up here" : "Фајлови и фасцикле које обележите као омиљене појавиће се овде", "Text file" : "текстуални фајл", diff --git a/apps/files/l10n/sr@latin.js b/apps/files/l10n/sr@latin.js index ed166f5ee87..7c62a464494 100644 --- a/apps/files/l10n/sr@latin.js +++ b/apps/files/l10n/sr@latin.js @@ -89,8 +89,6 @@ OC.L10N.register( "Select all" : "Označi sve", "Upload too large" : "Otpremanje je preveliko", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fajlovi koje želite da otpremite prevazilaze ograničenje otpremanja na ovom serveru.", - "Files are being scanned, please wait." : "Skeniram fajlove, sačekajte.", - "Currently scanning" : "Trenutno skeniram", "No favorites" : "Nema omiljenih", "Files and folders you mark as favorite will show up here" : "Fajlovi i fascikle koje obeležite kao omiljene pojaviće se ovde", "Text file" : "tekstualni fajl" diff --git a/apps/files/l10n/sr@latin.json b/apps/files/l10n/sr@latin.json index a58df8712a7..506ae677ca4 100644 --- a/apps/files/l10n/sr@latin.json +++ b/apps/files/l10n/sr@latin.json @@ -87,8 +87,6 @@ "Select all" : "Označi sve", "Upload too large" : "Otpremanje je preveliko", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fajlovi koje želite da otpremite prevazilaze ograničenje otpremanja na ovom serveru.", - "Files are being scanned, please wait." : "Skeniram fajlove, sačekajte.", - "Currently scanning" : "Trenutno skeniram", "No favorites" : "Nema omiljenih", "Files and folders you mark as favorite will show up here" : "Fajlovi i fascikle koje obeležite kao omiljene pojaviće se ovde", "Text file" : "tekstualni fajl" diff --git a/apps/files/l10n/sv.js b/apps/files/l10n/sv.js index f6df4ee16d0..a541fa8b9d5 100644 --- a/apps/files/l10n/sv.js +++ b/apps/files/l10n/sv.js @@ -97,8 +97,6 @@ OC.L10N.register( "Select all" : "Välj allt", "Upload too large" : "För stor uppladdning", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.", - "Files are being scanned, please wait." : "Filer skannas, var god vänta", - "Currently scanning" : "sökning pågår", "No favorites" : "Inga favoriter", "Files and folders you mark as favorite will show up here" : "Filer och mappar du markerat som favoriter kommer visas här", "Text file" : "Textfil", diff --git a/apps/files/l10n/sv.json b/apps/files/l10n/sv.json index 143e35a1e0a..09da48516a2 100644 --- a/apps/files/l10n/sv.json +++ b/apps/files/l10n/sv.json @@ -95,8 +95,6 @@ "Select all" : "Välj allt", "Upload too large" : "För stor uppladdning", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.", - "Files are being scanned, please wait." : "Filer skannas, var god vänta", - "Currently scanning" : "sökning pågår", "No favorites" : "Inga favoriter", "Files and folders you mark as favorite will show up here" : "Filer och mappar du markerat som favoriter kommer visas här", "Text file" : "Textfil", diff --git a/apps/files/l10n/ta_LK.js b/apps/files/l10n/ta_LK.js index 39a3eda73fe..8b731d1f64b 100644 --- a/apps/files/l10n/ta_LK.js +++ b/apps/files/l10n/ta_LK.js @@ -18,6 +18,7 @@ OC.L10N.register( "Download" : "பதிவிறக்குக", "Rename" : "பெயர்மாற்றம்", "Delete" : "நீக்குக", + "Unshare" : "பகிரப்படாதது", "Details" : "விவரங்கள்", "Select" : "தெரிக", "Pending" : "நிலுவையிலுள்ள", @@ -36,7 +37,6 @@ OC.L10N.register( "Cancel upload" : "பதிவேற்றலை இரத்து செய்க", "Upload too large" : "பதிவேற்றல் மிகப்பெரியது", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது.", - "Files are being scanned, please wait." : "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்.", "Text file" : "கோப்பு உரை" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files/l10n/ta_LK.json b/apps/files/l10n/ta_LK.json index 009ef6c7a8e..67cc6f18d88 100644 --- a/apps/files/l10n/ta_LK.json +++ b/apps/files/l10n/ta_LK.json @@ -16,6 +16,7 @@ "Download" : "பதிவிறக்குக", "Rename" : "பெயர்மாற்றம்", "Delete" : "நீக்குக", + "Unshare" : "பகிரப்படாதது", "Details" : "விவரங்கள்", "Select" : "தெரிக", "Pending" : "நிலுவையிலுள்ள", @@ -34,7 +35,6 @@ "Cancel upload" : "பதிவேற்றலை இரத்து செய்க", "Upload too large" : "பதிவேற்றல் மிகப்பெரியது", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது.", - "Files are being scanned, please wait." : "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்.", "Text file" : "கோப்பு உரை" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files/l10n/th_TH.js b/apps/files/l10n/th_TH.js index d371d5a39c4..d4bd37cb1e7 100644 --- a/apps/files/l10n/th_TH.js +++ b/apps/files/l10n/th_TH.js @@ -34,6 +34,8 @@ OC.L10N.register( "Download" : "ดาวน์โหลด", "Rename" : "เปลี่ยนชื่อ", "Delete" : "ลบ", + "Disconnect storage" : "ยกเลิกการเชื่อมต่อการจัดเก็บข้อมูล", + "Unshare" : "ยกเลิกการแชร์", "Details" : "รายละเอียด", "Select" : "เลือก", "Pending" : "อยู่ระหว่างดำเนินการ", @@ -111,8 +113,6 @@ OC.L10N.register( "Select all" : "เลือกทั้งหมด", "Upload too large" : "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้", - "Files are being scanned, please wait." : "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.", - "Currently scanning" : "ปัจจุบันกำลังสแกน", "No favorites" : "ไม่มีรายการโปรด", "Files and folders you mark as favorite will show up here" : "ไฟล์และโฟลเดอร์ที่คุณทำเครื่องหมายเป็นรายการโปรดจะปรากฏขึ้นที่นี่", "Text file" : "ไฟล์ข้อความ", diff --git a/apps/files/l10n/th_TH.json b/apps/files/l10n/th_TH.json index 5e8086ad9d9..03d6c6adb76 100644 --- a/apps/files/l10n/th_TH.json +++ b/apps/files/l10n/th_TH.json @@ -32,6 +32,8 @@ "Download" : "ดาวน์โหลด", "Rename" : "เปลี่ยนชื่อ", "Delete" : "ลบ", + "Disconnect storage" : "ยกเลิกการเชื่อมต่อการจัดเก็บข้อมูล", + "Unshare" : "ยกเลิกการแชร์", "Details" : "รายละเอียด", "Select" : "เลือก", "Pending" : "อยู่ระหว่างดำเนินการ", @@ -109,8 +111,6 @@ "Select all" : "เลือกทั้งหมด", "Upload too large" : "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้", - "Files are being scanned, please wait." : "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.", - "Currently scanning" : "ปัจจุบันกำลังสแกน", "No favorites" : "ไม่มีรายการโปรด", "Files and folders you mark as favorite will show up here" : "ไฟล์และโฟลเดอร์ที่คุณทำเครื่องหมายเป็นรายการโปรดจะปรากฏขึ้นที่นี่", "Text file" : "ไฟล์ข้อความ", diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js index d0c68861518..2fbb71b373c 100644 --- a/apps/files/l10n/tr.js +++ b/apps/files/l10n/tr.js @@ -34,6 +34,8 @@ OC.L10N.register( "Download" : "İndir", "Rename" : "Yeniden adlandır", "Delete" : "Sil", + "Disconnect storage" : "Depolama bağlantısını kes", + "Unshare" : "Paylaşmayı Kaldır", "Details" : "Ayrıntılar", "Select" : "Seç", "Pending" : "Bekliyor", @@ -100,8 +102,6 @@ OC.L10N.register( "Select all" : "Tümünü seç", "Upload too large" : "Yükleme çok büyük", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Yüklemeye çalıştığınız dosyalar bu sunucudaki azami yükleme boyutunu aşıyor.", - "Files are being scanned, please wait." : "Dosyalar taranıyor, lütfen bekleyin.", - "Currently scanning" : "Şu anda taranan", "No favorites" : "Sık kullanılan öge yok.", "Files and folders you mark as favorite will show up here" : "Sık kullanılan olarak işaretlediğiniz dosya ve klasörler burada gösterilecek", "Text file" : "Metin dosyası", diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json index 7bc756530dc..b2fd691a6a1 100644 --- a/apps/files/l10n/tr.json +++ b/apps/files/l10n/tr.json @@ -32,6 +32,8 @@ "Download" : "İndir", "Rename" : "Yeniden adlandır", "Delete" : "Sil", + "Disconnect storage" : "Depolama bağlantısını kes", + "Unshare" : "Paylaşmayı Kaldır", "Details" : "Ayrıntılar", "Select" : "Seç", "Pending" : "Bekliyor", @@ -98,8 +100,6 @@ "Select all" : "Tümünü seç", "Upload too large" : "Yükleme çok büyük", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Yüklemeye çalıştığınız dosyalar bu sunucudaki azami yükleme boyutunu aşıyor.", - "Files are being scanned, please wait." : "Dosyalar taranıyor, lütfen bekleyin.", - "Currently scanning" : "Şu anda taranan", "No favorites" : "Sık kullanılan öge yok.", "Files and folders you mark as favorite will show up here" : "Sık kullanılan olarak işaretlediğiniz dosya ve klasörler burada gösterilecek", "Text file" : "Metin dosyası", diff --git a/apps/files/l10n/uk.js b/apps/files/l10n/uk.js index 7da8b160afd..bda024599f5 100644 --- a/apps/files/l10n/uk.js +++ b/apps/files/l10n/uk.js @@ -91,8 +91,6 @@ OC.L10N.register( "Select all" : "Вибрати всі", "Upload too large" : "Файл занадто великий", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файли,що ви намагаєтесь вивантажити перевищують максимальний дозволений розмір файлів на цьому сервері.", - "Files are being scanned, please wait." : "Файли перевіряються, зачекайте, будь-ласка.", - "Currently scanning" : "Триває перевірка", "No favorites" : "Немає улюблених", "Files and folders you mark as favorite will show up here" : "Файли і теки, які ви позначили як улюблені, з’являться тут", "Text file" : "Текстовий файл" diff --git a/apps/files/l10n/uk.json b/apps/files/l10n/uk.json index 15dabf456f8..17c055d5539 100644 --- a/apps/files/l10n/uk.json +++ b/apps/files/l10n/uk.json @@ -89,8 +89,6 @@ "Select all" : "Вибрати всі", "Upload too large" : "Файл занадто великий", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файли,що ви намагаєтесь вивантажити перевищують максимальний дозволений розмір файлів на цьому сервері.", - "Files are being scanned, please wait." : "Файли перевіряються, зачекайте, будь-ласка.", - "Currently scanning" : "Триває перевірка", "No favorites" : "Немає улюблених", "Files and folders you mark as favorite will show up here" : "Файли і теки, які ви позначили як улюблені, з’являться тут", "Text file" : "Текстовий файл" diff --git a/apps/files/l10n/vi.js b/apps/files/l10n/vi.js index 83dd03f48f8..953604a945d 100644 --- a/apps/files/l10n/vi.js +++ b/apps/files/l10n/vi.js @@ -61,7 +61,6 @@ OC.L10N.register( "Select all" : "Chọn tất cả", "Upload too large" : "Tập tin tải lên quá lớn", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .", - "Files are being scanned, please wait." : "Tập tin đang được quét ,vui lòng chờ.", "Text file" : "Tập tin văn bản" }, "nplurals=1; plural=0;"); diff --git a/apps/files/l10n/vi.json b/apps/files/l10n/vi.json index abc83963873..40c64f01ff4 100644 --- a/apps/files/l10n/vi.json +++ b/apps/files/l10n/vi.json @@ -59,7 +59,6 @@ "Select all" : "Chọn tất cả", "Upload too large" : "Tập tin tải lên quá lớn", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .", - "Files are being scanned, please wait." : "Tập tin đang được quét ,vui lòng chờ.", "Text file" : "Tập tin văn bản" },"pluralForm" :"nplurals=1; plural=0;" }
\ No newline at end of file diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js index cadbeee3fc3..c9a07a0199c 100644 --- a/apps/files/l10n/zh_CN.js +++ b/apps/files/l10n/zh_CN.js @@ -34,6 +34,8 @@ OC.L10N.register( "Download" : "下载", "Rename" : "重命名", "Delete" : "删除", + "Disconnect storage" : "断开储存连接", + "Unshare" : "取消共享", "Details" : "详细信息", "Select" : "选择", "Pending" : "等待", @@ -111,8 +113,6 @@ OC.L10N.register( "Select all" : "全部选择", "Upload too large" : "上传文件过大", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "您正尝试上传的文件超过了此服务器可以上传的最大容量限制", - "Files are being scanned, please wait." : "文件正在被扫描，请稍候。", - "Currently scanning" : "正在扫描", "No favorites" : "无收藏", "Files and folders you mark as favorite will show up here" : "收藏的文件和文件夹会在这里显示", "Text file" : "文本文件", diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json index b2883e5ea1d..1ae61d0119b 100644 --- a/apps/files/l10n/zh_CN.json +++ b/apps/files/l10n/zh_CN.json @@ -32,6 +32,8 @@ "Download" : "下载", "Rename" : "重命名", "Delete" : "删除", + "Disconnect storage" : "断开储存连接", + "Unshare" : "取消共享", "Details" : "详细信息", "Select" : "选择", "Pending" : "等待", @@ -109,8 +111,6 @@ "Select all" : "全部选择", "Upload too large" : "上传文件过大", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "您正尝试上传的文件超过了此服务器可以上传的最大容量限制", - "Files are being scanned, please wait." : "文件正在被扫描，请稍候。", - "Currently scanning" : "正在扫描", "No favorites" : "无收藏", "Files and folders you mark as favorite will show up here" : "收藏的文件和文件夹会在这里显示", "Text file" : "文本文件", diff --git a/apps/files/l10n/zh_HK.js b/apps/files/l10n/zh_HK.js index 30b7e75a732..8ecae84be99 100644 --- a/apps/files/l10n/zh_HK.js +++ b/apps/files/l10n/zh_HK.js @@ -9,6 +9,7 @@ OC.L10N.register( "Download" : "下載", "Rename" : "重新命名", "Delete" : "刪除", + "Unshare" : "取消分享", "Name" : "名稱", "Size" : "大小", "{dirs} and {files}" : "{dirs} 和 {files}", diff --git a/apps/files/l10n/zh_HK.json b/apps/files/l10n/zh_HK.json index 213997044af..798dbe13abe 100644 --- a/apps/files/l10n/zh_HK.json +++ b/apps/files/l10n/zh_HK.json @@ -7,6 +7,7 @@ "Download" : "下載", "Rename" : "重新命名", "Delete" : "刪除", + "Unshare" : "取消分享", "Name" : "名稱", "Size" : "大小", "{dirs} and {files}" : "{dirs} 和 {files}", diff --git a/apps/files/l10n/zh_TW.js b/apps/files/l10n/zh_TW.js index 64a24bbd0c1..0f013be694f 100644 --- a/apps/files/l10n/zh_TW.js +++ b/apps/files/l10n/zh_TW.js @@ -113,8 +113,6 @@ OC.L10N.register( "Select all" : "全選", "Upload too large" : "上傳過大", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "您試圖上傳的檔案大小超過伺服器的限制", - "Files are being scanned, please wait." : "正在掃描檔案，請稍等", - "Currently scanning" : "正在掃描", "No favorites" : "沒有最愛", "Files and folders you mark as favorite will show up here" : "您標記為最愛的檔案與資料夾將會顯示在這裡", "Text file" : "文字檔", diff --git a/apps/files/l10n/zh_TW.json b/apps/files/l10n/zh_TW.json index c3c1443e0bc..1258145c71f 100644 --- a/apps/files/l10n/zh_TW.json +++ b/apps/files/l10n/zh_TW.json @@ -111,8 +111,6 @@ "Select all" : "全選", "Upload too large" : "上傳過大", "The files you are trying to upload exceed the maximum size for file uploads on this server." : "您試圖上傳的檔案大小超過伺服器的限制", - "Files are being scanned, please wait." : "正在掃描檔案，請稍等", - "Currently scanning" : "正在掃描", "No favorites" : "沒有最愛", "Files and folders you mark as favorite will show up here" : "您標記為最愛的檔案與資料夾將會顯示在這裡", "Text file" : "文字檔", diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php index 04550f945b6..7906dfc64eb 100644 --- a/apps/files/templates/list.php +++ b/apps/files/templates/list.php @@ -88,11 +88,3 @@ <?php p($l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.'));?> </p> </div> -<div id="scanning-message"> - <h3> - <?php p($l->t('Files are being scanned, please wait.'));?> <span id='scan-count'></span> - </h3> - <p> - <?php p($l->t('Currently scanning'));?> <span id='scan-current'></span> - </p> -</div> diff --git a/apps/files_external/l10n/pt_PT.js b/apps/files_external/l10n/pt_PT.js index f2ed1e3abab..cfeec36706b 100644 --- a/apps/files_external/l10n/pt_PT.js +++ b/apps/files_external/l10n/pt_PT.js @@ -10,9 +10,11 @@ OC.L10N.register( "Storage with id \"%i\" not found" : "Não foi encontrado o armazenamento com a id. \"%i\"", "Invalid backend or authentication mechanism class" : "Parâmetros do mecanismo de autenticação inválidos", "Invalid mount point" : "Ponto de montagem inválido", + "Objectstore forbidden" : "Objectstore proibido", "Invalid storage backend \"%s\"" : "Backend de armazenamento inválido \"%s\"", "Not permitted to use backend \"%s\"" : "Não é permitido utilizar a interface \"%s\"", "Not permitted to use authentication mechanism \"%s\"" : "Não é permitido utilizar o mecanismo de autenticação \"%s\"", + "Unsatisfied backend parameters" : "Parâmetros backend insatisfeitos", "Unsatisfied authentication mechanism parameters" : "Parâmetros do mecanismo de autenticação inválidos", "Insufficient data: %s" : "Dados insuficientes: %s", "%s" : "%s", @@ -31,7 +33,16 @@ OC.L10N.register( "Once every direct access" : "Uma vez em cada acesso direto", "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.", "(group)" : "(grupo)", + "Admin defined" : "Administrador definido", "Saved" : "Guardado", + "Empty response from the server" : "Resposta vazia a partir do servidor", + "Couldn't access. Please logout and login to activate this mount point" : "Não foi possível aceder. Por favor, faça logout e login para ativar este ponto de montagem", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Não foi possível recolher a informação do servidor ownCloud: {code} {type}", + "Couldn't get the list of external mount points: {type}" : "Não foi possível conseguir a lista de pontos de montagem externos: {type}", + "There was an error with message: " : "Houve um erro com a mensagem:", + "External mount error" : "Erro de montagem externa", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Não foi possível conseguir a lista de pontos de montagem Windows na rede: resposta vazia do servidor", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Alguns dos pontos de montagem externos configurados não estão conectados. Por favor, clique na fila vermelha para mais informação", "Access key" : "Código de acesso", "Secret key" : "Código secreto", "Builtin" : "Integrado", @@ -42,8 +53,12 @@ OC.L10N.register( "OAuth2" : "OAuth2", "Client ID" : "Id. do Cliente", "Client secret" : "Segredo do cliente\\\\", + "OpenStack" : "OpenStack", "Username" : "Nome de utilizador", "Password" : "Palavra-passe", + "Tenant name" : "Nome do locatário", + "Identity endpoint URL" : "Identidade URL endpoint", + "Rackspace" : "Rackspace", "API key" : "Chave API", "Username and password" : "Nome de utilizador e palavra-passe", "Session credentials" : "Credenciais da sessão", @@ -70,6 +85,7 @@ OC.L10N.register( "ownCloud" : "ownCloud", "SFTP" : "SFTP", "Root" : "Root", + "SFTP with secret key login" : "SFTP com login por chave secreta", "SMB / CIFS" : "SMB / CIFS", "Share" : "Compartilhar", "Domain" : "Domínio", @@ -95,6 +111,7 @@ OC.L10N.register( "Add storage" : "Adicionar armazenamento", "Advanced settings" : "Definições avançadas", "Delete" : "Apagar", + "Allow users to mount external storage" : "Permitir que os utilizadores montem armazenamento externo", "Allow users to mount the following external storage" : "Permitir que os utilizadores montem o seguinte armazenamento externo" }, "nplurals=2; plural=(n != 1);"); diff --git a/apps/files_external/l10n/pt_PT.json b/apps/files_external/l10n/pt_PT.json index 816a61e5b3f..8f275cb62be 100644 --- a/apps/files_external/l10n/pt_PT.json +++ b/apps/files_external/l10n/pt_PT.json @@ -8,9 +8,11 @@ "Storage with id \"%i\" not found" : "Não foi encontrado o armazenamento com a id. \"%i\"", "Invalid backend or authentication mechanism class" : "Parâmetros do mecanismo de autenticação inválidos", "Invalid mount point" : "Ponto de montagem inválido", + "Objectstore forbidden" : "Objectstore proibido", "Invalid storage backend \"%s\"" : "Backend de armazenamento inválido \"%s\"", "Not permitted to use backend \"%s\"" : "Não é permitido utilizar a interface \"%s\"", "Not permitted to use authentication mechanism \"%s\"" : "Não é permitido utilizar o mecanismo de autenticação \"%s\"", + "Unsatisfied backend parameters" : "Parâmetros backend insatisfeitos", "Unsatisfied authentication mechanism parameters" : "Parâmetros do mecanismo de autenticação inválidos", "Insufficient data: %s" : "Dados insuficientes: %s", "%s" : "%s", @@ -29,7 +31,16 @@ "Once every direct access" : "Uma vez em cada acesso direto", "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.", "(group)" : "(grupo)", + "Admin defined" : "Administrador definido", "Saved" : "Guardado", + "Empty response from the server" : "Resposta vazia a partir do servidor", + "Couldn't access. Please logout and login to activate this mount point" : "Não foi possível aceder. Por favor, faça logout e login para ativar este ponto de montagem", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Não foi possível recolher a informação do servidor ownCloud: {code} {type}", + "Couldn't get the list of external mount points: {type}" : "Não foi possível conseguir a lista de pontos de montagem externos: {type}", + "There was an error with message: " : "Houve um erro com a mensagem:", + "External mount error" : "Erro de montagem externa", + "Couldn't get the list of Windows network drive mount points: empty response from the server" : "Não foi possível conseguir a lista de pontos de montagem Windows na rede: resposta vazia do servidor", + "Some of the configured external mount points are not connected. Please click on the red row(s) for more information" : "Alguns dos pontos de montagem externos configurados não estão conectados. Por favor, clique na fila vermelha para mais informação", "Access key" : "Código de acesso", "Secret key" : "Código secreto", "Builtin" : "Integrado", @@ -40,8 +51,12 @@ "OAuth2" : "OAuth2", "Client ID" : "Id. do Cliente", "Client secret" : "Segredo do cliente\\\\", + "OpenStack" : "OpenStack", "Username" : "Nome de utilizador", "Password" : "Palavra-passe", + "Tenant name" : "Nome do locatário", + "Identity endpoint URL" : "Identidade URL endpoint", + "Rackspace" : "Rackspace", "API key" : "Chave API", "Username and password" : "Nome de utilizador e palavra-passe", "Session credentials" : "Credenciais da sessão", @@ -68,6 +83,7 @@ "ownCloud" : "ownCloud", "SFTP" : "SFTP", "Root" : "Root", + "SFTP with secret key login" : "SFTP com login por chave secreta", "SMB / CIFS" : "SMB / CIFS", "Share" : "Compartilhar", "Domain" : "Domínio", @@ -93,6 +109,7 @@ "Add storage" : "Adicionar armazenamento", "Advanced settings" : "Definições avançadas", "Delete" : "Apagar", + "Allow users to mount external storage" : "Permitir que os utilizadores montem armazenamento externo", "Allow users to mount the following external storage" : "Permitir que os utilizadores montem o seguinte armazenamento externo" },"pluralForm" :"nplurals=2; plural=(n != 1);" }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js index c0a79ac58fa..afe04a57b90 100644 --- a/apps/files_sharing/l10n/pt_PT.js +++ b/apps/files_sharing/l10n/pt_PT.js @@ -3,6 +3,7 @@ OC.L10N.register( { "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível neste servidor", "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém carateres inválidos.", + "Not allowed to create a federated share with the same user server" : "Não é possível criar uma partilha federada com o mesmo servidor de utilizador", "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável", "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para a partilha remota, a palavra-passe poderá estar errada", "Storage not valid" : "Armazenamento inválido", diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json index f57f939e5cb..190187b1500 100644 --- a/apps/files_sharing/l10n/pt_PT.json +++ b/apps/files_sharing/l10n/pt_PT.json @@ -1,6 +1,7 @@ { "translations": { "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível neste servidor", "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém carateres inválidos.", + "Not allowed to create a federated share with the same user server" : "Não é possível criar uma partilha federada com o mesmo servidor de utilizador", "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável", "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para a partilha remota, a palavra-passe poderá estar errada", "Storage not valid" : "Armazenamento inválido", diff --git a/apps/provisioning_api/lib/users.php b/apps/provisioning_api/lib/users.php index a385f2c1180..efb10a50865 100644 --- a/apps/provisioning_api/lib/users.php +++ b/apps/provisioning_api/lib/users.php @@ -285,7 +285,7 @@ class Users { break; case 'email': if(filter_var($parameters['_put']['value'], FILTER_VALIDATE_EMAIL)) { - $this->config->setUserValue($targetUserId, 'settings', 'email', $parameters['_put']['value']); + $targetUser->setEMailAddress($parameters['_put']['value']); } else { return new OC_OCS_Result(null, 102); } diff --git a/apps/provisioning_api/tests/userstest.php b/apps/provisioning_api/tests/userstest.php index 25e723a13b4..3ce13181b8d 100644 --- a/apps/provisioning_api/tests/userstest.php +++ b/apps/provisioning_api/tests/userstest.php @@ -932,10 +932,10 @@ class UsersTest extends OriginalTest { ->method('get') ->with('UserToEdit') ->will($this->returnValue($targetUser)); - $this->config + $targetUser ->expects($this->once()) - ->method('setUserValue') - ->with('UserToEdit', 'settings', 'email', 'demo@owncloud.org'); + ->method('setEMailAddress') + ->with('demo@owncloud.org'); $expected = new \OC_OCS_Result(null, 100); $this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'email', 'value' => 'demo@owncloud.org']])); diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php index 21396068267..666af85e56e 100644 --- a/apps/user_ldap/ajax/wizard.php +++ b/apps/user_ldap/ajax/wizard.php @@ -54,7 +54,8 @@ $userManager = new \OCA\user_ldap\lib\user\Manager( new \OCA\user_ldap\lib\LogWrapper(), \OC::$server->getAvatarManager(), new \OCP\Image(), - \OC::$server->getDatabaseConnection()); + \OC::$server->getDatabaseConnection(), + \OC::$server->getUserManager()); $access = new \OCA\user_ldap\lib\Access($con, $ldapWrapper, $userManager); diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php index 763fdc99c6b..dab47ee6e6f 100644 --- a/apps/user_ldap/appinfo/app.php +++ b/apps/user_ldap/appinfo/app.php @@ -37,7 +37,8 @@ if(count($configPrefixes) === 1) { new OCA\user_ldap\lib\LogWrapper(), \OC::$server->getAvatarManager(), new \OCP\Image(), - $dbc + $dbc, + \OC::$server->getUserManager() ); $connector = new OCA\user_ldap\lib\Connection($ldapWrapper, $configPrefixes[0]); $ldapAccess = new OCA\user_ldap\lib\Access($connector, $ldapWrapper, $userManager); diff --git a/apps/user_ldap/l10n/he.js b/apps/user_ldap/l10n/he.js index 76c659f6d0c..6a69268ec8e 100644 --- a/apps/user_ldap/l10n/he.js +++ b/apps/user_ldap/l10n/he.js @@ -1,13 +1,71 @@ OC.L10N.register( "user_ldap", { + "Failed to clear the mappings." : "כשל בניקוי המיפויים.", + "Failed to delete the server configuration" : "כשל במחיקת הגדרות השרת", + "The configuration is invalid: anonymous bind is not allowed." : "התצורה אינה חוקית: חיבור אנונימי אסור", + "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", + "Action does not exist" : "פעולה לא קיימת", + "The Base DN appears to be wrong" : "בסיס DN נראה כשגוי", + "Configuration incorrect" : "הגדרה שגויה", + "Configuration incomplete" : "הגדרה לא מלאה", + "Configuration OK" : "הגדרה בסדר", "Select groups" : "בחירת קבוצות", - "Do you really want to delete the current Server Configuration?" : "האם אכן למחוק את הגדרות השרת הנוכחיות?", + "Please check the credentials, they seem to be wrong." : "יש לבדוק את פרטי הכניסה, נראה שהם שגויים", + "Please specify the port, it could not be auto-detected." : "יש לספק את שער הכניסה - פורט, לא ניתן היה לאתרו בצורה אוטומטית", + "Base DN could not be auto-detected, please revise credentials, host and port." : "לא ניתן היה לאתר באופן אוטומטי את בסיס DN, יש להחליף את פרטי הכניסה, פרטי שרת ושער גישה - פורט.", + "Could not detect Base DN, please enter it manually." : "לא ניתן היה לאתר את בסיס DN, יש להכניסו באופן ידני.", + "{nthServer}. Server" : "{nthServer}. שרת", + "No object found in the given Base DN. Please revise." : "לא אותר אוביקט בבסיס DN שסופק. יש להחליף.", + "More than 1,000 directory entries available." : "קיימים יותר מ- 1,000 רשומות ספריה.", + " entries available within the provided Base DN" : " קיימות רשומות מתוך בסיס ה- DN שסופק", + "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "אירעה שגיאה. יש לבדוק את בסיס ה- DN, כמו גם את הגדרות החיבור ופרטי הכניסה.", + "Do you really want to delete the current Server Configuration?" : "האם אכן למחוק את הגדרות השרת הנוכחיות?האם באמת ברצונך למחוק את הגדרות השרת הנוכחיות?", "Confirm Deletion" : "אישור המחיקה", + "Mappings cleared successfully!" : "מיפויים נוקו בהצלחה!", + "Error while clearing the mappings." : "שגיאה בזמן ניקוי המיפויים.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "קישור אננונימי אינו מותר. יש לספק שם משתמש DN וסיסמא.", + "LDAP Operations error. Anonymous bind might not be allowed." : "שגיאת פעילויות LDAP. יתכן שקישור אנונימי אינו מותר.", + "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "שמירה נכשלה. יש לבדוק אם מסד הנתונים פעיל. יש לטעון מחדש לפני המשך.", + "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "שינוי המצב יאפשר שאילתות LDAP אוטמטיות. בהתאם לגודל ה- LDAP שלך ייתכן והפעולה תיקח זמן רב. האם ברצונך לשנות את המצב?", + "Mode switch" : "שינוי מצב", + "Select attributes" : "בחירת מאפיינים", + "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "משתמש לא אותר. יש לבדוק את מאפייני ההתחברות ושם המשתמש. מסנן אפקטיבי (העתקה והדבקה לאימות שורת פקודה):<br/>", + "User found and settings verified." : "משתמש אותר והגדרות אומתו.", + "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "הגדרות אומתו, אך רק משתמש אחד אותר. רק הראשון יוכל להתחבר. יש לבחון שימוש בסינון צר יותר.", + "An unspecified error occurred. Please check the settings and the log." : "אירעה שגיאה לא מזוהה. יש לבדוק את ההגדרות ואת הלוג.", + "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "סינון החיפוש אינו חוקי. ככל הנראה בשל שיאה תחבירית כגון מספר לא שווה של פתח-סוגריים וסגור-סוגריים. יש לתקן.", + "A connection error to LDAP / AD occurred, please check host, port and credentials." : "אירעה שגיאת חיבור ל- LDAP / AD, יש לבדוק את השרת, שער החיבור - פורט ופרטי הכניסה. ", + "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "שומר המקום %uid חסר. הוא יוחלף עם שם המשתמש בזמן שאילתת LDAP / AD.", + "Please provide a login name to test against" : "יש לספק שם משתמש לבדיקה מולו", + "The group box was disabled, because the LDAP / AD server does not support memberOf." : "שדה הקבוצה נוטרל, כיוון ששרת ה- LDAP / AD לא תומך ב- memberOf.", + "_%s group found_::_%s groups found_" : ["אותרה %s קבוצה","אותרו %s קבוצות"], + "_%s user found_::_%s users found_" : ["אותר %s משתמש","אותרו %s משתמשים"], + "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "לא אותר מאפיין שם תצוגה למשתמש. יש לספק אותו בעצמך בהגדרות ldap מתקדמות.", + "Could not find the desired feature" : "לא אותרה התכונה הרצויה", + "Invalid Host" : "מארח לא חוקי", "Server" : "שרת", "Users" : "משתמשים", + "Login Attributes" : "פרטי כניסה", "Groups" : "קבוצות", + "Test Configuration" : "בדיקת הגדרות", "Help" : "עזרה", + "Groups meeting these criteria are available in %s:" : "קבוצות העומדות בקריטריון זה זמינות ב- %s:", + "Only from these groups:" : "רק מקבוצות אלו:", + "Search groups" : "חיפוש בקבוצות", + "Available groups" : "קבוצות זמינות", + "Selected groups" : "קבוצות נבחרות", + "Edit LDAP Query" : "עריכת שאילתת LDAP", + "LDAP Filter:" : "מסנן LDAP:", + "The filter specifies which LDAP groups shall have access to the %s instance." : "המסנן הקובע לאיזו קבוצת LDAP תהיה יכולת כניסה למקרה %s.", + "Verify settings and count groups" : "מאמת הגדרות וסופר קבוצות", + "When logging in, %s will find the user based on the following attributes:" : "כאשר מתחברים, %s יחפש את המשתמש על פי המאפיינים הבאים:", "Host" : "מארח", "Port" : "פורט", "User DN" : "DN משתמש", diff --git a/apps/user_ldap/l10n/he.json b/apps/user_ldap/l10n/he.json index 842a8bedd9c..2cdc1710f2a 100644 --- a/apps/user_ldap/l10n/he.json +++ b/apps/user_ldap/l10n/he.json @@ -1,11 +1,69 @@ { "translations": { + "Failed to clear the mappings." : "כשל בניקוי המיפויים.", + "Failed to delete the server configuration" : "כשל במחיקת הגדרות השרת", + "The configuration is invalid: anonymous bind is not allowed." : "התצורה אינה חוקית: חיבור אנונימי אסור", + "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", + "Action does not exist" : "פעולה לא קיימת", + "The Base DN appears to be wrong" : "בסיס DN נראה כשגוי", + "Configuration incorrect" : "הגדרה שגויה", + "Configuration incomplete" : "הגדרה לא מלאה", + "Configuration OK" : "הגדרה בסדר", "Select groups" : "בחירת קבוצות", - "Do you really want to delete the current Server Configuration?" : "האם אכן למחוק את הגדרות השרת הנוכחיות?", + "Please check the credentials, they seem to be wrong." : "יש לבדוק את פרטי הכניסה, נראה שהם שגויים", + "Please specify the port, it could not be auto-detected." : "יש לספק את שער הכניסה - פורט, לא ניתן היה לאתרו בצורה אוטומטית", + "Base DN could not be auto-detected, please revise credentials, host and port." : "לא ניתן היה לאתר באופן אוטומטי את בסיס DN, יש להחליף את פרטי הכניסה, פרטי שרת ושער גישה - פורט.", + "Could not detect Base DN, please enter it manually." : "לא ניתן היה לאתר את בסיס DN, יש להכניסו באופן ידני.", + "{nthServer}. Server" : "{nthServer}. שרת", + "No object found in the given Base DN. Please revise." : "לא אותר אוביקט בבסיס DN שסופק. יש להחליף.", + "More than 1,000 directory entries available." : "קיימים יותר מ- 1,000 רשומות ספריה.", + " entries available within the provided Base DN" : " קיימות רשומות מתוך בסיס ה- DN שסופק", + "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "אירעה שגיאה. יש לבדוק את בסיס ה- DN, כמו גם את הגדרות החיבור ופרטי הכניסה.", + "Do you really want to delete the current Server Configuration?" : "האם אכן למחוק את הגדרות השרת הנוכחיות?האם באמת ברצונך למחוק את הגדרות השרת הנוכחיות?", "Confirm Deletion" : "אישור המחיקה", + "Mappings cleared successfully!" : "מיפויים נוקו בהצלחה!", + "Error while clearing the mappings." : "שגיאה בזמן ניקוי המיפויים.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "קישור אננונימי אינו מותר. יש לספק שם משתמש DN וסיסמא.", + "LDAP Operations error. Anonymous bind might not be allowed." : "שגיאת פעילויות LDAP. יתכן שקישור אנונימי אינו מותר.", + "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "שמירה נכשלה. יש לבדוק אם מסד הנתונים פעיל. יש לטעון מחדש לפני המשך.", + "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "שינוי המצב יאפשר שאילתות LDAP אוטמטיות. בהתאם לגודל ה- LDAP שלך ייתכן והפעולה תיקח זמן רב. האם ברצונך לשנות את המצב?", + "Mode switch" : "שינוי מצב", + "Select attributes" : "בחירת מאפיינים", + "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "משתמש לא אותר. יש לבדוק את מאפייני ההתחברות ושם המשתמש. מסנן אפקטיבי (העתקה והדבקה לאימות שורת פקודה):<br/>", + "User found and settings verified." : "משתמש אותר והגדרות אומתו.", + "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "הגדרות אומתו, אך רק משתמש אחד אותר. רק הראשון יוכל להתחבר. יש לבחון שימוש בסינון צר יותר.", + "An unspecified error occurred. Please check the settings and the log." : "אירעה שגיאה לא מזוהה. יש לבדוק את ההגדרות ואת הלוג.", + "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "סינון החיפוש אינו חוקי. ככל הנראה בשל שיאה תחבירית כגון מספר לא שווה של פתח-סוגריים וסגור-סוגריים. יש לתקן.", + "A connection error to LDAP / AD occurred, please check host, port and credentials." : "אירעה שגיאת חיבור ל- LDAP / AD, יש לבדוק את השרת, שער החיבור - פורט ופרטי הכניסה. ", + "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "שומר המקום %uid חסר. הוא יוחלף עם שם המשתמש בזמן שאילתת LDAP / AD.", + "Please provide a login name to test against" : "יש לספק שם משתמש לבדיקה מולו", + "The group box was disabled, because the LDAP / AD server does not support memberOf." : "שדה הקבוצה נוטרל, כיוון ששרת ה- LDAP / AD לא תומך ב- memberOf.", + "_%s group found_::_%s groups found_" : ["אותרה %s קבוצה","אותרו %s קבוצות"], + "_%s user found_::_%s users found_" : ["אותר %s משתמש","אותרו %s משתמשים"], + "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "לא אותר מאפיין שם תצוגה למשתמש. יש לספק אותו בעצמך בהגדרות ldap מתקדמות.", + "Could not find the desired feature" : "לא אותרה התכונה הרצויה", + "Invalid Host" : "מארח לא חוקי", "Server" : "שרת", "Users" : "משתמשים", + "Login Attributes" : "פרטי כניסה", "Groups" : "קבוצות", + "Test Configuration" : "בדיקת הגדרות", "Help" : "עזרה", + "Groups meeting these criteria are available in %s:" : "קבוצות העומדות בקריטריון זה זמינות ב- %s:", + "Only from these groups:" : "רק מקבוצות אלו:", + "Search groups" : "חיפוש בקבוצות", + "Available groups" : "קבוצות זמינות", + "Selected groups" : "קבוצות נבחרות", + "Edit LDAP Query" : "עריכת שאילתת LDAP", + "LDAP Filter:" : "מסנן LDAP:", + "The filter specifies which LDAP groups shall have access to the %s instance." : "המסנן הקובע לאיזו קבוצת LDAP תהיה יכולת כניסה למקרה %s.", + "Verify settings and count groups" : "מאמת הגדרות וסופר קבוצות", + "When logging in, %s will find the user based on the following attributes:" : "כאשר מתחברים, %s יחפש את המשתמש על פי המאפיינים הבאים:", "Host" : "מארח", "Port" : "פורט", "User DN" : "DN משתמש", diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js index 256385b6f85..d6bd1d9d515 100644 --- a/apps/user_ldap/l10n/pt_PT.js +++ b/apps/user_ldap/l10n/pt_PT.js @@ -24,6 +24,7 @@ OC.L10N.register( "Could not detect Base DN, please enter it manually." : "Não foi possível detetar o ND de base, por favor introduza-o manualmente.", "{nthServer}. Server" : "{nthServer}. Servidor", "No object found in the given Base DN. Please revise." : "Nenhum objecto encontrado na Base DN fornecida. Por favor verifique.", + "More than 1,000 directory entries available." : "Mais de 1,000 entradas de diretório disponíveis.", " entries available within the provided Base DN" : "entradas disponíveis no ND de base fornecido", "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Ocorreu um erro. Por favor verifique o ND de base, bem como as definições de ligação e as credenciais.", "Do you really want to delete the current Server Configuration?" : "Deseja realmente apagar as configurações de servidor actuais?", @@ -73,6 +74,7 @@ OC.L10N.register( "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Permtir entrar no sistema a partir do atributo \"email\". Neste caso os campos \"Mail\" e \"mailPrimaryAddress\" serão utilizados para verificação.", "Other Attributes:" : "Outros Atributos:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro a aplicar, quando se tenta uma sessão. %%uid substitui o nome de utilizador na ação de início de sessão. Exemplo: \"uid=%%uid\"", + "Test Loginname" : "Testar nome de login", "Verify settings" : "Verificar definições", "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servvidor", diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json index a26aae4691b..8073db3efa6 100644 --- a/apps/user_ldap/l10n/pt_PT.json +++ b/apps/user_ldap/l10n/pt_PT.json @@ -22,6 +22,7 @@ "Could not detect Base DN, please enter it manually." : "Não foi possível detetar o ND de base, por favor introduza-o manualmente.", "{nthServer}. Server" : "{nthServer}. Servidor", "No object found in the given Base DN. Please revise." : "Nenhum objecto encontrado na Base DN fornecida. Por favor verifique.", + "More than 1,000 directory entries available." : "Mais de 1,000 entradas de diretório disponíveis.", " entries available within the provided Base DN" : "entradas disponíveis no ND de base fornecido", "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Ocorreu um erro. Por favor verifique o ND de base, bem como as definições de ligação e as credenciais.", "Do you really want to delete the current Server Configuration?" : "Deseja realmente apagar as configurações de servidor actuais?", @@ -71,6 +72,7 @@ "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Permtir entrar no sistema a partir do atributo \"email\". Neste caso os campos \"Mail\" e \"mailPrimaryAddress\" serão utilizados para verificação.", "Other Attributes:" : "Outros Atributos:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define o filtro a aplicar, quando se tenta uma sessão. %%uid substitui o nome de utilizador na ação de início de sessão. Exemplo: \"uid=%%uid\"", + "Test Loginname" : "Testar nome de login", "Verify settings" : "Verificar definições", "1. Server" : "1. Servidor", "%s. Server:" : "%s. Servvidor", diff --git a/apps/user_ldap/l10n/sl.js b/apps/user_ldap/l10n/sl.js index d3712c273f0..8444f09fed2 100644 --- a/apps/user_ldap/l10n/sl.js +++ b/apps/user_ldap/l10n/sl.js @@ -21,7 +21,7 @@ OC.L10N.register( "Confirm Deletion" : "Potrdi brisanje", "Mode switch" : "Preklop načina", "Select attributes" : "Izbor atributov", - "User found and settings verified." : "Uporabnik najden in nastavitve preverjene.", + "User found and settings verified." : "Uporabnik je najden in nastavitve so overjene.", "_%s group found_::_%s groups found_" : ["%s najdena skupina","%s najdeni skupini","%s najdene skupine","%s najdenih skupin"], "_%s user found_::_%s users found_" : ["%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"], "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ni mogoče prebrati atributa prikaznega imena. Določiti ga je treba ročno med nastavitvami LDAP.", @@ -34,11 +34,12 @@ OC.L10N.register( "Test Configuration" : "Preizkusne nastavitve", "Help" : "Pomoč", "Groups meeting these criteria are available in %s:" : "Skupine, ki so skladne s kriterijem, so na voljo v %s:", - "Only these object classes:" : "Samo tej razredi objektov:", - "Only from these groups:" : "Samo te skupine:", - "Search groups" : "Skupine za iskanje", - "Available groups" : "Razpoložljive skupine", + "Only these object classes:" : "Le ti razredi predmetov:", + "Only from these groups:" : "Le od skupin:", + "Search groups" : "Iskanje skupin", + "Available groups" : "Skupine na voljo", "Selected groups" : "Izbrane skupine", + "Edit LDAP Query" : "Uredi poizvedbo LDAP", "LDAP Filter:" : "Filter LDAP:", "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.", "Other Attributes:" : "Drugi atributi:", diff --git a/apps/user_ldap/l10n/sl.json b/apps/user_ldap/l10n/sl.json index 14e73e628a0..8dbb7111a32 100644 --- a/apps/user_ldap/l10n/sl.json +++ b/apps/user_ldap/l10n/sl.json @@ -19,7 +19,7 @@ "Confirm Deletion" : "Potrdi brisanje", "Mode switch" : "Preklop načina", "Select attributes" : "Izbor atributov", - "User found and settings verified." : "Uporabnik najden in nastavitve preverjene.", + "User found and settings verified." : "Uporabnik je najden in nastavitve so overjene.", "_%s group found_::_%s groups found_" : ["%s najdena skupina","%s najdeni skupini","%s najdene skupine","%s najdenih skupin"], "_%s user found_::_%s users found_" : ["%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"], "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Ni mogoče prebrati atributa prikaznega imena. Določiti ga je treba ročno med nastavitvami LDAP.", @@ -32,11 +32,12 @@ "Test Configuration" : "Preizkusne nastavitve", "Help" : "Pomoč", "Groups meeting these criteria are available in %s:" : "Skupine, ki so skladne s kriterijem, so na voljo v %s:", - "Only these object classes:" : "Samo tej razredi objektov:", - "Only from these groups:" : "Samo te skupine:", - "Search groups" : "Skupine za iskanje", - "Available groups" : "Razpoložljive skupine", + "Only these object classes:" : "Le ti razredi predmetov:", + "Only from these groups:" : "Le od skupin:", + "Search groups" : "Iskanje skupin", + "Available groups" : "Skupine na voljo", "Selected groups" : "Izbrane skupine", + "Edit LDAP Query" : "Uredi poizvedbo LDAP", "LDAP Filter:" : "Filter LDAP:", "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.", "Other Attributes:" : "Drugi atributi:", diff --git a/apps/user_ldap/l10n/sr.js b/apps/user_ldap/l10n/sr.js index 1ccfefcb7a8..eb3ee924b7a 100644 --- a/apps/user_ldap/l10n/sr.js +++ b/apps/user_ldap/l10n/sr.js @@ -24,6 +24,7 @@ OC.L10N.register( "Could not detect Base DN, please enter it manually." : "Не могу да откријем базни ДН. Унесите га ручно.", "{nthServer}. Server" : "{nthServer}. Сервер", "No object found in the given Base DN. Please revise." : "Нема објекта за дати базни ДН. Проверите.", + "More than 1,000 directory entries available." : "Више од 1000 уноса је доступно.", " entries available within the provided Base DN" : "уноса доступно за дати базни ДН", "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Грешка. Проверите базни ДН као и поставке везе и акредитиве.", "Do you really want to delete the current Server Configuration?" : "Да ли стварно желите да обришете тренутну конфигурацију сервера?", diff --git a/apps/user_ldap/l10n/sr.json b/apps/user_ldap/l10n/sr.json index 658edafc77b..233df2f4e34 100644 --- a/apps/user_ldap/l10n/sr.json +++ b/apps/user_ldap/l10n/sr.json @@ -22,6 +22,7 @@ "Could not detect Base DN, please enter it manually." : "Не могу да откријем базни ДН. Унесите га ручно.", "{nthServer}. Server" : "{nthServer}. Сервер", "No object found in the given Base DN. Please revise." : "Нема објекта за дати базни ДН. Проверите.", + "More than 1,000 directory entries available." : "Више од 1000 уноса је доступно.", " entries available within the provided Base DN" : "уноса доступно за дати базни ДН", "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Грешка. Проверите базни ДН као и поставке везе и акредитиве.", "Do you really want to delete the current Server Configuration?" : "Да ли стварно желите да обришете тренутну конфигурацију сервера?", diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 97f795483a9..82cd342ae2f 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -709,8 +709,16 @@ class Access extends LDAPUtility implements user\IUserTools { * @param array $ldapRecords */ public function batchApplyUserAttributes(array $ldapRecords){ + $displayNameAttribute = strtolower($this->connection->ldapUserDisplayName); foreach($ldapRecords as $userRecord) { + if(!isset($userRecord[$displayNameAttribute])) { + // displayName is obligatory + continue; + } $ocName = $this->dn2ocname($userRecord['dn'][0]); + if($ocName === false) { + continue; + } $this->cacheUserExists($ocName); $user = $this->userManager->get($ocName); if($user instanceof OfflineUser) { diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php index b27f66055a3..47e28470188 100644 --- a/apps/user_ldap/lib/jobs.php +++ b/apps/user_ldap/lib/jobs.php @@ -175,7 +175,8 @@ class Jobs extends \OC\BackgroundJob\TimedJob { new LogWrapper(), \OC::$server->getAvatarManager(), new \OCP\Image(), - $dbc); + $dbc, + \OC::$server->getUserManager()); $connector = new Connection($ldapWrapper, $configPrefixes[0]); $ldapAccess = new Access($connector, $ldapWrapper, $userManager); $groupMapper = new GroupMapping($dbc); diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php index 28233748790..082ba9a93d0 100644 --- a/apps/user_ldap/lib/proxy.php +++ b/apps/user_ldap/lib/proxy.php @@ -61,6 +61,7 @@ abstract class Proxy { static $userMap; static $groupMap; static $db; + static $userManager; if(is_null($fs)) { $ocConfig = \OC::$server->getConfig(); $fs = new FilesystemHelper(); @@ -69,9 +70,10 @@ abstract class Proxy { $db = \OC::$server->getDatabaseConnection(); $userMap = new UserMapping($db); $groupMap = new GroupMapping($db); + $userManager = \OC::$server->getUserManager(); } $userManager = - new user\Manager($ocConfig, $fs, $log, $avatarM, new \OCP\Image(), $db); + new user\Manager($ocConfig, $fs, $log, $avatarM, new \OCP\Image(), $db, $userManager); $connector = new Connection($this->ldap, $configPrefix); $access = new Access($connector, $this->ldap, $userManager); $access->setUserMapper($userMap); diff --git a/apps/user_ldap/lib/user/manager.php b/apps/user_ldap/lib/user/manager.php index dcaf40b80c4..cfa333b06d4 100644 --- a/apps/user_ldap/lib/user/manager.php +++ b/apps/user_ldap/lib/user/manager.php @@ -29,6 +29,11 @@ use OCA\user_ldap\lib\user\User; use OCA\user_ldap\lib\LogWrapper; use OCA\user_ldap\lib\FilesystemHelper; use OCA\user_ldap\lib\user\OfflineUser; +use OCP\IAvatarManager; +use OCP\IConfig; +use OCP\IDBConnection; +use OCP\Image; +use OCP\IUserManager; /** * Manager @@ -40,10 +45,10 @@ class Manager { /** @var IUserTools */ protected $access; - /** @var \OCP\IConfig */ + /** @var IConfig */ protected $ocConfig; - /** @var \OCP\IDBConnection */ + /** @var IDBConnection */ protected $db; /** @var FilesystemHelper */ @@ -52,7 +57,7 @@ class Manager { /** @var LogWrapper */ protected $ocLog; - /** @var \OCP\Image */ + /** @var Image */ protected $image; /** @param \OCP\IAvatarManager */ @@ -69,18 +74,19 @@ class Manager { ); /** - * @param \OCP\IConfig $ocConfig + * @param IConfig $ocConfig * @param \OCA\user_ldap\lib\FilesystemHelper $ocFilesystem object that * gives access to necessary functions from the OC filesystem * @param \OCA\user_ldap\lib\LogWrapper $ocLog - * @param \OCP\IAvatarManager $avatarManager - * @param \OCP\Image $image an empty image instance - * @param \OCP\IDBConnection $db + * @param IAvatarManager $avatarManager + * @param Image $image an empty image instance + * @param IDBConnection $db * @throws \Exception when the methods mentioned above do not exist */ - public function __construct(\OCP\IConfig $ocConfig, - FilesystemHelper $ocFilesystem, LogWrapper $ocLog, - \OCP\IAvatarManager $avatarManager, \OCP\Image $image, \OCP\IDBConnection $db) { + public function __construct(IConfig $ocConfig, + FilesystemHelper $ocFilesystem, LogWrapper $ocLog, + IAvatarManager $avatarManager, Image $image, + IDBConnection $db, IUserManager $userManager) { $this->ocConfig = $ocConfig; $this->ocFilesystem = $ocFilesystem; @@ -88,6 +94,7 @@ class Manager { $this->avatarManager = $avatarManager; $this->image = $image; $this->db = $db; + $this->userManager = $userManager; } /** @@ -110,7 +117,7 @@ class Manager { $this->checkAccess(); $user = new User($uid, $dn, $this->access, $this->ocConfig, $this->ocFilesystem, clone $this->image, $this->ocLog, - $this->avatarManager); + $this->avatarManager, $this->userManager); $this->users['byDN'][$dn] = $user; $this->users['byUid'][$uid] = $user; return $user; diff --git a/apps/user_ldap/lib/user/user.php b/apps/user_ldap/lib/user/user.php index 23fd831b62f..13f88aa6507 100644 --- a/apps/user_ldap/lib/user/user.php +++ b/apps/user_ldap/lib/user/user.php @@ -27,6 +27,9 @@ use OCA\user_ldap\lib\user\IUserTools; use OCA\user_ldap\lib\Connection; use OCA\user_ldap\lib\FilesystemHelper; use OCA\user_ldap\lib\LogWrapper; +use OCP\IAvatarManager; +use OCP\IConfig; +use OCP\IUserManager; /** * User @@ -43,7 +46,7 @@ class User { */ protected $connection; /** - * @var \OCP\IConfig + * @var IConfig */ protected $config; /** @@ -59,10 +62,13 @@ class User { */ protected $log; /** - * @var \OCP\IAvatarManager + * @var IAvatarManager */ protected $avatarManager; - + /** + * @var IUserManager + */ + protected $userManager; /** * @var string */ @@ -92,15 +98,16 @@ class User { * @param string $dn the LDAP DN * @param IUserTools $access an instance that implements IUserTools for * LDAP interaction - * @param \OCP\IConfig $config + * @param IConfig $config * @param FilesystemHelper $fs * @param \OCP\Image $image any empty instance * @param LogWrapper $log - * @param \OCP\IAvatarManager $avatarManager + * @param IAvatarManager $avatarManager + * @param IUserManager $userManager */ public function __construct($username, $dn, IUserTools $access, - \OCP\IConfig $config, FilesystemHelper $fs, \OCP\Image $image, - LogWrapper $log, \OCP\IAvatarManager $avatarManager) { + IConfig $config, FilesystemHelper $fs, \OCP\Image $image, + LogWrapper $log, IAvatarManager $avatarManager, IUserManager $userManager) { $this->access = $access; $this->connection = $access->getConnection(); @@ -111,6 +118,7 @@ class User { $this->image = $image; $this->log = $log; $this->avatarManager = $avatarManager; + $this->userManager = $userManager; } /** @@ -400,8 +408,8 @@ class User { } } if(!is_null($email)) { - $this->config->setUserValue( - $this->uid, 'settings', 'email', $email); + $user = $this->userManager->get($this->uid); + $user->setEMailAddress($email); } } diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php index d9a3919dfcd..6d35adf1694 100644 --- a/apps/user_ldap/tests/access.php +++ b/apps/user_ldap/tests/access.php @@ -58,7 +58,8 @@ class Test_Access extends \Test\TestCase { $this->getMock('\OCA\user_ldap\lib\LogWrapper'), $this->getMock('\OCP\IAvatarManager'), $this->getMock('\OCP\Image'), - $this->getMock('\OCP\IDBConnection'))); + $this->getMock('\OCP\IDBConnection'), + $this->getMock('\OCP\IUserManager'))); return array($lw, $connector, $um); } diff --git a/apps/user_ldap/tests/integration/lib/integrationtestbatchapplyuserattributes.php b/apps/user_ldap/tests/integration/lib/integrationtestbatchapplyuserattributes.php new file mode 100644 index 00000000000..f83b0efd0cc --- /dev/null +++ b/apps/user_ldap/tests/integration/lib/integrationtestbatchapplyuserattributes.php @@ -0,0 +1,72 @@ +<?php +/** + * @author Arthur Schiwon <blizzz@owncloud.com> + * + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +namespace OCA\user_ldap\tests\integration\lib; + +use OCA\User_LDAP\Mapping\UserMapping; +use OCA\user_ldap\tests\integration\AbstractIntegrationTest; + +require_once __DIR__ . '/../../../../../lib/base.php'; + +class IntegrationTestBatchApplyUserAttributes extends AbstractIntegrationTest { + /** + * prepares the LDAP environment and sets up a test configuration for + * the LDAP backend. + */ + public function init() { + require(__DIR__ . '/../setup-scripts/createExplicitUsers.php'); + require(__DIR__ . '/../setup-scripts/createUsersWithoutDisplayName.php'); + parent::init(); + + $this->mapping = new UserMapping(\OC::$server->getDatabaseConnection()); + $this->mapping->clear(); + $this->access->setUserMapper($this->mapping); + } + + /** + * sets up the LDAP configuration to be used for the test + */ + protected function initConnection() { + parent::initConnection(); + $this->connection->setConfiguration([ + 'ldapUserDisplayName' => 'displayname', + ]); + } + + /** + * indirectly tests whether batchApplyUserAttributes does it job properly, + * when a user without display name is included in the result set from LDAP. + * + * @return bool + */ + protected function case1() { + $result = $this->access->fetchListOfUsers('objectclass=person', 'dn'); + // on the original issue, PHP would emit a fatal error + // – cannot catch it here, but will render the test as unsuccessful + return is_array($result) && !empty($result); + } + +} + +require_once(__DIR__ . '/../setup-scripts/config.php'); +$test = new IntegrationTestBatchApplyUserAttributes($host, $port, $adn, $apwd, $bdn); +$test->init(); +$test->run(); diff --git a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php index 9fb0ffc1b7d..4db3ca48768 100644 --- a/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php +++ b/apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php @@ -123,7 +123,8 @@ class IntegrationTestUserAvatar extends AbstractIntegrationTest { new \OCA\user_ldap\lib\LogWrapper(), \OC::$server->getAvatarManager(), new \OCP\Image(), - \OC::$server->getDatabaseConnection() + \OC::$server->getDatabaseConnection(), + \OC::$server->getUserManager() ); } diff --git a/apps/user_ldap/tests/integration/setup-scripts/createUsersWithoutDisplayName.php b/apps/user_ldap/tests/integration/setup-scripts/createUsersWithoutDisplayName.php new file mode 100644 index 00000000000..7f474aaa0e8 --- /dev/null +++ b/apps/user_ldap/tests/integration/setup-scripts/createUsersWithoutDisplayName.php @@ -0,0 +1,59 @@ +<?php +/** + * @author Arthur Schiwon <blizzz@owncloud.com> + * + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ +if(php_sapi_name() !== 'cli') { + print('Only via CLI, please.'); + exit(1); +} + +include __DIR__ . '/config.php'; + +$cr = ldap_connect($host, $port); +ldap_set_option($cr, LDAP_OPT_PROTOCOL_VERSION, 3); +$ok = ldap_bind($cr, $adn, $apwd); + +if (!$ok) { + die(ldap_error($cr)); +} + +$ouName = 'Users'; +$ouDN = 'ou=' . $ouName . ',' . $bdn; + +$users = ['robot']; + +foreach ($users as $uid) { + $newDN = 'uid=' . $uid . ',' . $ouDN; + $fn = ucfirst($uid); + $sn = ucfirst(str_shuffle($uid)); // not so explicit but it's OK. + + $entry = []; + $entry['cn'] = ucfirst($uid); + $entry['objectclass'][] = 'inetOrgPerson'; + $entry['objectclass'][] = 'person'; + $entry['sn'] = $sn; + $entry['userPassword'] = $uid; + + $ok = ldap_add($cr, $newDN, $entry); + if ($ok) { + echo('created user ' . ': ' . $entry['cn'] . PHP_EOL); + } else { + die(ldap_error($cr)); + } +} diff --git a/apps/user_ldap/tests/user/manager.php b/apps/user_ldap/tests/user/manager.php index 2ad438fcba4..c4af1009df8 100644 --- a/apps/user_ldap/tests/user/manager.php +++ b/apps/user_ldap/tests/user/manager.php @@ -44,6 +44,7 @@ class Test_User_Manager extends \Test\TestCase { $avaMgr = $this->getMock('\OCP\IAvatarManager'); $image = $this->getMock('\OCP\Image'); $dbc = $this->getMock('\OCP\IDBConnection'); + $userMgr = $this->getMock('\OCP\IUserManager'); $connection = new \OCA\user_ldap\lib\Connection( $lw = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper'), @@ -55,11 +56,11 @@ class Test_User_Manager extends \Test\TestCase { ->method('getConnection') ->will($this->returnValue($connection)); - return array($access, $config, $filesys, $image, $log, $avaMgr, $dbc); + return array($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr); } public function testGetByDNExisting() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); $inputDN = 'cn=foo,dc=foobar,dc=bar'; @@ -78,7 +79,7 @@ class Test_User_Manager extends \Test\TestCase { $access->expects($this->never()) ->method('username2dn'); - $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc); + $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc, $userMgr); $manager->setLdapAccess($access); $user = $manager->get($inputDN); @@ -90,7 +91,7 @@ class Test_User_Manager extends \Test\TestCase { } public function testGetByEDirectoryDN() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); $inputDN = 'uid=foo,o=foobar,c=bar'; @@ -109,7 +110,7 @@ class Test_User_Manager extends \Test\TestCase { $access->expects($this->never()) ->method('username2dn'); - $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc); + $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc, $userMgr); $manager->setLdapAccess($access); $user = $manager->get($inputDN); @@ -117,7 +118,7 @@ class Test_User_Manager extends \Test\TestCase { } public function testGetByExoticDN() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); $inputDN = 'ab=cde,f=ghei,mno=pq'; @@ -136,7 +137,7 @@ class Test_User_Manager extends \Test\TestCase { $access->expects($this->never()) ->method('username2dn'); - $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc); + $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc, $userMgr); $manager->setLdapAccess($access); $user = $manager->get($inputDN); @@ -144,7 +145,7 @@ class Test_User_Manager extends \Test\TestCase { } public function testGetByDNNotExisting() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); $inputDN = 'cn=gone,dc=foobar,dc=bar'; @@ -164,7 +165,7 @@ class Test_User_Manager extends \Test\TestCase { ->with($this->equalTo($inputDN)) ->will($this->returnValue(false)); - $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc); + $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc, $userMgr); $manager->setLdapAccess($access); $user = $manager->get($inputDN); @@ -172,7 +173,7 @@ class Test_User_Manager extends \Test\TestCase { } public function testGetByUidExisting() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); $dn = 'cn=foo,dc=foobar,dc=bar'; @@ -191,7 +192,7 @@ class Test_User_Manager extends \Test\TestCase { ->with($this->equalTo($uid)) ->will($this->returnValue(false)); - $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc); + $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc, $userMgr); $manager->setLdapAccess($access); $user = $manager->get($uid); @@ -203,7 +204,7 @@ class Test_User_Manager extends \Test\TestCase { } public function testGetByUidNotExisting() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); $dn = 'cn=foo,dc=foobar,dc=bar'; @@ -217,7 +218,7 @@ class Test_User_Manager extends \Test\TestCase { ->with($this->equalTo($uid)) ->will($this->returnValue(false)); - $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc); + $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc, $userMgr); $manager->setLdapAccess($access); $user = $manager->get($uid); @@ -225,10 +226,10 @@ class Test_User_Manager extends \Test\TestCase { } public function testGetAttributesAll() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); - $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc); + $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc, $userMgr); $manager->setLdapAccess($access); $connection = $access->getConnection(); @@ -243,10 +244,10 @@ class Test_User_Manager extends \Test\TestCase { } public function testGetAttributesMinimal() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); - $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc); + $manager = new Manager($config, $filesys, $log, $avaMgr, $image, $dbc, $userMgr); $manager->setLdapAccess($access); $attributes = $manager->getAttributes(true); diff --git a/apps/user_ldap/tests/user/user.php b/apps/user_ldap/tests/user/user.php index 9b3bb4ace66..6fa7f3b6b27 100644 --- a/apps/user_ldap/tests/user/user.php +++ b/apps/user_ldap/tests/user/user.php @@ -25,6 +25,7 @@ namespace OCA\user_ldap\tests; use OCA\user_ldap\lib\user\User; +use OCP\IUserManager; /** * Class Test_User_User @@ -43,11 +44,12 @@ class Test_User_User extends \Test\TestCase { $avaMgr = $this->getMock('\OCP\IAvatarManager'); $image = $this->getMock('\OCP\Image'); $dbc = $this->getMock('\OCP\IDBConnection'); + $userMgr = $this->getMock('\OCP\IUserManager'); - return array($access, $config, $filesys, $image, $log, $avaMgr, $dbc); + return array($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr); } - private function getAdvancedMocks($cfMock, $fsMock, $logMock, $avaMgr, $dbc) { + private function getAdvancedMocks($cfMock, $fsMock, $logMock, $avaMgr, $dbc, $userMgr = null) { static $conMethods; static $accMethods; static $umMethods; @@ -61,8 +63,11 @@ class Test_User_User extends \Test\TestCase { } $lw = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper'); $im = $this->getMock('\OCP\Image'); + if (is_null($userMgr)) { + $userMgr = $this->getMock('\OCP\IUserManager'); + } $um = $this->getMock('\OCA\user_ldap\lib\user\Manager', - $umMethods, array($cfMock, $fsMock, $logMock, $avaMgr, $im, $dbc)); + $umMethods, array($cfMock, $fsMock, $logMock, $avaMgr, $im, $dbc, $userMgr)); $connector = $this->getMock('\OCA\user_ldap\lib\Connection', $conMethods, array($lw, null, null)); $access = $this->getMock('\OCA\user_ldap\lib\Access', @@ -72,25 +77,25 @@ class Test_User_User extends \Test\TestCase { } public function testGetDNandUsername() { - list($access, $config, $filesys, $image, $log, $avaMgr) = + list($access, $config, $filesys, $image, $log, $avaMgr, $db, $userMgr) = $this->getTestInstances(); $uid = 'alice'; $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $this->assertSame($dn, $user->getDN()); $this->assertSame($uid, $user->getUsername()); } public function testUpdateEmailProvided() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = - $this->getAdvancedMocks($config, $filesys, $log, $avaMgr, $dbc); + $this->getAdvancedMocks($config, $filesys, $log, $avaMgr, $dbc, $userMgr); $connection->expects($this->once()) ->method('__get') @@ -103,24 +108,27 @@ class Test_User_User extends \Test\TestCase { $this->equalTo('email')) ->will($this->returnValue(array('alice@foo.bar'))); - $config->expects($this->once()) - ->method('setUserValue') - ->with($this->equalTo('alice'), $this->equalTo('settings'), - $this->equalTo('email'), - $this->equalTo('alice@foo.bar')) - ->will($this->returnValue(true)); - $uid = 'alice'; $dn = 'uid=alice,dc=foo,dc=bar'; + $uuser = $this->getMockBuilder('\OCP\IUser') + ->disableOriginalConstructor() + ->getMock(); + $uuser->expects($this->once()) + ->method('setEMailAddress') + ->with('alice@foo.bar'); + /** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject $userMgr */ + $userMgr->expects($this->any()) + ->method('get') + ->willReturn($uuser); $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $user->updateEmail(); } public function testUpdateEmailNotProvided() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = @@ -144,13 +152,13 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $user->updateEmail(); } public function testUpdateEmailNotConfigured() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = @@ -171,13 +179,13 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $user->updateEmail(); } public function testUpdateQuotaAllProvided() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = @@ -214,13 +222,13 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $user->updateQuota(); } public function testUpdateQuotaDefaultProvided() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = @@ -257,13 +265,13 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $user->updateQuota(); } public function testUpdateQuotaIndividualProvided() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = @@ -300,13 +308,13 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $user->updateQuota(); } public function testUpdateQuotaNoneProvided() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = @@ -338,13 +346,13 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $user->updateQuota(); } public function testUpdateQuotaNoneConfigured() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = @@ -373,13 +381,13 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $user->updateQuota(); } public function testUpdateQuotaFromValue() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = @@ -412,14 +420,14 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $user->updateQuota($readQuota); } //the testUpdateAvatar series also implicitely tests getAvatarImage public function testUpdateAvatarJpegPhotoProvided() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = @@ -462,13 +470,13 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $user->updateAvatar(); } public function testUpdateAvatarThumbnailPhotoProvided() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = @@ -520,13 +528,13 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $user->updateAvatar(); } public function testUpdateAvatarNotProvided() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = @@ -566,13 +574,13 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $user->updateAvatar(); } public function testUpdateBeforeFirstLogin() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = @@ -602,13 +610,13 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $user->update(); } public function testUpdateAfterFirstLogin() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = @@ -642,13 +650,13 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $user->update(); } public function testUpdateNoRefresh() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = @@ -678,13 +686,13 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $user->update(); } public function testMarkLogin() { - list($access, $config, $filesys, $image, $log, $avaMgr) = + list($access, $config, $filesys, $image, $log, $avaMgr, $db, $userMgr) = $this->getTestInstances(); $config->expects($this->once()) @@ -699,13 +707,13 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $user->markLogin(); } public function testGetAvatarImageProvided() { - list($access, $config, $filesys, $image, $log, $avaMgr) = + list($access, $config, $filesys, $image, $log, $avaMgr, $db, $userMgr) = $this->getTestInstances(); $access->expects($this->once()) @@ -718,7 +726,7 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $photo = $user->getAvatarImage(); $this->assertSame('this is a photo', $photo); @@ -728,7 +736,7 @@ class Test_User_User extends \Test\TestCase { } public function testProcessAttributes() { - list(, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list(, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = @@ -748,7 +756,7 @@ class Test_User_User extends \Test\TestCase { ); $userMock = $this->getMockBuilder('OCA\user_ldap\lib\user\User') - ->setConstructorArgs(array($uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr)) + ->setConstructorArgs(array($uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr)) ->setMethods($requiredMethods) ->getMock(); @@ -795,7 +803,7 @@ class Test_User_User extends \Test\TestCase { * @dataProvider emptyHomeFolderAttributeValueProvider */ public function testGetHomePathNotConfigured($attributeValue) { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = @@ -816,14 +824,14 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $path = $user->getHomePath(); $this->assertSame($path, false); } public function testGetHomePathConfiguredNotAvailableAllowed() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = @@ -847,7 +855,7 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $path = $user->getHomePath(); @@ -858,11 +866,11 @@ class Test_User_User extends \Test\TestCase { * @expectedException \Exception */ public function testGetHomePathConfiguredNotAvailableNotAllowed() { - list($access, $config, $filesys, $image, $log, $avaMgr, $dbc) = + list($access, $config, $filesys, $image, $log, $avaMgr, $dbc, $userMgr) = $this->getTestInstances(); list($access, $connection) = - $this->getAdvancedMocks($config, $filesys, $log, $avaMgr, $dbc); + $this->getAdvancedMocks($config, $filesys, $log, $avaMgr, $dbc, $userMgr); $connection->expects($this->any()) ->method('__get') @@ -882,7 +890,7 @@ class Test_User_User extends \Test\TestCase { $dn = 'uid=alice,dc=foo,dc=bar'; $user = new User( - $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr); + $uid, $dn, $access, $config, $filesys, $image, $log, $avaMgr, $userMgr); $user->getHomePath(); } diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php index 87c6fae0f5d..0ae18a2aa96 100644 --- a/apps/user_ldap/tests/user_ldap.php +++ b/apps/user_ldap/tests/user_ldap.php @@ -84,7 +84,8 @@ class Test_User_Ldap_Direct extends \Test\TestCase { $this->getMock('\OCA\user_ldap\lib\LogWrapper'), $this->getMock('\OCP\IAvatarManager'), $this->getMock('\OCP\Image'), - $this->getMock('\OCP\IDBConnection') + $this->getMock('\OCP\IDBConnection'), + $this->getMock('\OCP\IUserManager') ]) ->getMock(); @@ -314,7 +315,7 @@ class Test_User_Ldap_Direct extends \Test\TestCase { $access->expects($this->any()) ->method('combineFilterWithAnd') ->will($this->returnCallback(function($param) { - return $param[1]; + return $param[2]; })); $access->expects($this->any()) diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index 87c857a844a..65a4bbdda77 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -173,6 +173,7 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn } $filter = $this->access->combineFilterWithAnd(array( $this->access->connection->ldapUserFilter, + $this->access->connection->ldapUserDisplayName . '=*', $this->access->getFilterPartForUserSearch($search) )); |