17 files changed, 153 insertions, 23 deletions
diff --git a/settings/admin.php b/settings/admin.php
index dd1c604edb1..704f4519ff6 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -21,7 +21,7 @@ $entries=OC_Log_Owncloud::getEntries(3);
 $entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 3;
 
 // Should we display sendmail as an option?
-$tmpl->assign('sendmail_is_available', (bool) findBinaryPath('sendmailsendmail'));
+$tmpl->assign('sendmail_is_available', (bool) findBinaryPath('sendmail'));
 
 $tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 ));
 $tmpl->assign('mail_domain', OC_Config::getValue( "mail_domain", '' ));
diff --git a/settings/admin/controller.php b/settings/admin/controller.php
index d0dcc49f297..7ced57791e9 100644
--- a/settings/admin/controller.php
+++ b/settings/admin/controller.php
@@ -86,7 +86,7 @@ class Controller {
 			$defaults = new \OC_Defaults();
 
 			try {
-				\OC_Mail::send($email, $_POST['user'],
+				\OC_Mail::send($email, \OC_User::getDisplayName(),
 					$l->t('test email settings'),
 					$l->t('If you received this email, the settings seem to be correct.'),
 					\OCP\Util::getDefaultEmailAddress('no-reply'), $defaults->getName());
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 7036f6dbf2a..a202feb4f65 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -123,10 +123,10 @@ $(document).ready(function(){
 		});
 	});
 
-	$('#sendtestemail').click(function(){
+	$('#sendtestemail').click(function(event){
+		event.preventDefault();
 		OC.msg.startAction('#sendtestmail_msg', t('settings', 'Sending...'));
-		var post = $( "#sendtestemail" ).serialize();
-		$.post(OC.generateUrl('/settings/admin/mailtest'), post, function(data){
+		$.post(OC.generateUrl('/settings/admin/mailtest'), '', function(data){
 			OC.msg.finishedAction('#sendtestmail_msg', data);
 		});
 	});
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 498600862a2..2d1a1632789 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -44,7 +44,7 @@ $TRANSLATIONS = array(
 "User Documentation" => "Uživatelská dokumentace",
 "Admin Documentation" => "Dokumentace pro administrátory",
 "Update to {appversion}" => "Aktualizovat na {appversion}",
-"Uninstall App" => "Odinstalovat Aplikaci",
+"Uninstall App" => "Odinstalovat aplikaci",
 "Disable" => "Zakázat",
 "Enable" => "Povolit",
 "Please wait...." => "Čekejte prosím...",
@@ -198,13 +198,13 @@ $TRANSLATIONS = array(
 "Log-in password" => "Přihlašovací heslo",
 "Decrypt all Files" => "Odšifrovat všechny soubory",
 "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vaše šifrovací klíče byly zálohovány. Pokud se něco pokazilo, dají se znovu obnovit. Smažte je trvale pouze pokud jste jisti, že jsou všechny vaše soubory bezchybně dešifrovány.",
-"Restore Encryption Keys" => "Obnovit Šifrovací Klíče",
-"Delete Encryption Keys" => "Smazat Šifrovací Klíče",
+"Restore Encryption Keys" => "Obnovit šifrovací klíče",
+"Delete Encryption Keys" => "Smazat šifrovací klíče",
 "Login Name" => "Přihlašovací jméno",
 "Create" => "Vytvořit",
 "Admin Recovery Password" => "Heslo obnovy správce",
 "Enter the recovery password in order to recover the users files during password change" => "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
-"Search Users and Groups" => "Prohledat Užiatele a Skupiny",
+"Search Users and Groups" => "Prohledat uživatele a skupiny",
 "Add Group" => "Přidat skupinu",
 "Group" => "Skupina",
 "Everyone" => "Všichni",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 6f271bcbb43..56a5e89f4a2 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -30,14 +30,20 @@ $TRANSLATIONS = array(
 "User Documentation" => "Dokumentaro por uzantoj",
 "Admin Documentation" => "Administra dokumentaro",
 "Update to {appversion}" => "Ĝisdatigi al {appversion}",
+"Uninstall App" => "Malinstali aplikaĵon",
 "Disable" => "Malkapabligi",
 "Enable" => "Kapabligi",
 "Please wait...." => "Bonvolu atendi...",
+"Error while disabling app" => "Eraris malkapabligo de aplikaĵo",
+"Error while enabling app" => "Eraris kapabligo de aplikaĵo",
 "Updating...." => "Ĝisdatigata...",
 "Error while updating app" => "Eraris ĝisdatigo de la aplikaĵo",
 "Error" => "Eraro",
 "Update" => "Ĝisdatigi",
 "Updated" => "Ĝisdatigita",
+"Uninstalling ...." => "Malinstalante...",
+"Error while uninstalling app" => "Eraris malinstalo de aplikaĵo",
+"Uninstall" => "Malinstali",
 "Select a profile picture" => "Elekti profilan bildon",
 "Very weak password" => "Tre malforta pasvorto",
 "Weak password" => "Malforta pasvorto",
@@ -46,16 +52,24 @@ $TRANSLATIONS = array(
 "Strong password" => "Forta pasvorto",
 "Delete encryption keys permanently." => "Forigi ĉifroklavojn por ĉiam.",
 "Restore encryption keys." => "Restaŭri ĉifroklavojn.",
+"deleted {groupName}" => "{groupName} foriĝis",
 "undo" => "malfari",
 "Groups" => "Grupoj",
 "Group Admin" => "Grupadministranto",
 "Delete" => "Forigi",
 "never" => "neniam",
+"deleted {userName}" => "{userName} foriĝis",
 "add group" => "aldoni grupon",
 "A valid username must be provided" => "Valida uzantonomo devas proviziĝi",
 "Error creating user" => "Eraris kreo de uzanto",
 "A valid password must be provided" => "Valida pasvorto devas proviziĝi",
+"Warning: Home directory for user \"{user}\" already exists" => "Averto: hejmdosierujo por la uzanto “{user”} jam ekzistas",
 "__language_name__" => "Esperanto",
+"Everything (fatal issues, errors, warnings, info, debug)" => "Ĉio (fatalaĵoj, eraroj, avertoj, informoj, sencimigaj mesaĝoj)",
+"Info, warnings, errors and fatal issues" => "Informoj, avertoj, eraroj kaj fatalaĵoj",
+"Warnings, errors and fatal issues" => "Avertoj, eraroj kaj fatalaĵoj",
+"Errors and fatal issues" => "Eraroj kaj fatalaĵoj",
+"Fatal issues only" => "Fatalaĵoj nur",
 "None" => "Nenio",
 "Login" => "Ensaluti",
 "SSL" => "SSL",
@@ -64,15 +78,18 @@ $TRANSLATIONS = array(
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita.",
 "Module 'fileinfo' missing" => "La modulo «fileinfo» mankas",
 "Locale not working" => "La lokaĵaro ne funkcias",
+"Internet connection not working" => "La Interreto-konekto ne funkcias",
 "Cron" => "Cron",
 "Sharing" => "Kunhavigo",
 "Allow apps to use the Share API" => "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo",
 "Allow public uploads" => "Permesi publikajn alŝutojn",
+"Expire after " => "Eksvalidigi post",
 "days" => "tagoj",
 "Allow resharing" => "Kapabligi rekunhavigon",
 "Security" => "Sekuro",
 "Email Server" => "Retpoŝtoservilo",
 "From address" => "El adreso",
+"mail" => "retpoŝto",
 "Authentication required" => "Aŭtentiĝo nepras",
 "Server address" => "Servila adreso",
 "Port" => "Pordo",
@@ -93,6 +110,7 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com",
 "See application website" => "Vidi la TTT-ejon de la aplikaĵo",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>",
+"Enable only for specific groups" => "Kapabligi nur por specifajn grupojn",
 "All" => "Ĉio",
 "Administrator Documentation" => "Dokumentaro por administrantoj",
 "Online Documentation" => "Reta dokumentaro",
@@ -114,6 +132,7 @@ $TRANSLATIONS = array(
 "Upload new" => "Alŝuti novan",
 "Select new from Files" => "Elekti novan el dosieroj",
 "Remove image" => "Forigi bildon",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Aŭ PNG aŭ JPG. Prefere ĝi kvadratu, sed vi povos stuci ĝin.",
 "Cancel" => "Nuligi",
 "Choose as profile image" => "Elekti kiel profilan bildon",
 "Language" => "Lingvo",
@@ -125,12 +144,17 @@ $TRANSLATIONS = array(
 "Delete Encryption Keys" => "Forigi ĉifroklavojn",
 "Login Name" => "Ensaluti",
 "Create" => "Krei",
+"Search Users and Groups" => "Serĉi uzantojn kaj grupojn",
+"Add Group" => "Aldoni grupon",
 "Group" => "Grupo",
+"Everyone" => "Ĉiuj",
+"Admins" => "Administrantoj",
 "Default Quota" => "Defaŭlta kvoto",
 "Unlimited" => "Senlima",
 "Other" => "Alia",
 "Username" => "Uzantonomo",
 "Quota" => "Kvoto",
+"Last Login" => "Lasta ensaluto",
 "change full name" => "ŝanĝi plenan nomon",
 "set new password" => "agordi novan pasvorton",
 "Default" => "Defaŭlta"
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 2307b2133b3..c93c40f5b41 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -21,6 +21,7 @@ $TRANSLATIONS = array(
 "Couldn't decrypt your files, check your password and try again" => "Ezin izan dira deskodetu zure fitxategiak, egiaztatu zure pasahitza eta saiatu berriz",
 "Encryption keys deleted permanently" => "Enkriptatze gakoak behin betiko ezabatuak",
 "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Ezin izan dira zure enkriptatze gakoak behin betiko ezabatu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
+"Couldn't remove app." => "Ezin izan da aplikazioa ezabatu..",
 "Email saved" => "Eposta gorde da",
 "Invalid email" => "Baliogabeko eposta",
 "Unable to delete group" => "Ezin izan da taldea ezabatu",
@@ -43,6 +44,7 @@ $TRANSLATIONS = array(
 "User Documentation" => "Erabiltzaile dokumentazioa",
 "Admin Documentation" => "Administrazio dokumentazioa",
 "Update to {appversion}" => "Eguneratu {appversion}-ra",
+"Uninstall App" => "Desinstalatu aplikazioa",
 "Disable" => "Ez-gaitu",
 "Enable" => "Gaitu",
 "Please wait...." => "Itxoin mesedez...",
@@ -53,6 +55,9 @@ $TRANSLATIONS = array(
 "Error" => "Errorea",
 "Update" => "Eguneratu",
 "Updated" => "Eguneratuta",
+"Uninstalling ...." => "Desinstalatzen ...",
+"Error while uninstalling app" => "Erroea izan da aplikazioa desinstalatzerakoan",
+"Uninstall" => "Desinstalatu",
 "Select a profile picture" => "Profilaren irudia aukeratu",
 "Very weak password" => "Pasahitz oso ahula",
 "Weak password" => "Pasahitz ahula",
@@ -62,13 +67,16 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Fitxategiak deskodetzen... Itxaron, bere denbora eskatzen du.",
 "Delete encryption keys permanently." => "Ezabatu enkriptatze gakoak behin betiko",
 "Restore encryption keys." => "Leheneratu enkriptatze gakoak",
+"Unable to delete {objName}" => "Ezin izan da {objName} ezabatu",
 "Error creating group" => "Errore bat izan da taldea sortzean",
 "A valid group name must be provided" => "Baliozko talde izena eman behar da",
+"deleted {groupName}" => "{groupName} ezbatuta",
 "undo" => "desegin",
 "Groups" => "Taldeak",
 "Group Admin" => "Talde administradorea",
 "Delete" => "Ezabatu",
 "never" => "inoiz",
+"deleted {userName}" => "{userName} ezabatuta",
 "add group" => "gehitu taldea",
 "A valid username must be provided" => "Baliozko erabiltzaile izena eman behar da",
 "Error creating user" => "Errore bat egon da erabiltzailea sortzean",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 4d8eda5c869..83ac9f4ccd6 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -21,6 +21,7 @@ $TRANSLATIONS = array(
 "Couldn't decrypt your files, check your password and try again" => "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et essayez à nouveau",
 "Encryption keys deleted permanently" => "Clés de chiffrement définitivement supprimées.",
 "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Impossible de supprimer définitivement vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
+"Couldn't remove app." => "Impossible de supprimer l'application.",
 "Email saved" => "E-mail sauvegardé",
 "Invalid email" => "E-mail invalide",
 "Unable to delete group" => "Impossible de supprimer le groupe",
@@ -43,6 +44,7 @@ $TRANSLATIONS = array(
 "User Documentation" => "Documentation utilisateur",
 "Admin Documentation" => "Documentation administrateur",
 "Update to {appversion}" => "Mettre à jour vers {appversion}",
+"Uninstall App" => "Désinstaller l'application",
 "Disable" => "Désactiver",
 "Enable" => "Activer",
 "Please wait...." => "Veuillez patienter…",
@@ -53,6 +55,9 @@ $TRANSLATIONS = array(
 "Error" => "Erreur",
 "Update" => "Mettre à jour",
 "Updated" => "Mise à jour effectuée avec succès",
+"Uninstalling ...." => "Désintallation...",
+"Error while uninstalling app" => "Erreur lors de la désinstallation de l'application",
+"Uninstall" => "Désinstaller",
 "Select a profile picture" => "Selectionner une photo de profil ",
 "Very weak password" => "Mot de passe de très faible sécurité",
 "Weak password" => "Mot de passe de faible sécurité",
@@ -62,13 +67,16 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Déchiffrement en cours... Cela peut prendre un certain temps.",
 "Delete encryption keys permanently." => "Supprimer définitivement les clés de chiffrement",
 "Restore encryption keys." => "Restaurer les clés de chiffrement",
+"Unable to delete {objName}" => "Impossible de supprimer {objName}",
 "Error creating group" => "Erreur lors de la création du groupe",
 "A valid group name must be provided" => "Vous devez spécifier un nom de groupe valide",
+"deleted {groupName}" => "{groupName} supprimé",
 "undo" => "annuler",
 "Groups" => "Groupes",
 "Group Admin" => "Admin Groupe",
 "Delete" => "Supprimer",
 "never" => "jamais",
+"deleted {userName}" => "{userName} supprimé",
 "add group" => "ajouter un groupe",
 "A valid username must be provided" => "Un nom d'utilisateur valide doit être saisi",
 "Error creating user" => "Erreur lors de la création de l'utilisateur",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 094f8fb3a57..9388658d6c1 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,8 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "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 e-mail. Please revisit your settings." => "Terjadi masalah saat mengirim email. Mohon tinjau ulang 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.",
+"Send mode" => "Modus kirim",
 "Encryption" => "Enkripsi",
+"Authentication method" => "Metode otentikasi",
 "Unable to load list from App Store" => "Tidak dapat memuat daftar dari App Store",
 "Authentication error" => "Galat saat autentikasi",
 "Your full name has been changed." => "Nama lengkap Anda telah diubah",
@@ -24,7 +30,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Sandi pemulihan admin salah. Periksa sandi dan ulangi kembali.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengguna berhasil diperbarui.",
 "Unable to change password" => "Tidak dapat mengubah sandi",
+"Sending..." => "Mengirim",
 "User Documentation" => "Dokumentasi Pengguna",
+"Admin Documentation" => "Dokumentasi Admin",
 "Update to {appversion}" => "Perbarui ke {appversion}",
 "Disable" => "Nonaktifkan",
 "Enable" => "Aktifkan",
@@ -61,6 +69,10 @@ $TRANSLATIONS = array(
 "Fatal issues only" => "Hanya masalah fatal",
 "None" => "Tidak ada",
 "Login" => "Masuk",
+"Plain" => "Biasa",
+"NT LAN Manager" => "Manajer NT LAN",
+"SSL" => "SSL",
+"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.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Direktori data dan berkas Anda mungkin dapat diakses dari internet. Berkas .htaccess tidak bekerja. Kami sangat menyarankan untuk mengkonfigurasi server web Anda agar direktori data tidak lagi dapat diakses atau Anda dapat memindahkan direktori data di luar dokumen root webserver.",
@@ -77,6 +89,7 @@ $TRANSLATIONS = array(
 "We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Kami sangat menyarankan untuk menginstal paket yang dibutuhkan pada sistem agar mendukung salah satu bahasa berikut: %s.",
 "Internet connection not working" => "Koneksi internet tidak berfungsi",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Cron terakhir dieksekusi pada %s.",
 "Execute one task with each page loaded" => "Jalankan tugas setiap kali halaman dimuat",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php didaftarkan pada layanan webcron untuk memanggil cron.php setiap 15 menit melalui http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Menggunakan sistem layanan cron untuk memanggil berkas cron.php setiap 15 menit.",
@@ -88,8 +101,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Selalu Gunakan HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Memaksa klien untuk menghubungkan ke %s menggunakan sambungan yang dienskripsi.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Mohon sambungkan ke %s menggunakan HTTPS untuk mengaktifkannya atau menonaktifkan penegakan SSL.",
+"Email Server" => "Server Email",
+"This is used for sending out notifications." => "Ini digunakan untuk mengirim notifikasi keluar.",
+"From address" => "Dari alamat",
+"Authentication required" => "Diperlukan otentikasi",
 "Server address" => "Alamat server",
 "Port" => "port",
+"Credentials" => "Kredensial",
+"SMTP Username" => "Nama pengguna SMTP",
+"SMTP Password" => "Sandi SMTP",
+"Test email settings" => "Pengaturan email percobaan",
+"Send email" => "Kirim email",
 "Log" => "Catat",
 "Log level" => "Level pencatatan",
 "More" => "Lainnya",
@@ -99,7 +121,9 @@ $TRANSLATIONS = array(
 "Add your App" => "Tambahkan Aplikasi Anda",
 "More Apps" => "Aplikasi Lainnya",
 "Select an App" => "Pilih Aplikasi",
+"Documentation:" => "Dokumentasi:",
 "See application page at apps.owncloud.com" => "Lihat halaman aplikasi di apps.owncloud.com",
+"See application website" => "Kunjungi situs web aplikasi",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-dilisensikan oleh <span class=\"author\"></span>",
 "All" => "Semua",
 "Administrator Documentation" => "Dokumentasi Administrator",
@@ -119,6 +143,7 @@ $TRANSLATIONS = array(
 "Full Name" => "Nama Lengkap",
 "Email" => "Email",
 "Your email address" => "Alamat email Anda",
+"Fill in an email address to enable password recovery and receive notifications" => "Isikan alamat email untuk mengaktifkan pemulihan sandi dan menerima notifikasi",
 "Profile picture" => "Foto profil",
 "Upload new" => "Unggah baru",
 "Select new from Files" => "Pilih baru dari Berkas",
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
index 7c55e4da429..6fa25a32cad 100644
--- a/settings/l10n/ja.php
+++ b/settings/l10n/ja.php
@@ -207,15 +207,15 @@ $TRANSLATIONS = array(
 "Search Users and Groups" => "ユーザーとグループを検索",
 "Add Group" => "グループを追加",
 "Group" => "グループ",
-"Everyone" => "全ての人",
+"Everyone" => "すべてのユーザー",
 "Admins" => "管理者",
 "Default Quota" => "デフォルトのクォータサイズ",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "ストレージの割り当てを入力してください (例: \"512MB\" や \"12 GB\")",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "ストレージのクォータを入力してください (例: \"512MB\" や \"12 GB\")",
 "Unlimited" => "無制限",
 "Other" => "その他",
-"Username" => "ユーザー名",
+"Username" => "ユーザーID",
 "Quota" => "クオータ",
-"Storage Location" => "ストレージの場所",
+"Storage Location" => "データの保存場所",
 "Last Login" => "最終ログイン",
 "change full name" => "名前を変更",
 "set new password" => "新しいパスワードを設定",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 2c2347fba4e..68c5bc28743 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -108,7 +108,7 @@ $TRANSLATIONS = array(
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.",
 "Your PHP version is outdated" => "Din PHP-versjon er udatert",
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "PHP-versjonen din er utdatert. Vi anbefaler på det sterkeste at du oppdaterer til 5.3.8 eller nyere fordi eldre versjoner ikke vil virke. Det er mulig at denne installasjoner ikke fungerer korrekt.",
-"Locale not working" => "Språk virker ikke",
+"Locale not working" => "Nasjonale innstillinger virker ikke",
 "System locale can not be set to a one which supports UTF-8." => "Kan ikke sette systemets nasjonale innstillinger til en som støtter UTF-8.",
 "This means that there might be problems with certain characters in file names." => "Dette betyr at det kan forekomme problemer med visse tegn i filnavn.",
 "We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Vi anbefaler på det sterkeste å installere pakkene som er nødvendig for at systemet skal støtte en av følgende nasjonale innstillinger: %s.",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 506ddf4fac4..a5d3f4c45fb 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -21,6 +21,7 @@ $TRANSLATIONS = array(
 "Couldn't decrypt your files, check your password and try again" => "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw",
 "Encryption keys deleted permanently" => "Cryptosleutels permanent verwijderd",
 "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Kom uw cryptosleutels niet permanent verwijderen. Controleer uw owncloud.log, of neem contact op met uw beheerder.",
+"Couldn't remove app." => "Kon app niet verwijderen.",
 "Email saved" => "E-mail bewaard",
 "Invalid email" => "Ongeldige e-mail",
 "Unable to delete group" => "Niet in staat om groep te verwijderen",
@@ -43,6 +44,7 @@ $TRANSLATIONS = array(
 "User Documentation" => "Gebruikersdocumentatie",
 "Admin Documentation" => "Beheerdocumentatie",
 "Update to {appversion}" => "Bijwerken naar {appversion}",
+"Uninstall App" => "De-installeren app",
 "Disable" => "Uitschakelen",
 "Enable" => "Activeer",
 "Please wait...." => "Even geduld aub....",
@@ -53,6 +55,9 @@ $TRANSLATIONS = array(
 "Error" => "Fout",
 "Update" => "Bijwerken",
 "Updated" => "Bijgewerkt",
+"Uninstalling ...." => "De-installeren ...",
+"Error while uninstalling app" => "Fout bij de-installeren app",
+"Uninstall" => "De-installeren",
 "Select a profile picture" => "Kies een profielafbeelding",
 "Very weak password" => "Zeer zwak wachtwoord",
 "Weak password" => "Zwak wachtwoord",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 3d0dc63f854..31b0fa3bc9e 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -21,6 +21,7 @@ $TRANSLATIONS = array(
 "Couldn't decrypt your files, check your password and try again" => "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbuj ponownie",
 "Encryption keys deleted permanently" => "Klucze szyfrujące zostały trwale usunięte",
 "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nie można trwale usunąć Twoich kluczy szyfrujących, proszę sprawdź owncloud.log lub zapytaj administratora",
+"Couldn't remove app." => "Nie można usunąć aplikacji.",
 "Email saved" => "E-mail zapisany",
 "Invalid email" => "Nieprawidłowy e-mail",
 "Unable to delete group" => "Nie można usunąć grupy",
@@ -43,6 +44,7 @@ $TRANSLATIONS = array(
 "User Documentation" => "Dokumentacja użytkownika",
 "Admin Documentation" => "Dokumentacja Administratora",
 "Update to {appversion}" => "Aktualizacja do {appversion}",
+"Uninstall App" => "Odinstaluj aplikację",
 "Disable" => "Wyłącz",
 "Enable" => "Włącz",
 "Please wait...." => "Proszę czekać...",
@@ -53,6 +55,9 @@ $TRANSLATIONS = array(
 "Error" => "Błąd",
 "Update" => "Aktualizuj",
 "Updated" => "Zaktualizowano",
+"Uninstalling ...." => "Odinstalowywanie....",
+"Error while uninstalling app" => "Błąd przy odinstalowywaniu aplikacji",
+"Uninstall" => "Odinstaluj",
 "Select a profile picture" => "Wybierz zdjęcie profilu",
 "Very weak password" => "Bardzo słabe hasło",
 "Weak password" => "Słabe hasło",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 3be9462fd0b..ab40b3bf4be 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -19,11 +19,15 @@ $TRANSLATIONS = array(
 "Files decrypted successfully" => "Дешифрование файлов прошло успешно",
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Ошибка при дешифровании файлов. Обратитесь к вашему системному администратору. Доп информация в owncloud.log",
 "Couldn't decrypt your files, check your password and try again" => "Ошибка при дешифровании файлов. Проверьте Ваш пароль и повторите попытку",
+"Encryption keys deleted permanently" => "Ключи шифрования перманентно удалены",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Не получается удалить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору",
+"Couldn't remove app." => "Невозможно удалить приложение.",
 "Email saved" => "Email сохранен",
 "Invalid email" => "Неправильный Email",
 "Unable to delete group" => "Невозможно удалить группу",
 "Unable to delete user" => "Невозможно удалить пользователя",
 "Backups restored successfully" => "Резервная копия успешно восстановлена",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Не получается восстановить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору.",
 "Language changed" => "Язык изменён",
 "Invalid request" => "Неправильный запрос",
 "Admins can't remove themself from the admin group" => "Администратор не может удалить сам себя из группы admin",
@@ -40,6 +44,7 @@ $TRANSLATIONS = array(
 "User Documentation" => "Пользовательская документация",
 "Admin Documentation" => "Документация администратора",
 "Update to {appversion}" => "Обновить до {версия приложения}",
+"Uninstall App" => "Удалить приложение",
 "Disable" => "Выключить",
 "Enable" => "Включить",
 "Please wait...." => "Подождите...",
@@ -50,20 +55,28 @@ $TRANSLATIONS = array(
 "Error" => "Ошибка",
 "Update" => "Обновить",
 "Updated" => "Обновлено",
-"Select a profile picture" => "Выберите картинку профиля",
+"Uninstalling ...." => "Удаление ...",
+"Error while uninstalling app" => "Ошибка при удалении приложения.",
+"Uninstall" => "Удалить",
+"Select a profile picture" => "Выберите аватар",
 "Very weak password" => "Очень слабый пароль",
 "Weak password" => "Слабый пароль",
 "So-so password" => "Так себе пароль",
 "Good password" => "Хороший пароль",
 "Strong password" => "Устойчивый к взлому пароль",
 "Decrypting files... Please wait, this can take some time." => "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
+"Delete encryption keys permanently." => "Перманентно удалить ключи шифрования. ",
+"Restore encryption keys." => "Восстановить ключи шифрования.",
 "Unable to delete {objName}" => "Невозможно удалить {objName}",
 "Error creating group" => "Ошибка создания группы",
+"A valid group name must be provided" => "Введите правильное имя группы",
+"deleted {groupName}" => "удалено {groupName}",
 "undo" => "отмена",
 "Groups" => "Группы",
 "Group Admin" => "Администратор группы",
 "Delete" => "Удалить",
 "never" => "никогда",
+"deleted {userName}" => "удалён {userName}",
 "add group" => "добавить группу",
 "A valid username must be provided" => "Укажите правильное имя пользователя",
 "Error creating user" => "Ошибка создания пользователя",
@@ -77,6 +90,7 @@ $TRANSLATIONS = array(
 "Fatal issues only" => "Только критические проблемы",
 "None" => "Нет новостей",
 "Login" => "Логин",
+"Plain" => "Простой",
 "SSL" => "SSL",
 "TLS" => "TLS",
 "Security Warning" => "Предупреждение безопасности",
@@ -85,6 +99,9 @@ $TRANSLATIONS = array(
 "Setup Warning" => "Предупреждение установки",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Веб-сервер до сих пор не настроен для возможности синхронизации файлов. Похоже что проблема в неисправности интерфейса WebDAV.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
+"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator.",
+"Database Performance Info" => "Информация о производительности Базы Данных",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "В качестве Базы Данных используется SQLite. Для больших установок рекомендуется использовать другие типы Баз Данных. Чтобы переехать на другую Базу Данных используйте инструмент командной строки: 'ooc: db:conver-type'",
 "Module 'fileinfo' missing" => "Модуль 'fileinfo' отсутствует",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-модуль 'fileinfo' отсутствует. Мы настоятельно рекомендуем включить этот модуль для улучшения определения типов (mime-type) файлов.",
 "Your PHP version is outdated" => "Ваша версия PHP устарела",
@@ -96,14 +113,24 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Интернет-соединение не работает",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Этот сервер не имеет подключения к сети интернет. Это значит, что некоторые возможности, такие как подключение внешних дисков, уведомления об обновлениях или установка сторонних приложений – не работают. Удалённый доступ к файлам и отправка уведомлений по электронной почте вероятнее всего тоже не будут работать. Предлагаем включить соединение с интернетом для этого сервера, если Вы хотите иметь все возможности.",
 "Cron" => "Планировщик задач по расписанию",
+"Last cron was executed at %s." => "Последняя cron-задача была запущена: %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Последняя cron-задача была запущена: %s. Это было больше часа назад, кажется что-то не так.",
+"Cron was not executed yet!" => "Cron-задачи ещё не запускались!",
 "Execute one task with each page loaded" => "Выполнять одно задание с каждой загруженной страницей",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php зарегестрирован в webcron и будет вызываться каждые 15 минут по http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Использовать системный cron для вызова cron.php каждые 15 минут.",
 "Sharing" => "Общий доступ",
 "Allow apps to use the Share API" => "Позволить приложениям использовать API общего доступа",
+"Allow users to share via link" => "Разрешить пользователям публикации через ссылки",
 "Allow public uploads" => "Разрешить открытые загрузки",
+"Set default expiration date" => "Установите дату окончания по-умолчанию",
+"Expire after " => "Заканчивается после",
+"days" => "дней",
 "Allow resharing" => "Разрешить переоткрытие общего доступа",
+"Restrict users to only share with users in their groups" => "Разрешить пользователям публикации только внутри их групп",
 "Allow users to send mail notification for shared files" => "Разрешить пользователю оповещать почтой о расшаренных файлах",
+"Exclude groups from sharing" => "Исключить группы из общего доступа",
+"These groups will still be able to receive shares, but not to initiate them." => "Эти группы смогут получать общие файлы, но не смогут отправлять их.",
 "Security" => "Безопасность",
 "Enforce HTTPS" => "Принудить к HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Принудить клиентов подключаться к %s через шифрованное соединение.",
@@ -111,6 +138,7 @@ $TRANSLATIONS = array(
 "Email Server" => "Сервер почты",
 "This is used for sending out notifications." => "Используется для отправки уведомлений.",
 "From address" => "Адрес отправителя",
+"mail" => "почта",
 "Authentication required" => "Требуется аутентификация ",
 "Server address" => "Адрес сервера",
 "Port" => "Порт",
@@ -132,11 +160,12 @@ $TRANSLATIONS = array(
 "See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com",
 "See application website" => "См. сайт приложений",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>",
+"Enable only for specific groups" => "Включить только для этих групп",
 "All" => "Все",
 "Administrator Documentation" => "Документация администратора",
 "Online Documentation" => "Online документация",
 "Forum" => "Форум",
-"Bugtracker" => "Bugtracker",
+"Bugtracker" => "Багтрекер",
 "Commercial Support" => "Коммерческая поддержка",
 "Get the apps to sync your files" => "Получить приложения для синхронизации ваших файлов",
 "Show First Run Wizard again" => "Показать помощник настройки",
@@ -150,23 +179,28 @@ $TRANSLATIONS = array(
 "Full Name" => "Полное имя",
 "Email" => "E-mail",
 "Your email address" => "Ваш адрес электронной почты",
-"Profile picture" => "Фото профиля",
-"Upload new" => "Загрузить новую",
+"Fill in an email address to enable password recovery and receive notifications" => "Введите свой email-адрес для того, чтобы включить возможность восстановления пароля и получения уведомлений",
+"Profile picture" => "Аватар",
+"Upload new" => "Загрузить новый",
 "Select new from Files" => "Выберите новый из файлов",
-"Remove image" => "Удалить изображение",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Либо png, либо jpg. Изображение должно быть квадратным, но вы сможете обрезать его позже.",
+"Remove image" => "Удалить аватар",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Допустимые форматы: png и jpg. Если изображение не квадратное, то вам будет предложено обрезать его.",
 "Your avatar is provided by your original account." => "Будет использован аватар вашей оригинальной учетной записи.",
 "Cancel" => "Отменить",
-"Choose as profile image" => "Выберите изображение профиля",
+"Choose as profile image" => "Установить как аватар",
 "Language" => "Язык",
 "Help translate" => "Помочь с переводом",
 "The encryption app is no longer enabled, please decrypt all your files" => "Приложение для шифрования выключено, пожалуйста, расшифруйте ваши файлы",
 "Log-in password" => "Пароль входа",
 "Decrypt all Files" => "Снять шифрование со всех файлов",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Ваши ключи шифрования были архивированы. Если что-то пойдёт не так, вы сможете восстановить ключи. Удаляйте ключи из архива только тогда, когда вы будете уверены, что все файлы были успешно расшифрованы.",
+"Restore Encryption Keys" => "Восстановить Ключи Шифрования",
+"Delete Encryption Keys" => "Удалить Ключи Шифрования",
 "Login Name" => "Имя пользователя",
 "Create" => "Создать",
 "Admin Recovery Password" => "Восстановление пароля администратора",
 "Enter the recovery password in order to recover the users files during password change" => "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
+"Search Users and Groups" => "Искать пользователей и групп",
 "Add Group" => "Добавить группу",
 "Group" => "Группа",
 "Everyone" => "Все",
@@ -177,6 +211,8 @@ $TRANSLATIONS = array(
 "Other" => "Другое",
 "Username" => "Имя пользователя",
 "Quota" => "Квота",
+"Storage Location" => "Место хранилища",
+"Last Login" => "Последний вход",
 "change full name" => "изменить полное имя",
 "set new password" => "установить новый пароль",
 "Default" => "По умолчанию"
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index f0ac6eea30b..9383e565fd6 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -48,6 +48,7 @@ $TRANSLATIONS = array(
 "Error" => "Napaka",
 "Update" => "Posodobi",
 "Updated" => "Posodobljeno",
+"Uninstall" => "Odstrani namestitev",
 "Select a profile picture" => "Izbor slike profila",
 "Very weak password" => "Zelo šibko geslo",
 "Weak password" => "Šibko geslo",
@@ -166,7 +167,10 @@ $TRANSLATIONS = array(
 "Create" => "Ustvari",
 "Admin Recovery Password" => "Obnovitev skrbniškega gesla",
 "Enter the recovery password in order to recover the users files during password change" => "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
+"Add Group" => "Dodaj skupino",
 "Group" => "Skupina",
+"Everyone" => "Vsi",
+"Admins" => "Skrbniki",
 "Default Quota" => "Privzeta količinska omejitev",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Vnesite količinsko omejitev prostora (na primer: \"512 MB\" ali \"12 GB\")",
 "Unlimited" => "Neomejeno",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 1b8c81d5d70..3cf0ec79508 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -21,6 +21,7 @@ $TRANSLATIONS = array(
 "Couldn't decrypt your files, check your password and try again" => "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen",
 "Encryption keys deleted permanently" => "Krypteringsnycklar raderades permanent",
 "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Det gick inte att permanent ta bort dina krypteringsnycklar, kontrollera din owncloud.log eller fråga din administratör",
+"Couldn't remove app." => "Kunde inte ta bort applikationen.",
 "Email saved" => "E-post sparad",
 "Invalid email" => "Ogiltig e-post",
 "Unable to delete group" => "Kan inte radera grupp",
@@ -43,6 +44,7 @@ $TRANSLATIONS = array(
 "User Documentation" => "Användardokumentation",
 "Admin Documentation" => "Administratörsdokumentation",
 "Update to {appversion}" => "Uppdatera till {appversion}",
+"Uninstall App" => "Avinstallera Applikation",
 "Disable" => "Deaktivera",
 "Enable" => "Aktivera",
 "Please wait...." => "Var god vänta...",
@@ -53,6 +55,9 @@ $TRANSLATIONS = array(
 "Error" => "Fel",
 "Update" => "Uppdatera",
 "Updated" => "Uppdaterad",
+"Uninstalling ...." => "Avinstallerar ....",
+"Error while uninstalling app" => "Ett fel inträffade när applikatonen avinstallerades",
+"Uninstall" => "Avinstallera",
 "Select a profile picture" => "Välj en profilbild",
 "Very weak password" => "Väldigt svagt lösenord",
 "Weak password" => "Svagt lösenord",
@@ -62,13 +67,16 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Dekrypterar filer... Vänligen vänta, detta kan ta en stund.",
 "Delete encryption keys permanently." => "Radera krypteringsnycklar permanent",
 "Restore encryption keys." => "Återställ krypteringsnycklar",
+"Unable to delete {objName}" => "Kunde inte radera {objName}",
 "Error creating group" => "Fel vid skapande av grupp",
 "A valid group name must be provided" => "Ett giltigt gruppnamn måste anges",
+"deleted {groupName}" => "raderade {groupName} ",
 "undo" => "ångra",
 "Groups" => "Grupper",
 "Group Admin" => "Gruppadministratör",
 "Delete" => "Radera",
 "never" => "aldrig",
+"deleted {userName}" => "raderade {userName}",
 "add group" => "lägg till grupp",
 "A valid username must be provided" => "Ett giltigt användarnamn måste anges",
 "Error creating user" => "Fel vid skapande av användare",
@@ -92,6 +100,7 @@ $TRANSLATIONS = array(
 "Setup Warning" => "Installationsvarning",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Vänligen dubbelkolla igenom <a href=\"%s\">installationsguiden</a>.",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite används som databas. För större installationer rekommenderar vi att ändra på detta. För att migrera till en annan databas, använd kommandoverktyget: 'occ db:convert-type'",
 "Module 'fileinfo' missing" => "Modulen \"fileinfo\" saknas",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ.",
 "Your PHP version is outdated" => "Din PHP version är föråldrad",
@@ -111,6 +120,7 @@ $TRANSLATIONS = array(
 "Use systems cron service to call the cron.php file every 15 minutes." => "Använd systemets cron service att ropa på cron.php filen varje 15 minuter.",
 "Sharing" => "Dela",
 "Allow apps to use the Share API" => "Tillåt applikationer att använda delat API",
+"Allow users to share via link" => "Tillåt användare att dela via länk",
 "Enforce password protection" => "Tillämpa lösenordskydd",
 "Allow public uploads" => "Tillåt offentlig uppladdning",
 "Set default expiration date" => "Ställ in standardutgångsdatum",
@@ -118,6 +128,7 @@ $TRANSLATIONS = array(
 "days" => "dagar",
 "Enforce expiration date" => "Tillämpa förfallodatum",
 "Allow resharing" => "Tillåt vidaredelning",
+"Restrict users to only share with users in their groups" => "Begränsa användare till att enbart kunna dela med användare i deras grupper",
 "Allow users to send mail notification for shared files" => "Tillåt användare att skicka mailnotifieringar för delade filer",
 "Exclude groups from sharing" => "Exkludera grupp från att dela",
 "These groups will still be able to receive shares, but not to initiate them." => "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar.",
@@ -135,7 +146,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Inloggningsuppgifter",
 "SMTP Username" => "SMTP användarnamn",
 "SMTP Password" => "SMTP lösenord",
-"Test email settings" => "Testa e-post inställninggar",
+"Test email settings" => "Testa e-post inställningar",
 "Send email" => "Skicka e-post",
 "Log" => "Logg",
 "Log level" => "Nivå på loggning",
@@ -201,6 +212,7 @@ $TRANSLATIONS = array(
 "Other" => "Annat",
 "Username" => "Användarnamn",
 "Quota" => "Kvot",
+"Storage Location" => "Lagringsplats",
 "Last Login" => "Senaste inloggning",
 "change full name" => "ändra hela namnet",
 "set new password" => "ange nytt lösenord",
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index 593c202f2c9..28f2236b1d7 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -19,7 +19,9 @@
 			</span>
 		</a>
 		<span class="utils">
-			<span class="usercount"></span>
+			<span class="usercount">
+				<?php p($_["usercount"]); ?>
+			</span>
 		</span>
 	</li>
 
diff --git a/settings/users.php b/settings/users.php
index 8f72fc9d5c8..29a63a4496a 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -81,6 +81,7 @@ $tmpl->assign( 'groups', $groups );
 $tmpl->assign( 'adminGroup', $adminGroup );
 $tmpl->assign( 'isAdmin', (int) $isAdmin);
 $tmpl->assign( 'subadmins', $subadmins);
+$tmpl->assign('usercount', count($users));
 $tmpl->assign( 'numofgroups', count($groups) + count($adminGroup));
 $tmpl->assign( 'quota_preset', $quotaPreset);
 $tmpl->assign( 'default_quota', $defaultQuota);