diff options
Diffstat (limited to 'settings')
30 files changed, 153 insertions, 24 deletions
diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php index 3ad52bd2187..b9e60c376de 100644 --- a/settings/controller/appsettingscontroller.php +++ b/settings/controller/appsettingscontroller.php @@ -118,7 +118,8 @@ class AppSettingsController extends Controller { } // fix groups to be an array - $apps = array_map(function($app){ + $dependencyAnalyzer = new DependencyAnalyzer(new Platform($this->config), $this->l10n); + $apps = array_map(function($app) use ($dependencyAnalyzer) { $groups = array(); if (is_string($app['groups'])) { $groups = json_decode($app['groups']); @@ -127,8 +128,7 @@ class AppSettingsController extends Controller { $app['canUnInstall'] = !$app['active'] && $app['removable']; // analyse dependencies - $dependencyAnalyzer = new DependencyAnalyzer($app, new Platform($this->config), $this->l10n); - $missing = $dependencyAnalyzer->analyze(); + $missing = $dependencyAnalyzer->analyze($app); $app['canInstall'] = empty($missing); $app['missingDependencies'] = $missing; diff --git a/settings/controller/userscontroller.php b/settings/controller/userscontroller.php index dd3aa72890e..c25989af1a9 100644 --- a/settings/controller/userscontroller.php +++ b/settings/controller/userscontroller.php @@ -11,6 +11,7 @@ namespace OC\Settings\Controller; use OC\AppFramework\Http; +use OC\User\Manager; use OC\User\User; use \OCP\AppFramework\Controller; use OCP\AppFramework\Http\DataResponse; @@ -85,45 +86,68 @@ class UsersController extends Controller { } /** + * @param array $userIDs Array with schema [$uid => $displayName] + * @return IUser[] + */ + private function getUsersForUID(array $userIDs) { + $users = []; + foreach ($userIDs as $uid => $displayName) { + $users[] = $this->userManager->get($uid); + } + return $users; + } + + /** * @NoAdminRequired * * @param int $offset * @param int $limit - * @param string $gid - * @param string $pattern + * @param string $gid GID to filter for + * @param string $pattern Pattern to search for in the username + * @param string $backend Backend to filter for (class-name) * @return DataResponse * * TODO: Tidy up and write unit tests - code is mainly static method calls */ - public function index($offset = 0, $limit = 10, $gid = '', $pattern = '') { + public function index($offset = 0, $limit = 10, $gid = '', $pattern = '', $backend = '') { // FIXME: The JS sends the group '_everyone' instead of no GID for the "all users" group. if($gid === '_everyone') { $gid = ''; } + + // Remove backends + if(!empty($backend)) { + $activeBackends = $this->userManager->getBackends(); + $this->userManager->clearBackends(); + foreach($activeBackends as $singleActiveBackend) { + if($backend === get_class($singleActiveBackend)) { + $this->userManager->registerBackend($singleActiveBackend); + break; + } + } + } + $users = array(); if ($this->isAdmin) { + if($gid !== '') { - $batch = $this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset); + $batch = $this->getUsersForUID($this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset)); } else { - // FIXME: Remove static method call - $batch = \OC_User::getDisplayNames($pattern, $limit, $offset); + $batch = $this->userManager->search('', $limit, $offset); } - foreach ($batch as $uid => $displayname) { - $users[] = $this->formatUserForIndex($this->userManager->get($uid)); + foreach ($batch as $user) { + $users[] = $this->formatUserForIndex($user); } + } else { - $groups = \OC_SubAdmin::getSubAdminsGroups($this->userSession->getUser()->getUID()); - if($gid !== '' && in_array($gid, $groups)) { - $groups = array($gid); - } elseif($gid !== '') { - //don't you try to investigate loops you must not know about - $groups = array(); + // Set the $gid parameter to an empty value if the subadmin has no rights to access a specific group + if($gid !== '' && !in_array($gid, \OC_SubAdmin::getSubAdminsGroups($this->userSession->getUser()->getUID()))) { + $gid = ''; } - $batch = \OC_Group::usersInGroups($groups, $pattern, $limit, $offset); - foreach ($batch as $uid) { - $user = $this->userManager->get($uid); + $batch = $this->getUsersForUID($this->groupManager->displayNamesInGroup($gid, $pattern, $limit, $offset)); + foreach ($batch as $user) { // Only add the groups, this user is a subadmin of $userGroups = array_intersect($this->groupManager->getUserGroupIds($user), \OC_SubAdmin::getSubAdminsGroups($this->userSession->getUser()->getUID())); diff --git a/settings/css/settings.css b/settings/css/settings.css index fa699e50a4b..c951f98f9cf 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -203,6 +203,11 @@ span.version { margin-left:1em; margin-right:1em; color:#555; } border-bottom: 1px solid #e8e8e8; } +.app-dependencies { + margin-top: 10px; + color: #c33; +} + .missing-dependencies { list-style: initial; list-style-type: initial; diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js index 8b29f9b1687..925946b7141 100644 --- a/settings/l10n/cs_CZ.js +++ b/settings/l10n/cs_CZ.js @@ -220,6 +220,7 @@ OC.L10N.register( "Delete Encryption Keys" : "Smazat šifrovací klíče", "Show storage location" : "Zobrazit umístění úložiště", "Show last log in" : "Zobrazit poslední přihlášení", + "Show user backend" : "Zobrazit uživatelskou podpůrnou vrstvu", "Username" : "Uživatelské jméno", "Create" : "Vytvořit", "Admin Recovery Password" : "Heslo obnovy správce", @@ -236,6 +237,7 @@ OC.L10N.register( "Group Admin for" : "Správce skupiny ", "Quota" : "Kvóta", "Storage Location" : "Umístění úložiště", + "User Backend" : "Uživatelská podpůrná vrstva", "Last Login" : "Poslední přihlášení", "change full name" : "změnit celé jméno", "set new password" : "nastavit nové heslo", diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json index c55b4c06e2b..6d7e929da9f 100644 --- a/settings/l10n/cs_CZ.json +++ b/settings/l10n/cs_CZ.json @@ -218,6 +218,7 @@ "Delete Encryption Keys" : "Smazat šifrovací klíče", "Show storage location" : "Zobrazit umístění úložiště", "Show last log in" : "Zobrazit poslední přihlášení", + "Show user backend" : "Zobrazit uživatelskou podpůrnou vrstvu", "Username" : "Uživatelské jméno", "Create" : "Vytvořit", "Admin Recovery Password" : "Heslo obnovy správce", @@ -234,6 +235,7 @@ "Group Admin for" : "Správce skupiny ", "Quota" : "Kvóta", "Storage Location" : "Umístění úložiště", + "User Backend" : "Uživatelská podpůrná vrstva", "Last Login" : "Poslední přihlášení", "change full name" : "změnit celé jméno", "set new password" : "nastavit nové heslo", diff --git a/settings/l10n/da.js b/settings/l10n/da.js index ad4a41979db..81cc2215048 100644 --- a/settings/l10n/da.js +++ b/settings/l10n/da.js @@ -220,6 +220,7 @@ OC.L10N.register( "Delete Encryption Keys" : "Slet Krypteringsnøgler", "Show storage location" : "Vis placering af lageret", "Show last log in" : "Vis seneste login", + "Show user backend" : "Vis bruger-backend", "Username" : "Brugernavn", "Create" : "Ny", "Admin Recovery Password" : "Administrator gendannelse kodeord", @@ -236,6 +237,7 @@ OC.L10N.register( "Group Admin for" : "Gruppeadministrator for", "Quota" : "Kvote", "Storage Location" : "Placering af lageret", + "User Backend" : "Bruger-backend", "Last Login" : "Seneste login", "change full name" : "ændre fulde navn", "set new password" : "skift kodeord", diff --git a/settings/l10n/da.json b/settings/l10n/da.json index 8861beb5b08..af813eec3d7 100644 --- a/settings/l10n/da.json +++ b/settings/l10n/da.json @@ -218,6 +218,7 @@ "Delete Encryption Keys" : "Slet Krypteringsnøgler", "Show storage location" : "Vis placering af lageret", "Show last log in" : "Vis seneste login", + "Show user backend" : "Vis bruger-backend", "Username" : "Brugernavn", "Create" : "Ny", "Admin Recovery Password" : "Administrator gendannelse kodeord", @@ -234,6 +235,7 @@ "Group Admin for" : "Gruppeadministrator for", "Quota" : "Kvote", "Storage Location" : "Placering af lageret", + "User Backend" : "Bruger-backend", "Last Login" : "Seneste login", "change full name" : "ændre fulde navn", "set new password" : "skift kodeord", diff --git a/settings/l10n/de.js b/settings/l10n/de.js index 16ec56a7cf8..2bcb41fa3e6 100644 --- a/settings/l10n/de.js +++ b/settings/l10n/de.js @@ -220,6 +220,7 @@ OC.L10N.register( "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen", "Show storage location" : "Speicherort anzeigen", "Show last log in" : "Letzte Anmeldung anzeigen", + "Show user backend" : "Nutzer-Backend anzeigen", "Username" : "Benutzername", "Create" : "Anlegen", "Admin Recovery Password" : "Admin-Wiederherstellungspasswort", @@ -236,6 +237,7 @@ OC.L10N.register( "Group Admin for" : "Gruppenadministrator für", "Quota" : "Quota", "Storage Location" : "Speicherort", + "User Backend" : "Nutzer-Backend", "Last Login" : "Letzte Anmeldung", "change full name" : "Vollständigen Namen ändern", "set new password" : "Neues Passwort setzen", diff --git a/settings/l10n/de.json b/settings/l10n/de.json index fc8f62c4496..85856a24577 100644 --- a/settings/l10n/de.json +++ b/settings/l10n/de.json @@ -218,6 +218,7 @@ "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen", "Show storage location" : "Speicherort anzeigen", "Show last log in" : "Letzte Anmeldung anzeigen", + "Show user backend" : "Nutzer-Backend anzeigen", "Username" : "Benutzername", "Create" : "Anlegen", "Admin Recovery Password" : "Admin-Wiederherstellungspasswort", @@ -234,6 +235,7 @@ "Group Admin for" : "Gruppenadministrator für", "Quota" : "Quota", "Storage Location" : "Speicherort", + "User Backend" : "Nutzer-Backend", "Last Login" : "Letzte Anmeldung", "change full name" : "Vollständigen Namen ändern", "set new password" : "Neues Passwort setzen", diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js index 611092ba723..ccd6b370221 100644 --- a/settings/l10n/de_DE.js +++ b/settings/l10n/de_DE.js @@ -220,6 +220,7 @@ OC.L10N.register( "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen", "Show storage location" : "Speicherort anzeigen", "Show last log in" : "Letzte Anmeldung anzeigen", + "Show user backend" : "Nutzer-Backend anzeigen", "Username" : "Benutzername", "Create" : "Erstellen", "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung", @@ -236,6 +237,7 @@ OC.L10N.register( "Group Admin for" : "Gruppenadministrator für", "Quota" : "Kontingent", "Storage Location" : "Speicherort", + "User Backend" : "Nutzer-Backend", "Last Login" : "Letzte Anmeldung", "change full name" : "Vollständigen Namen ändern", "set new password" : "Neues Passwort setzen", diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json index 6be5a21ffc4..ef244e916be 100644 --- a/settings/l10n/de_DE.json +++ b/settings/l10n/de_DE.json @@ -218,6 +218,7 @@ "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen", "Show storage location" : "Speicherort anzeigen", "Show last log in" : "Letzte Anmeldung anzeigen", + "Show user backend" : "Nutzer-Backend anzeigen", "Username" : "Benutzername", "Create" : "Erstellen", "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung", @@ -234,6 +235,7 @@ "Group Admin for" : "Gruppenadministrator für", "Quota" : "Kontingent", "Storage Location" : "Speicherort", + "User Backend" : "Nutzer-Backend", "Last Login" : "Letzte Anmeldung", "change full name" : "Vollständigen Namen ändern", "set new password" : "Neues Passwort setzen", diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js index e318a10079b..61fc288aa05 100644 --- a/settings/l10n/en_GB.js +++ b/settings/l10n/en_GB.js @@ -220,6 +220,7 @@ OC.L10N.register( "Delete Encryption Keys" : "Delete Encryption Keys", "Show storage location" : "Show storage location", "Show last log in" : "Show last log in", + "Show user backend" : "Show user backend", "Username" : "Username", "Create" : "Create", "Admin Recovery Password" : "Admin Recovery Password", @@ -236,6 +237,7 @@ OC.L10N.register( "Group Admin for" : "Group Admin for", "Quota" : "Quota", "Storage Location" : "Storage Location", + "User Backend" : "User Backend", "Last Login" : "Last Login", "change full name" : "change full name", "set new password" : "set new password", diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json index fde7897451a..ad428e5c635 100644 --- a/settings/l10n/en_GB.json +++ b/settings/l10n/en_GB.json @@ -218,6 +218,7 @@ "Delete Encryption Keys" : "Delete Encryption Keys", "Show storage location" : "Show storage location", "Show last log in" : "Show last log in", + "Show user backend" : "Show user backend", "Username" : "Username", "Create" : "Create", "Admin Recovery Password" : "Admin Recovery Password", @@ -234,6 +235,7 @@ "Group Admin for" : "Group Admin for", "Quota" : "Quota", "Storage Location" : "Storage Location", + "User Backend" : "User Backend", "Last Login" : "Last Login", "change full name" : "change full name", "set new password" : "set new password", diff --git a/settings/l10n/es.js b/settings/l10n/es.js index 069466d7840..09bda794f48 100644 --- a/settings/l10n/es.js +++ b/settings/l10n/es.js @@ -220,6 +220,7 @@ OC.L10N.register( "Delete Encryption Keys" : "Eliminar claves de cifrado", "Show storage location" : "Mostrar la ubicación del almacenamiento", "Show last log in" : "Mostrar el último inicio de sesión", + "Show user backend" : "Mostrar motor de usuario", "Username" : "Nombre de usuario", "Create" : "Crear", "Admin Recovery Password" : "Recuperación de la contraseña de administración", @@ -236,6 +237,7 @@ OC.L10N.register( "Group Admin for" : "Grupo administrador para", "Quota" : "Cuota", "Storage Location" : "Ubicación de almacenamiento", + "User Backend" : "Motor de usuario", "Last Login" : "Último inicio de sesión", "change full name" : "cambiar el nombre completo", "set new password" : "establecer nueva contraseña", diff --git a/settings/l10n/es.json b/settings/l10n/es.json index 3cfec8d9e1d..2a826c51790 100644 --- a/settings/l10n/es.json +++ b/settings/l10n/es.json @@ -218,6 +218,7 @@ "Delete Encryption Keys" : "Eliminar claves de cifrado", "Show storage location" : "Mostrar la ubicación del almacenamiento", "Show last log in" : "Mostrar el último inicio de sesión", + "Show user backend" : "Mostrar motor de usuario", "Username" : "Nombre de usuario", "Create" : "Crear", "Admin Recovery Password" : "Recuperación de la contraseña de administración", @@ -234,6 +235,7 @@ "Group Admin for" : "Grupo administrador para", "Quota" : "Cuota", "Storage Location" : "Ubicación de almacenamiento", + "User Backend" : "Motor de usuario", "Last Login" : "Último inicio de sesión", "change full name" : "cambiar el nombre completo", "set new password" : "establecer nueva contraseña", diff --git a/settings/l10n/fi.js b/settings/l10n/fi.js new file mode 100644 index 00000000000..bf1854567a1 --- /dev/null +++ b/settings/l10n/fi.js @@ -0,0 +1,11 @@ +OC.L10N.register( + "settings", + { + "Delete" : "Poista", + "More" : "Lisää", + "Password" : "Salasana", + "Cancel" : "Peruuta", + "Username" : "Käyttäjätunnus", + "Create" : "Luo" +}, +"nplurals=2; plural=(n != 1);"); diff --git a/settings/l10n/fi.json b/settings/l10n/fi.json new file mode 100644 index 00000000000..58852d56692 --- /dev/null +++ b/settings/l10n/fi.json @@ -0,0 +1,9 @@ +{ "translations": { + "Delete" : "Poista", + "More" : "Lisää", + "Password" : "Salasana", + "Cancel" : "Peruuta", + "Username" : "Käyttäjätunnus", + "Create" : "Luo" +},"pluralForm" :"nplurals=2; plural=(n != 1);" +}
\ No newline at end of file diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js index d6a5900c9e0..ed713833ad5 100644 --- a/settings/l10n/fi_FI.js +++ b/settings/l10n/fi_FI.js @@ -212,6 +212,7 @@ OC.L10N.register( "Delete Encryption Keys" : "Poista salausavaimet", "Show storage location" : "Näytä tallennustilan sijainti", "Show last log in" : "Näytä viimeisin sisäänkirjautuminen", + "Show user backend" : "Näytä käyttäjätaustaosa", "Username" : "Käyttäjätunnus", "Create" : "Luo", "Admin Recovery Password" : "Ylläpitäjän palautussalasana", @@ -227,6 +228,7 @@ OC.L10N.register( "Group Admin for" : "Ryhmäylläpitäjä kohteille", "Quota" : "Kiintiö", "Storage Location" : "Tallennustilan sijainti", + "User Backend" : "Käyttäjätaustaosa", "Last Login" : "Viimeisin kirjautuminen", "change full name" : "muuta koko nimi", "set new password" : "aseta uusi salasana", diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json index cecfa94719e..75a262a5826 100644 --- a/settings/l10n/fi_FI.json +++ b/settings/l10n/fi_FI.json @@ -210,6 +210,7 @@ "Delete Encryption Keys" : "Poista salausavaimet", "Show storage location" : "Näytä tallennustilan sijainti", "Show last log in" : "Näytä viimeisin sisäänkirjautuminen", + "Show user backend" : "Näytä käyttäjätaustaosa", "Username" : "Käyttäjätunnus", "Create" : "Luo", "Admin Recovery Password" : "Ylläpitäjän palautussalasana", @@ -225,6 +226,7 @@ "Group Admin for" : "Ryhmäylläpitäjä kohteille", "Quota" : "Kiintiö", "Storage Location" : "Tallennustilan sijainti", + "User Backend" : "Käyttäjätaustaosa", "Last Login" : "Viimeisin kirjautuminen", "change full name" : "muuta koko nimi", "set new password" : "aseta uusi salasana", diff --git a/settings/l10n/id.js b/settings/l10n/id.js index 58d29aa64ff..88fd5f73c22 100644 --- a/settings/l10n/id.js +++ b/settings/l10n/id.js @@ -1,6 +1,7 @@ OC.L10N.register( "settings", { + "Security & Setup Warnings" : "Peringatan Keamanan dan Setelan", "Cron" : "Cron", "Sharing" : "Berbagi", "Security" : "Keamanan", @@ -34,12 +35,17 @@ OC.L10N.register( "Enabled" : "Diaktifkan", "Not enabled" : "Tidak diaktifkan", "Recommended" : "Direkomendasikan", + "Group already exists." : "Grup sudah ada.", + "Unable to add group." : "Tidak dapat menambah grup.", + "Unable to delete group." : "Tidak dapat menghapus grup.", "Saved" : "Disimpan", "test email settings" : "pengaturan email percobaan", "If you received this email, the settings seem to be correct." : "Jika Anda menerma email ini, pengaturan tampaknya sudah benar.", "A problem occurred while sending the email. Please revise your settings." : "Muncul masalah tidak terduga saat mengirim email. Mohon merevisi pengaturan Anda.", "Email sent" : "Email terkirim", "You need to set your user email before being able to send test emails." : "Anda perlu menetapkan email pengguna Anda sebelum dapat mengirim email percobaan.", + "Unable to create user." : "Tidak dapat membuat pengguna.", + "Unable to delete user." : "Tidak dapat menghapus pengguna.", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Apakah And yakin ingin menambahkan \"{domain}\" sebagai domain terpercaya?", "Add trusted domain" : "Tambah domain terpercaya", "Sending..." : "Mengirim", @@ -97,6 +103,8 @@ OC.L10N.register( "TLS" : "TLS", "Security Warning" : "Peringatan Keamanan", "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Anda mengakses %s melalui HTTP. Kami sangat menyarankan Anda untuk mengkonfigurasi server dengan menggunakan HTTPS sebagai gantinya.", + "Read-Only config enabled" : "Konfig Hanya-Baca diaktifkan", + "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Konfig Hanya-Baca telah diaktifkan. Ini akan mencegah setelan beberapa konfigurasi melalui antarmuka-web. Selanjutnya, berkas perlu dibuat dapat-dibaca secara manual untuk setiap pembaruan.", "Setup Warning" : "Peringatan Pengaturan", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Tampaknya pengaturan PHP strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.", diff --git a/settings/l10n/id.json b/settings/l10n/id.json index b2de287e5fb..f2abca832f7 100644 --- a/settings/l10n/id.json +++ b/settings/l10n/id.json @@ -1,4 +1,5 @@ { "translations": { + "Security & Setup Warnings" : "Peringatan Keamanan dan Setelan", "Cron" : "Cron", "Sharing" : "Berbagi", "Security" : "Keamanan", @@ -32,12 +33,17 @@ "Enabled" : "Diaktifkan", "Not enabled" : "Tidak diaktifkan", "Recommended" : "Direkomendasikan", + "Group already exists." : "Grup sudah ada.", + "Unable to add group." : "Tidak dapat menambah grup.", + "Unable to delete group." : "Tidak dapat menghapus grup.", "Saved" : "Disimpan", "test email settings" : "pengaturan email percobaan", "If you received this email, the settings seem to be correct." : "Jika Anda menerma email ini, pengaturan tampaknya sudah benar.", "A problem occurred while sending the email. Please revise your settings." : "Muncul masalah tidak terduga saat mengirim email. Mohon merevisi pengaturan Anda.", "Email sent" : "Email terkirim", "You need to set your user email before being able to send test emails." : "Anda perlu menetapkan email pengguna Anda sebelum dapat mengirim email percobaan.", + "Unable to create user." : "Tidak dapat membuat pengguna.", + "Unable to delete user." : "Tidak dapat menghapus pengguna.", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Apakah And yakin ingin menambahkan \"{domain}\" sebagai domain terpercaya?", "Add trusted domain" : "Tambah domain terpercaya", "Sending..." : "Mengirim", @@ -95,6 +101,8 @@ "TLS" : "TLS", "Security Warning" : "Peringatan Keamanan", "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Anda mengakses %s melalui HTTP. Kami sangat menyarankan Anda untuk mengkonfigurasi server dengan menggunakan HTTPS sebagai gantinya.", + "Read-Only config enabled" : "Konfig Hanya-Baca diaktifkan", + "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Konfig Hanya-Baca telah diaktifkan. Ini akan mencegah setelan beberapa konfigurasi melalui antarmuka-web. Selanjutnya, berkas perlu dibuat dapat-dibaca secara manual untuk setiap pembaruan.", "Setup Warning" : "Peringatan Pengaturan", "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Tampaknya pengaturan PHP strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.", "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.", diff --git a/settings/l10n/it.js b/settings/l10n/it.js index 279c9f0836c..071fedc2a9f 100644 --- a/settings/l10n/it.js +++ b/settings/l10n/it.js @@ -35,12 +35,17 @@ OC.L10N.register( "Enabled" : "Abilitata", "Not enabled" : "Non abilitata", "Recommended" : "Consigliata", + "Group already exists." : "Il gruppo esiste già.", + "Unable to add group." : "Impossibile aggiungere il gruppo.", + "Unable to delete group." : "Impossibile eliminare il gruppo.", "Saved" : "Salvato", "test email settings" : "prova impostazioni email", "If you received this email, the settings seem to be correct." : "Se hai ricevuto questa email, le impostazioni dovrebbero essere corrette.", "A problem occurred while sending the email. Please revise your settings." : "Si è verificato un problema durante l'invio dell'email. Controlla le tue impostazioni.", "Email sent" : "Email inviata", "You need to set your user email before being able to send test emails." : "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio delle email.", + "Unable to create user." : "Impossibile creare l'utente.", + "Unable to delete user." : "Impossibile eliminare l'utente.", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sei sicuro di voler aggiungere \"{domain}\" come dominio attendibile?", "Add trusted domain" : "Aggiungi dominio attendibile", "Sending..." : "Invio in corso...", @@ -115,6 +120,7 @@ OC.L10N.register( "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Consigliamo vivamente di installare i pacchetti richiesti sul tuo sistema per supportare una delle localizzazioni seguenti: %s.", "URL generation in notification emails" : "Generazione di URL nelle email di notifica", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se la tua installazione non si trova nella radice del dominio e utilizza il cron di sistema, potrebbero esserci problemi con la generazione degli URL. Per evitare questi problemi, imposta l'opzione \"overwritewebroot\" nel file config.php al percorso della radice del sito della tua installazione (Suggerito: \"%s\")", + "Configuration Checks" : "Controlli di configurazione", "No problems found" : "Nessun problema trovato", "Please double check the <a href='%s'>installation guides</a>." : "Leggi attentamente le <a href='%s'>guide d'installazione</a>.", "Last cron was executed at %s." : "L'ultimo cron è stato eseguito alle %s.", @@ -134,6 +140,7 @@ OC.L10N.register( "Enforce expiration date" : "Forza la data di scadenza", "Allow resharing" : "Consenti la ri-condivisione", "Restrict users to only share with users in their groups" : "Limita gli utenti a condividere solo con gli utenti nei loro gruppi", + "Allow users to send mail notification for shared files to other users" : "Consenti agli utenti di inviare email di notifica per i file condivisi con altri utenti", "Exclude groups from sharing" : "Escludi gruppi dalla condivisione", "These groups will still be able to receive shares, but not to initiate them." : "Questi gruppi saranno in grado di ricevere condivisioni, ma non iniziarle.", "Enforce HTTPS" : "Forza HTTPS", @@ -213,6 +220,7 @@ OC.L10N.register( "Delete Encryption Keys" : "Elimina chiavi di cifratura", "Show storage location" : "Mostra posizione di archiviazione", "Show last log in" : "Mostra ultimo accesso", + "Show user backend" : "Mostra il motore utente", "Username" : "Nome utente", "Create" : "Crea", "Admin Recovery Password" : "Password di ripristino amministrativa", @@ -229,6 +237,7 @@ OC.L10N.register( "Group Admin for" : "Gruppo di amministrazione per", "Quota" : "Quote", "Storage Location" : "Posizione di archiviazione", + "User Backend" : "Motore utente", "Last Login" : "Ultimo accesso", "change full name" : "modica nome completo", "set new password" : "imposta una nuova password", diff --git a/settings/l10n/it.json b/settings/l10n/it.json index 7211fe5a309..6674975a7f2 100644 --- a/settings/l10n/it.json +++ b/settings/l10n/it.json @@ -33,12 +33,17 @@ "Enabled" : "Abilitata", "Not enabled" : "Non abilitata", "Recommended" : "Consigliata", + "Group already exists." : "Il gruppo esiste già.", + "Unable to add group." : "Impossibile aggiungere il gruppo.", + "Unable to delete group." : "Impossibile eliminare il gruppo.", "Saved" : "Salvato", "test email settings" : "prova impostazioni email", "If you received this email, the settings seem to be correct." : "Se hai ricevuto questa email, le impostazioni dovrebbero essere corrette.", "A problem occurred while sending the email. Please revise your settings." : "Si è verificato un problema durante l'invio dell'email. Controlla le tue impostazioni.", "Email sent" : "Email inviata", "You need to set your user email before being able to send test emails." : "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio delle email.", + "Unable to create user." : "Impossibile creare l'utente.", + "Unable to delete user." : "Impossibile eliminare l'utente.", "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sei sicuro di voler aggiungere \"{domain}\" come dominio attendibile?", "Add trusted domain" : "Aggiungi dominio attendibile", "Sending..." : "Invio in corso...", @@ -113,6 +118,7 @@ "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Consigliamo vivamente di installare i pacchetti richiesti sul tuo sistema per supportare una delle localizzazioni seguenti: %s.", "URL generation in notification emails" : "Generazione di URL nelle email di notifica", "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se la tua installazione non si trova nella radice del dominio e utilizza il cron di sistema, potrebbero esserci problemi con la generazione degli URL. Per evitare questi problemi, imposta l'opzione \"overwritewebroot\" nel file config.php al percorso della radice del sito della tua installazione (Suggerito: \"%s\")", + "Configuration Checks" : "Controlli di configurazione", "No problems found" : "Nessun problema trovato", "Please double check the <a href='%s'>installation guides</a>." : "Leggi attentamente le <a href='%s'>guide d'installazione</a>.", "Last cron was executed at %s." : "L'ultimo cron è stato eseguito alle %s.", @@ -132,6 +138,7 @@ "Enforce expiration date" : "Forza la data di scadenza", "Allow resharing" : "Consenti la ri-condivisione", "Restrict users to only share with users in their groups" : "Limita gli utenti a condividere solo con gli utenti nei loro gruppi", + "Allow users to send mail notification for shared files to other users" : "Consenti agli utenti di inviare email di notifica per i file condivisi con altri utenti", "Exclude groups from sharing" : "Escludi gruppi dalla condivisione", "These groups will still be able to receive shares, but not to initiate them." : "Questi gruppi saranno in grado di ricevere condivisioni, ma non iniziarle.", "Enforce HTTPS" : "Forza HTTPS", @@ -211,6 +218,7 @@ "Delete Encryption Keys" : "Elimina chiavi di cifratura", "Show storage location" : "Mostra posizione di archiviazione", "Show last log in" : "Mostra ultimo accesso", + "Show user backend" : "Mostra il motore utente", "Username" : "Nome utente", "Create" : "Crea", "Admin Recovery Password" : "Password di ripristino amministrativa", @@ -227,6 +235,7 @@ "Group Admin for" : "Gruppo di amministrazione per", "Quota" : "Quote", "Storage Location" : "Posizione di archiviazione", + "User Backend" : "Motore utente", "Last Login" : "Ultimo accesso", "change full name" : "modica nome completo", "set new password" : "imposta una nuova password", diff --git a/settings/l10n/lv.js b/settings/l10n/lv.js index 8236fe2ea2c..97ae65c6d14 100644 --- a/settings/l10n/lv.js +++ b/settings/l10n/lv.js @@ -22,6 +22,11 @@ OC.L10N.register( "Updating...." : "Atjaunina....", "Error while updating app" : "Kļūda, atjauninot lietotni", "Updated" : "Atjaunināta", + "Very weak password" : "Ļoti vāja parole", + "Weak password" : "Vāja parole", + "So-so password" : "Normāla parole", + "Good password" : "Laba parole", + "Strong password" : "Lieliska parole", "Delete" : "Dzēst", "Decrypting files... Please wait, this can take some time." : "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku.", "Groups" : "Grupas", diff --git a/settings/l10n/lv.json b/settings/l10n/lv.json index 6715e6f190d..bde14b83022 100644 --- a/settings/l10n/lv.json +++ b/settings/l10n/lv.json @@ -20,6 +20,11 @@ "Updating...." : "Atjaunina....", "Error while updating app" : "Kļūda, atjauninot lietotni", "Updated" : "Atjaunināta", + "Very weak password" : "Ļoti vāja parole", + "Weak password" : "Vāja parole", + "So-so password" : "Normāla parole", + "Good password" : "Laba parole", + "Strong password" : "Lieliska parole", "Delete" : "Dzēst", "Decrypting files... Please wait, this can take some time." : "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku.", "Groups" : "Grupas", diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js index ab57c775c37..32ca30dfece 100644 --- a/settings/l10n/nl.js +++ b/settings/l10n/nl.js @@ -220,6 +220,7 @@ OC.L10N.register( "Delete Encryption Keys" : "Verwijder cryptosleutels", "Show storage location" : "Toon opslaglocatie", "Show last log in" : "Toon laatste inlog", + "Show user backend" : "Toon backend gebruiker", "Username" : "Gebruikersnaam", "Create" : "Aanmaken", "Admin Recovery Password" : "Beheer herstel wachtwoord", @@ -236,6 +237,7 @@ OC.L10N.register( "Group Admin for" : "Groepsbeheerder voor", "Quota" : "Limieten", "Storage Location" : "Opslaglocatie", + "User Backend" : "Backend gebruiker", "Last Login" : "Laatste inlog", "change full name" : "wijzigen volledige naam", "set new password" : "Instellen nieuw wachtwoord", diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json index ef3582a425a..153abd7eb4c 100644 --- a/settings/l10n/nl.json +++ b/settings/l10n/nl.json @@ -218,6 +218,7 @@ "Delete Encryption Keys" : "Verwijder cryptosleutels", "Show storage location" : "Toon opslaglocatie", "Show last log in" : "Toon laatste inlog", + "Show user backend" : "Toon backend gebruiker", "Username" : "Gebruikersnaam", "Create" : "Aanmaken", "Admin Recovery Password" : "Beheer herstel wachtwoord", @@ -234,6 +235,7 @@ "Group Admin for" : "Groepsbeheerder voor", "Quota" : "Limieten", "Storage Location" : "Opslaglocatie", + "User Backend" : "Backend gebruiker", "Last Login" : "Laatste inlog", "change full name" : "wijzigen volledige naam", "set new password" : "Instellen nieuw wachtwoord", diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js index cbb26486142..23970309d52 100644 --- a/settings/l10n/pt_BR.js +++ b/settings/l10n/pt_BR.js @@ -220,6 +220,7 @@ OC.L10N.register( "Delete Encryption Keys" : "Eliminar Chaves de Criptografia", "Show storage location" : "Mostrar localização de armazenamento", "Show last log in" : "Mostrar o último acesso", + "Show user backend" : "Mostrar administrador do usuário", "Username" : "Nome de Usuário", "Create" : "Criar", "Admin Recovery Password" : "Recuperação da Senha do Administrador", @@ -236,6 +237,7 @@ OC.L10N.register( "Group Admin for" : "Grupo Admin para", "Quota" : "Cota", "Storage Location" : "Local de Armazenamento", + "User Backend" : "Administrador do Usuário", "Last Login" : "Último Login", "change full name" : "alterar nome completo", "set new password" : "definir nova senha", diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json index beaf0199ed6..0a1e02ee57b 100644 --- a/settings/l10n/pt_BR.json +++ b/settings/l10n/pt_BR.json @@ -218,6 +218,7 @@ "Delete Encryption Keys" : "Eliminar Chaves de Criptografia", "Show storage location" : "Mostrar localização de armazenamento", "Show last log in" : "Mostrar o último acesso", + "Show user backend" : "Mostrar administrador do usuário", "Username" : "Nome de Usuário", "Create" : "Criar", "Admin Recovery Password" : "Recuperação da Senha do Administrador", @@ -234,6 +235,7 @@ "Group Admin for" : "Grupo Admin para", "Quota" : "Cota", "Storage Location" : "Local de Armazenamento", + "User Backend" : "Administrador do Usuário", "Last Login" : "Último Login", "change full name" : "alterar nome completo", "set new password" : "definir nova senha", diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 3bb0d45f582..48fe0f5a9c9 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -52,12 +52,14 @@ </p> {{/if}} {{#unless canInstall}} - <div><?php p($l->t('This app cannot be installed because the following dependencies are not fulfilled:')); ?></div> + <div class="app-dependencies"> + <p><?php p($l->t('This app cannot be installed because the following dependencies are not fulfilled:')); ?></p> <ul class="missing-dependencies"> {{#each missingDependencies}} <li>{{this}}</li> {{/each}} </ul> + </div> {{/unless}} {{#if update}} @@ -70,9 +72,7 @@ <br /> <input type="hidden" id="group_select" title="<?php p($l->t('All')); ?>" style="width: 200px"> {{else}} - {{#if canInstall}} - <input class="enable" type="submit" data-appid="{{id}}" data-active="false" value="<?php p($l->t("Enable"));?>"/> - {{/if}} + <input class="enable" type="submit" data-appid="{{id}}" data-active="false" {{#unless canInstall}}disabled="disabled"{{/unless}} value="<?php p($l->t("Enable"));?>"/> {{/if}} {{#if canUnInstall}} <input class="uninstall" type="submit" value="<?php p($l->t('Uninstall App')); ?>" data-appid="{{id}}" /> |