Merge branch 'master' into split_personal-user_passwordchange

20 files changed, 239 insertions, 23 deletions

diff --git a/settings/admin.php b/settings/admin.php
index 869729a9e41..dd36790907d 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -15,7 +15,7 @@ OC_App::setActiveNavigationEntry( "admin" );
 
 $tmpl = new OC_Template( 'settings', 'admin', 'user');
 $forms=OC_App::getForms('admin');
-$htaccessworking=OC_Util::ishtaccessworking();
+$htaccessworking=OC_Util::isHtAccessWorking();
 
 $entries=OC_Log_Owncloud::getEntries(3);
 $entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 3;
@@ -25,7 +25,7 @@ $tmpl->assign('entries', $entries);
 $tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking', $htaccessworking);
 $tmpl->assign('internetconnectionworking', OC_Util::isInternetConnectionEnabled() ? OC_Util::isInternetConnectionWorking() : false);
-$tmpl->assign('islocaleworking', OC_Util::issetlocaleworking());
+$tmpl->assign('islocaleworking', OC_Util::isSetLocaleWorking());
 $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
 $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
 $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 1ae45932172..54810776d2b 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -169,7 +169,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 				var navEntries=response.nav_entries;
 				for(var i=0; i< navEntries.length; i++){
 					var entry = navEntries[i];
-					var container = $('#apps');
+					var container = $('#apps .wrapper');
 
 					if(container.children('li[data-id="'+entry.id+'"]').length === 0){
 						var li=$('<li></li>');
@@ -181,10 +181,10 @@ OC.Settings.Apps = OC.Settings.Apps || {
 						a.prepend(filename);
 						a.prepend(img);
 						li.append(a);
-						// prepend the new app before the 'More apps' function
-						$('#apps-management').before(li);
+						// append the new app as last item in the list (.push is from sticky footer)
+						$('#apps .wrapper .push').before(li);
 						// scroll the app navigation down so the newly added app is seen
-						$('#navigation').animate({ scrollTop: $('#apps').height() }, 'slow');
+						$('#navigation').animate({ scrollTop: $('#navigation').height() }, 'slow');
 						// draw attention to the newly added app entry by flashing it twice
 						container.children('li[data-id="'+entry.id+'"]').animate({opacity:.3}).animate({opacity:1}).animate({opacity:.3}).animate({opacity:1});
 
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 8cf4754f793..e4284c2e8c6 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -97,7 +97,7 @@ $(document).ready(function(){
 	$("#languageinput").chosen();
 	// Show only the not selectable optgroup
 	// Choosen only shows optgroup-labels if there are options in the optgroup
-	$(".languagedivider").remove();
+	$(".languagedivider").hide();
 
 	$("#languageinput").change( function(){
 		// Serialize the data
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index a6288e471fd..09caacbb5ae 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -20,12 +20,14 @@ $TRANSLATIONS = array(
 "Disable" => "Zakázat",
 "Enable" => "Povolit",
 "Please wait...." => "Čekejte prosím...",
+"Error while disabling app" => "Chyba při zakazování aplikace",
+"Error while enabling app" => "Chyba při povolování aplikace",
 "Updating...." => "Aktualizuji...",
 "Error while updating app" => "Chyba při aktualizaci aplikace",
 "Error" => "Chyba",
 "Update" => "Aktualizovat",
 "Updated" => "Aktualizováno",
-"Decrypting files... Please wait, this can take some time." => "Probíhá odšifrování souborů... Prosíme počkejte, tato operace může trvat několik minut.",
+"Decrypting files... Please wait, this can take some time." => "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu.",
 "Saving..." => "Ukládám...",
 "deleted" => "smazáno",
 "undo" => "vrátit zpět",
@@ -103,8 +105,8 @@ $TRANSLATIONS = array(
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Použijte <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>",
 "Encryption" => "Šifrování",
-"The encryption app is no longer enabled, decrypt all your file" => "Šifrovací aplikace již není spuštěna, odšifrujte všechny své soubory",
-"Log-in password" => "Heslo",
+"The encryption app is no longer enabled, decrypt all your file" => "Šifrovací aplikace již není zapnuta, odšifrujte všechny své soubory",
+"Log-in password" => "Přihlašovací heslo",
 "Decrypt all Files" => "Odšifrovat všechny soubory",
 "Login Name" => "Přihlašovací jméno",
 "Create" => "Vytvořit",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 2c30e51017c..87e935a93c6 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
 "Please wait...." => "Bitte warten...",
+"Error while disabling app" => "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+"Error while enabling app" => "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
 "Updating...." => "Aktualisierung...",
 "Error while updating app" => "Fehler beim Aktualisieren der App",
 "Error" => "Fehler",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index c14e5a3606a..6998b51042b 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -20,8 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
 "Please wait...." => "Bitte warten....",
-"Error while disabling app" => "Beim deaktivieren der Applikation ist ein Fehler aufgetreten.",
-"Error while enabling app" => "Beim aktivieren der Applikation ist ein Fehler aufgetreten.",
+"Error while disabling app" => "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+"Error while enabling app" => "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
 "Updating...." => "Update...",
 "Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten",
 "Error" => "Fehler",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
new file mode 100644
index 00000000000..e1a00643908
--- /dev/null
+++ b/settings/l10n/en_GB.php
@@ -0,0 +1,124 @@
+<?php
+$TRANSLATIONS = array(
+"Unable to load list from App Store" => "Unable to load list from App Store",
+"Authentication error" => "Authentication error",
+"Your display name has been changed." => "Your display name has been changed.",
+"Unable to change display name" => "Unable to change display name",
+"Group already exists" => "Group already exists",
+"Unable to add group" => "Unable to add group",
+"Email saved" => "Email saved",
+"Invalid email" => "Invalid email",
+"Unable to delete group" => "Unable to delete group",
+"Unable to delete user" => "Unable to delete user",
+"Language changed" => "Language changed",
+"Invalid request" => "Invalid request",
+"Admins can't remove themself from the admin group" => "Admins can't remove themselves from the admin group",
+"Unable to add user to group %s" => "Unable to add user to group %s",
+"Unable to remove user from group %s" => "Unable to remove user from group %s",
+"Couldn't update app." => "Couldn't update app.",
+"Update to {appversion}" => "Update to {appversion}",
+"Disable" => "Disable",
+"Enable" => "Enable",
+"Please wait...." => "Please wait....",
+"Error while disabling app" => "Error whilst disabling app",
+"Error while enabling app" => "Error whilst enabling app",
+"Updating...." => "Updating....",
+"Error while updating app" => "Error whilst updating app",
+"Error" => "Error",
+"Update" => "Update",
+"Updated" => "Updated",
+"Decrypting files... Please wait, this can take some time." => "Decrypting files... Please wait, this can take some time.",
+"Saving..." => "Saving...",
+"deleted" => "deleted",
+"undo" => "undo",
+"Unable to remove user" => "Unable to remove user",
+"Groups" => "Groups",
+"Group Admin" => "Group Admin",
+"Delete" => "Delete",
+"add group" => "add group",
+"A valid username must be provided" => "A valid username must be provided",
+"Error creating user" => "Error creating user",
+"A valid password must be provided" => "A valid password must be provided",
+"__language_name__" => "__language_name__",
+"Security Warning" => "Security Warning",
+"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." => "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.",
+"Setup Warning" => "Setup Warning",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Please double check the <a href=\"%s\">installation guides</a>.",
+"Module 'fileinfo' missing" => "Module 'fileinfo' missing",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection.",
+"Locale not working" => "Locale not working",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s.",
+"Internet connection not working" => "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." => "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" => "Cron",
+"Execute one task with each page loaded" => "Execute one task with each page loaded",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php is registered at a webcron service to call cron.php once a minute over http.",
+"Use systems cron service to call the cron.php file once a minute." => "Use systems cron service to call the cron.php file once a minute.",
+"Sharing" => "Sharing",
+"Enable Share API" => "Enable Share API",
+"Allow apps to use the Share API" => "Allow apps to use the Share API",
+"Allow links" => "Allow links",
+"Allow users to share items to the public with links" => "Allow users to share items to the public with links",
+"Allow public uploads" => "Allow public uploads",
+"Allow users to enable others to upload into their publicly shared folders" => "Allow users to enable others to upload into their publicly shared folders",
+"Allow resharing" => "Allow resharing",
+"Allow users to share items shared with them again" => "Allow users to share items shared with them again",
+"Allow users to share with anyone" => "Allow users to share with anyone",
+"Allow users to only share with users in their groups" => "Allow users to only share with users in their groups",
+"Security" => "Security",
+"Enforce HTTPS" => "Enforce HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Forces the clients to connect to %s via an encrypted connection.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Please connect to your %s via HTTPS to enable or disable the SSL enforcement.",
+"Log" => "Log",
+"Log level" => "Log level",
+"More" => "More",
+"Less" => "Less",
+"Version" => "Version",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Add your App" => "Add your App",
+"More Apps" => "More Apps",
+"Select an App" => "Select an App",
+"See application page at apps.owncloud.com" => "See application page at apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
+"User Documentation" => "User Documentation",
+"Administrator Documentation" => "Administrator Documentation",
+"Online Documentation" => "Online Documentation",
+"Forum" => "Forum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "Commercial Support",
+"Get the apps to sync your files" => "Get the apps to sync your files",
+"Show First Run Wizard again" => "Show First Run Wizard again",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "You have used <strong>%s</strong> of the available <strong>%s</strong>",
+"Password" => "Password",
+"Your password was changed" => "Your password was changed",
+"Unable to change your password" => "Unable to change your password",
+"Current password" => "Current password",
+"New password" => "New password",
+"Change password" => "Change password",
+"Display Name" => "Display Name",
+"Email" => "Email",
+"Your email address" => "Your email address",
+"Fill in an email address to enable password recovery" => "Fill in an email address to enable password recovery",
+"Language" => "Language",
+"Help translate" => "Help translate",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>",
+"Encryption" => "Encryption",
+"The encryption app is no longer enabled, decrypt all your file" => "The encryption app is no longer enabled, decrypt all your files",
+"Log-in password" => "Log-in password",
+"Decrypt all Files" => "Decrypt all Files",
+"Login Name" => "Login Name",
+"Create" => "Create",
+"Admin Recovery Password" => "Admin Recovery Password",
+"Enter the recovery password in order to recover the users files during password change" => "Enter the recovery password in order to recover the user's files during password change",
+"Default Storage" => "Default Storage",
+"Unlimited" => "Unlimited",
+"Other" => "Other",
+"Username" => "Username",
+"Storage" => "Storage",
+"change display name" => "change display name",
+"set new password" => "set new password",
+"Default" => "Default"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 4f3099b8c24..52610e1c4fe 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -2,7 +2,7 @@
 $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
 "Authentication error" => "Error de autenticación",
-"Your display name has been changed." => "Su nombre fue cambiado.",
+"Your display name has been changed." => "Su nombre de usuario ha sido cambiado.",
 "Unable to change display name" => "No se pudo cambiar el nombre de usuario",
 "Group already exists" => "El grupo ya existe",
 "Unable to add group" => "No se pudo añadir el grupo",
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Please wait...." => "Espere, por favor....",
+"Error while disabling app" => "Error mientras se desactivaba la aplicación",
+"Error while enabling app" => "Error mientras se activaba la aplicación",
 "Updating...." => "Actualizando....",
 "Error while updating app" => "Error mientras se actualizaba la aplicación",
 "Error" => "Error",
 "Update" => "Actualizar",
 "Updated" => "Actualizado",
+"Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
 "Saving..." => "Guardando...",
 "deleted" => "Eliminado",
 "undo" => "deshacer",
@@ -38,12 +41,12 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Se debe proporcionar una contraseña valida",
 "__language_name__" => "Castellano",
 "Security Warning" => "Advertencia de seguridad",
-"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." => "Su directorio de datos y sus archivos probablemente están accesibles desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
+"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." => "Probablemente se puede acceder a su directorio de datos y sus archivos desde Internet. El archivo .htaccess no está funcionando. Nosotros le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
 "Setup Warning" => "Advertencia de configuración",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
-"Module 'fileinfo' missing" => "Módulo 'fileinfo' perdido",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El modulo PHP 'fileinfo' no se encuentra. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección del mime-type",
+"Module 'fileinfo' missing" => "No se ha encontrado el módulo \"fileinfo\"",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección del mime-type",
 "Locale not working" => "La configuración regional no está funcionando",
 "System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "La configuración regional del sistema no se puede ajustar a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivo. Le recomendamos instalar los paquetes necesarios en el sistema para soportar % s.",
 "Internet connection not working" => "La conexion a internet no esta funcionando",
@@ -56,7 +59,7 @@ $TRANSLATIONS = array(
 "Enable Share API" => "Activar API de Compartición",
 "Allow apps to use the Share API" => "Permitir a las aplicaciones utilizar la API de Compartición",
 "Allow links" => "Permitir enlaces",
-"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos al público con enlaces",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos con el público mediante enlaces",
 "Allow public uploads" => "Permitir subidas públicas",
 "Allow users to enable others to upload into their publicly shared folders" => "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente",
 "Allow resharing" => "Permitir re-compartición",
@@ -76,8 +79,8 @@ $TRANSLATIONS = array(
 "Add your App" => "Añade tu aplicación",
 "More Apps" => "Más aplicaciones",
 "Select an App" => "Seleccionar una aplicación",
-"See application page at apps.owncloud.com" => "Echa un vistazo a la web de aplicaciones apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
+"See application page at apps.owncloud.com" => "Ver la página de aplicaciones en apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>",
 "User Documentation" => "Documentación de usuario",
 "Administrator Documentation" => "Documentación de adminstrador",
 "Online Documentation" => "Documentación en linea",
@@ -85,7 +88,7 @@ $TRANSLATIONS = array(
 "Bugtracker" => "Rastreador de fallos",
 "Commercial Support" => "Soporte comercial",
 "Get the apps to sync your files" => "Obtener las aplicaciones para sincronizar sus archivos",
-"Show First Run Wizard again" => "Mostrar asistente para iniciar otra vez",
+"Show First Run Wizard again" => "Mostrar asistente para iniciar de nuevo",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
 "Password" => "Contraseña",
 "Your password was changed" => "Su contraseña ha sido cambiada",
@@ -98,10 +101,13 @@ $TRANSLATIONS = array(
 "Your email address" => "Su dirección de correo",
 "Fill in an email address to enable password recovery" => "Escriba una dirección de correo electrónico para restablecer la contraseña",
 "Language" => "Idioma",
-"Help translate" => "Ayúdnos a traducir",
+"Help translate" => "Ayúdanos a traducir",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilice esta dirección para<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a través de WebDAV</a>",
 "Encryption" => "Cifrado",
+"The encryption app is no longer enabled, decrypt all your file" => "La aplicación de cifrado no está activada, descifre sus archivos",
+"Log-in password" => "Contraseña de acceso",
+"Decrypt all Files" => "Descifrar archivos",
 "Login Name" => "Nombre de usuario",
 "Create" => "Crear",
 "Admin Recovery Password" => "Recuperación de la contraseña de administración",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index f4f50e5949a..252692ea4c3 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Please wait...." => "Por favor, esperá....",
+"Error while disabling app" => "Se ha producido un error mientras se deshabilitaba la aplicación",
+"Error while enabling app" => "Se ha producido un error mientras se habilitaba la aplicación",
 "Updating...." => "Actualizando....",
 "Error while updating app" => "Error al actualizar App",
 "Error" => "Error",
 "Update" => "Actualizar",
 "Updated" => "Actualizado",
+"Decrypting files... Please wait, this can take some time." => "Desencriptando archivos... Por favor espere, esto puede tardar.",
 "Saving..." => "Guardando...",
 "deleted" => "borrado",
 "undo" => "deshacer",
@@ -38,14 +41,20 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Debe ingresar una contraseña válida",
 "__language_name__" => "Castellano (Argentina)",
 "Security Warning" => "Advertencia de seguridad",
+"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." => "El directorio de datos y tus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no funciona. Sugerimos fuertemente que configures tu servidor web de forma tal que el archivo de directorios no sea accesible o muevas el mismo fuera de la raíz de los documentos del servidor web.",
 "Setup Warning" => "Alerta de Configuración",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Por favor, cheque bien la <a href=\"%s\">guía de instalación</a>.",
 "Module 'fileinfo' missing" => "El módulo 'fileinfo' no existe",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El módulo PHP 'fileinfo' no existe. Es recomendable que actives este módulo para obtener mejores resultados con la detección mime-type",
 "Locale not working" => "\"Locale\" no está funcionando",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "No se pudo asignar la localización del sistema a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos. Recomendamos fuertemente instalar los paquetes de sistema requeridos para poder dar soporte a %s.",
 "Internet connection not working" => "La conexión a Internet no esta funcionando. ",
+"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." => "El servidor no posee una conexión a Internet activa. Esto significa que algunas características como el montaje de un almacenamiento externo, las notificaciones acerca de actualizaciones o la instalación de aplicaciones de terceros no funcionarán. El acceso a archivos de forma remota y el envío de correos con notificaciones es posible que tampoco funcionen. Sugerimos habilitar la conexión a Internet para este servidor si deseas tener todas estas características.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Ejecutá una tarea con cada pagina cargada.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php está registrado al servicio webcron para que sea llamado una vez por cada minuto sobre http.",
+"Use systems cron service to call the cron.php file once a minute." => "Usa el servicio cron del sistema para ejecutar al archivo cron.php por cada minuto.",
 "Sharing" => "Compartiendo",
 "Enable Share API" => "Habilitar Share API",
 "Allow apps to use the Share API" => "Permitir a las aplicaciones usar la Share API",
@@ -59,6 +68,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los de sus mismos grupos",
 "Security" => "Seguridad",
 "Enforce HTTPS" => "Forzar HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL",
 "Log" => "Log",
 "Log level" => "Nivel de Log",
 "More" => "Más",
@@ -94,6 +105,9 @@ $TRANSLATIONS = array(
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Usá esta dirección para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a tus archivos a través de WebDAV</a>",
 "Encryption" => "Encriptación",
+"The encryption app is no longer enabled, decrypt all your file" => "La aplicación de encriptación ya no está habilitada, desencriptando todos los archivos",
+"Log-in password" => "Clave de acceso",
+"Decrypt all Files" => "Desencriptar todos los archivos",
 "Login Name" => "Nombre de Usuario",
 "Create" => "Crear",
 "Admin Recovery Password" => "Recuperación de contraseña de administrador",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 536cac96568..d973ab30afd 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
 "Disable" => "Désactiver",
 "Enable" => "Activer",
 "Please wait...." => "Veuillez patienter…",
+"Error while disabling app" => "Erreur lors de la désactivation de l'application",
+"Error while enabling app" => "Erreur lors de l'activation de l'application",
 "Updating...." => "Mise à jour...",
 "Error while updating app" => "Erreur lors de la mise à jour de l'application",
 "Error" => "Erreur",
 "Update" => "Mettre à jour",
 "Updated" => "Mise à jour effectuée avec succès",
+"Decrypting files... Please wait, this can take some time." => "Déchiffrement en cours... Cela peut prendre un certain temps.",
 "Saving..." => "Enregistrement...",
 "deleted" => "supprimé",
 "undo" => "annuler",
@@ -38,25 +41,35 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Un mot de passe valide doit être saisi",
 "__language_name__" => "Français",
 "Security Warning" => "Avertissement de sécurité",
+"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." => "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou bien de le déplacer à l'extérieur de la racine du serveur web.",
 "Setup Warning" => "Avertissement, problème de configuration",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Veuillez consulter à nouveau les <a href=\"%s\">guides d'installation</a>.",
 "Module 'fileinfo' missing" => "Module 'fileinfo' manquant",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats pour la détection des types de fichiers.",
 "Locale not working" => "Localisation non fonctionnelle",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Le localisation du système n'a pu être configurée à %s. Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichiers. Il est fortement recommandé d'installer les paquets requis pour le support de %s.",
 "Internet connection not working" => "La connexion internet ne fonctionne pas",
+"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." => "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mails ne seront pas fonctionnels également. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Exécute une tâche à chaque chargement de page",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php est enregistré en tant que service webcron pour appeler cron.php une fois par minute via http.",
+"Use systems cron service to call the cron.php file once a minute." => "Utilise le service cron du système pour appeler cron.php une fois par minute.",
 "Sharing" => "Partage",
 "Enable Share API" => "Activer l'API de partage",
 "Allow apps to use the Share API" => "Autoriser les applications à utiliser l'API de partage",
 "Allow links" => "Autoriser les liens",
 "Allow users to share items to the public with links" => "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens",
+"Allow public uploads" => "Autoriser les téléversements publics",
+"Allow users to enable others to upload into their publicly shared folders" => "Permet d'autoriser les autres utilisateurs à téléverser dans le dossier partagé public de l'utilisateur",
 "Allow resharing" => "Autoriser le repartage",
 "Allow users to share items shared with them again" => "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux",
 "Allow users to share with anyone" => "Autoriser les utilisateurs à partager avec tout le monde",
 "Allow users to only share with users in their groups" => "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement",
 "Security" => "Sécurité",
 "Enforce HTTPS" => "Forcer HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Forcer les clients à se connecter à %s via une connexion chiffrée.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL.",
 "Log" => "Log",
 "Log level" => "Niveau de log",
 "More" => "Plus",
@@ -92,6 +105,9 @@ $TRANSLATIONS = array(
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilisez cette adresse pour <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">accéder à vos fichiers via WebDAV</a>",
 "Encryption" => "Chiffrement",
+"The encryption app is no longer enabled, decrypt all your file" => "L'application de chiffrement n'est plus activée, déchiffrez tous vos fichiers",
+"Log-in password" => "Mot de passe de connexion",
+"Decrypt all Files" => "Déchiffrer tous les fichiers",
 "Login Name" => "Nom de la connexion",
 "Create" => "Créer",
 "Admin Recovery Password" => "Récupération du mot de passe administrateur",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index fb51d793c69..b3e3dfec91b 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Please wait...." => "Agarde...",
+"Error while disabling app" => "Produciuse un erro ao desactivar o aplicativo",
+"Error while enabling app" => "Produciuse un erro ao activar o aplicativo",
 "Updating...." => "Actualizando...",
 "Error while updating app" => "Produciuse un erro mentres actualizaba o aplicativo",
 "Error" => "Erro",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 0fda1309395..29594a95dcf 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Disabilita",
 "Enable" => "Abilita",
 "Please wait...." => "Attendere...",
+"Error while disabling app" => "Errore durante la disattivazione",
+"Error while enabling app" => "Errore durante l'attivazione",
 "Updating...." => "Aggiornamento in corso...",
 "Error while updating app" => "Errore durante l'aggiornamento",
 "Error" => "Errore",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 8bbdc222e43..63e83cab4dd 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "無効",
 "Enable" => "有効化",
 "Please wait...." => "しばらくお待ちください。",
+"Error while disabling app" => "アプリ無効化中にエラーが発生",
+"Error while enabling app" => "アプリ有効化中にエラーが発生",
 "Updating...." => "更新中....",
 "Error while updating app" => "アプリの更新中にエラーが発生",
 "Error" => "エラー",
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
index 4549dcea52c..d0a8abea713 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid request" => "داواکارى نادروستە",
 "Enable" => "چالاککردن",
 "Error" => "هه‌ڵه",
 "Update" => "نوێکردنه‌وه",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 438e21d5bcf..822a17e7831 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
 "Disable" => "Slå av",
 "Enable" => "Slå på",
 "Please wait...." => "Ver venleg og vent …",
+"Error while disabling app" => "Klarte ikkje å skru av programmet",
+"Error while enabling app" => "Klarte ikkje å skru på programmet",
 "Updating...." => "Oppdaterer …",
 "Error while updating app" => "Feil ved oppdatering av app",
 "Error" => "Feil",
 "Update" => "Oppdater",
 "Updated" => "Oppdatert",
+"Decrypting files... Please wait, this can take some time." => "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.",
 "Saving..." => "Lagrar …",
 "deleted" => "sletta",
 "undo" => "angra",
@@ -38,25 +41,35 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Du må oppgje eit gyldig passord",
 "__language_name__" => "Nynorsk",
 "Security Warning" => "Tryggleiksåtvaring",
+"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." => "Datamappa og filene dine er sannsynlegvis leselege frå nettet. Fila .htaccess fungerer ikkje. Me rår deg sterkt til å konfigurera vevtenaren din sånn at datamappa di ikkje lenger er tilgjengeleg; alternativt kan du flytta datamappa ut av dokumentrot til vevtenaren.",
 "Setup Warning" => "Oppsettsåtvaring",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Ver venleg og dobbeltsjekk <a href=\"%s\">installasjonsrettleiinga</a>.",
 "Module 'fileinfo' missing" => "Modulen «fileinfo» manglar",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
 "Locale not working" => "Regionaldata fungerer ikkje",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Klarte ikkje endra regionaldata for systemet til %s. Dette vil seia at det kan verta problem med visse teikn i filnamn. Me rår deg sterkt til å installera dei kravde pakkene på systemet ditt så du får støtte for %s.",
 "Internet connection not working" => "Nettilkoplinga fungerer ikkje",
+"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." => "Denne tenaren har ikkje ei fungerande nettilkopling. Dette vil seia at visse funksjonar, som montering av ekstern lagring, meldingar om oppdateringar eller installering av tredjepartsprogram, ikkje vil fungera. Det kan òg henda at du ikkje får tilgang til filene dine utanfrå, eller ikkje får sendt varslingsepostar. Me rår deg til å skru på nettilkoplinga for denne tenaren viss du ønskjer desse funksjonane.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Utfør éi oppgåve for kvar sidelasting",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "Ei webcron-teneste er stilt inn til å kalla cron.php ein gong i minuttet over http.",
+"Use systems cron service to call the cron.php file once a minute." => "Bruk cron-tenesta til systemet for å kalla cron.php-fila ein gong i minuttet.",
 "Sharing" => "Deling",
 "Enable Share API" => "Slå på API-et for deling",
 "Allow apps to use the Share API" => "La app-ar bruka API-et til deling",
 "Allow links" => "Tillat lenkjer",
 "Allow users to share items to the public with links" => "La brukarar dela ting offentleg med lenkjer",
+"Allow public uploads" => "Tillat offentlege opplastingar",
+"Allow users to enable others to upload into their publicly shared folders" => "La brukarar tillata andre å lasta opp i deira offentleg delte mapper",
 "Allow resharing" => "Tillat vidaredeling",
 "Allow users to share items shared with them again" => "La brukarar vidaredela delte ting",
 "Allow users to share with anyone" => "La brukarar dela med kven som helst",
 "Allow users to only share with users in their groups" => "La brukarar dela berre med brukarar i deira grupper",
 "Security" => "Tryggleik",
 "Enforce HTTPS" => "Krev HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Tvingar klientar til å kopla til %s med ei kryptert tilkopling.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet).",
 "Log" => "Logg",
 "Log level" => "Log nivå",
 "More" => "Meir",
@@ -90,8 +103,15 @@ $TRANSLATIONS = array(
 "Language" => "Språk",
 "Help translate" => "Hjelp oss å omsetja",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Bruk denne adressa for å <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">henta filene dine over WebDAV</a>",
+"Encryption" => "Kryptering",
+"The encryption app is no longer enabled, decrypt all your file" => "Krypteringsprogrammet er ikkje lenger slått på, dekrypter alle filene dine",
+"Log-in password" => "Innloggingspassord",
+"Decrypt all Files" => "Dekrypter alle filene",
 "Login Name" => "Innloggingsnamn",
 "Create" => "Lag",
+"Admin Recovery Password" => "Gjenopprettingspassord for administrator",
+"Enter the recovery password in order to recover the users files during password change" => "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring",
 "Default Storage" => "Standardlagring",
 "Unlimited" => "Ubegrensa",
 "Other" => "Anna",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 1d8619de7e7..a8bc60ffed6 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
 "Disable" => "Wyłącz",
 "Enable" => "Włącz",
 "Please wait...." => "Proszę czekać...",
+"Error while disabling app" => "Błąd podczas wyłączania aplikacji",
+"Error while enabling app" => "Błąd podczas włączania aplikacji",
 "Updating...." => "Aktualizacja w toku...",
 "Error while updating app" => "Błąd podczas aktualizacji aplikacji",
 "Error" => "Błąd",
 "Update" => "Aktualizuj",
 "Updated" => "Zaktualizowano",
+"Decrypting files... Please wait, this can take some time." => "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.",
 "Saving..." => "Zapisywanie...",
 "deleted" => "usunięto",
 "undo" => "cofnij",
@@ -38,21 +41,27 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Należy podać prawidłowe hasło",
 "__language_name__" => "polski",
 "Security Warning" => "Ostrzeżenie o zabezpieczeniach",
+"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." => "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW.",
 "Setup Warning" => "Ostrzeżenia konfiguracji",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Proszę sprawdź ponownie <a href=\"%s\">przewodnik instalacji</a>.",
 "Module 'fileinfo' missing" => "Brak modułu „fileinfo”",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.",
 "Locale not working" => "Lokalizacja nie działa",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "System lokalny nie może włączyć ustawień regionalnych %s. Może to oznaczać, że wystąpiły problemy z niektórymi znakami w nazwach plików. Zalecamy instalację wymaganych pakietów na tym systemie w celu wsparcia %s.",
 "Internet connection not working" => "Połączenie internetowe nie działa",
+"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." => "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub 3-cie aplikacje mogą nie działać. Dostęp do plików z zewnątrz i wysyłanie powiadomienia e-mail nie może również działać. Sugerujemy, aby włączyć połączenia internetowego dla tego serwera, jeśli chcesz mieć wszystkie opcje.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na minutę przez http.",
+"Use systems cron service to call the cron.php file once a minute." => "Użyj systemowego cron-a do uruchamiania cron.php raz na minutę.",
 "Sharing" => "Udostępnianie",
 "Enable Share API" => "Włącz API udostępniania",
 "Allow apps to use the Share API" => "Zezwalaj aplikacjom na korzystanie z API udostępniania",
 "Allow links" => "Zezwalaj na odnośniki",
 "Allow users to share items to the public with links" => "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników",
 "Allow public uploads" => "Pozwól na  publiczne wczytywanie",
+"Allow users to enable others to upload into their publicly shared folders" => "Użytkownicy mogą włączyć dla innych wgrywanie do ich publicznych katalogów",
 "Allow resharing" => "Zezwalaj na ponowne udostępnianie",
 "Allow users to share items shared with them again" => "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych",
 "Allow users to share with anyone" => "Zezwalaj użytkownikom na współdzielenie z kimkolwiek",
@@ -60,6 +69,7 @@ $TRANSLATIONS = array(
 "Security" => "Bezpieczeństwo",
 "Enforce HTTPS" => "Wymuś HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL.",
 "Log" => "Logi",
 "Log level" => "Poziom logów",
 "More" => "Więcej",
@@ -93,7 +103,11 @@ $TRANSLATIONS = array(
 "Language" => "Język",
 "Help translate" => "Pomóż w tłumaczeniu",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Użyj tego adresu do <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>",
 "Encryption" => "Szyfrowanie",
+"The encryption app is no longer enabled, decrypt all your file" => "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik",
+"Log-in password" => "Hasło logowania",
+"Decrypt all Files" => "Odszyfruj wszystkie pliki",
 "Login Name" => "Login",
 "Create" => "Utwórz",
 "Admin Recovery Password" => "Odzyskiwanie hasła administratora",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index d72bca799dd..e1299bb9649 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Please wait...." => "Por favor aguarde...",
+"Error while disabling app" => "Erro enquanto desactivava a aplicação",
+"Error while enabling app" => "Erro enquanto activava a aplicação",
 "Updating...." => "A Actualizar...",
 "Error while updating app" => "Erro enquanto actualizava a aplicação",
 "Error" => "Erro",
 "Update" => "Actualizar",
 "Updated" => "Actualizado",
+"Decrypting files... Please wait, this can take some time." => "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
 "Saving..." => "A guardar...",
 "deleted" => "apagado",
 "undo" => "desfazer",
@@ -102,6 +105,9 @@ $TRANSLATIONS = array(
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Use este endereço para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">aceder aos seus ficheiros via WebDav</a>",
 "Encryption" => "Encriptação",
+"The encryption app is no longer enabled, decrypt all your file" => "A aplicação de encriptação não se encontra mais disponível, desencripte o seu ficheiro",
+"Log-in password" => "Password de entrada",
+"Decrypt all Files" => "Desencriptar todos os ficheiros",
 "Login Name" => "Nome de utilizador",
 "Create" => "Criar",
 "Admin Recovery Password" => "Recuperar password de administrador",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 0d22ad10741..b83407fc3bc 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -20,6 +20,8 @@ $TRANSLATIONS = array(
 "Disable" => "Zakázať",
 "Enable" => "Zapnúť",
 "Please wait...." => "Čakajte prosím...",
+"Error while disabling app" => "Chyba pri zablokovaní aplikácie",
+"Error while enabling app" => "Chyba pri povoľovaní aplikácie",
 "Updating...." => "Aktualizujem...",
 "Error while updating app" => "chyba pri aktualizácii aplikácie",
 "Error" => "Chyba",
@@ -103,6 +105,7 @@ $TRANSLATIONS = array(
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Použite túto adresu <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pre prístup k súborom cez WebDAV</a>",
 "Encryption" => "Šifrovanie",
+"The encryption app is no longer enabled, decrypt all your file" => "Šifrovacia aplikácia nie je povolená, dešifrujte všetky vaše súbory",
 "Log-in password" => "Prihlasovacie heslo",
 "Decrypt all Files" => "Dešifrovať všetky súbory",
 "Login Name" => "Prihlasovacie meno",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index facffb9ba18..d4726a29bb6 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Authentication error" => "Veprim i gabuar gjatë vërtetimit të identitetit",
+"Invalid request" => "Kërkesë e pavlefshme",
 "Error" => "Veprim i gabuar",
 "Update" => "Azhurno",
 "undo" => "anulo",
@@ -11,6 +12,7 @@ $TRANSLATIONS = array(
 "Password" => "Kodi",
 "New password" => "Kodi i ri",
 "Email" => "Email-i",
+"Other" => "Të tjera",
 "Username" => "Përdoruesi"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 5cd3679751b..73c015d17af 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -75,7 +75,7 @@ $TRANSLATIONS = array(
 "More" => "更多",
 "Less" => "更少",
 "Version" => "版本",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社群</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">原始碼</a>在 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 許可證下發布。",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社群</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">原始碼</a>在 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 授權許可下發布。",
 "Add your App" => "添加你的 App",
 "More Apps" => "更多Apps",
 "Select an App" => "選擇一個應用程式",
@@ -103,7 +103,7 @@ $TRANSLATIONS = array(
 "Language" => "語言",
 "Help translate" => "幫助翻譯",
 "WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "使用<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">這個網址</a>來透過 WebDAV 存取您的檔案",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "以上的 WebDAV 位址可以讓您<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">透過 WebDAV 協定存取檔案</a>",
 "Encryption" => "加密",
 "The encryption app is no longer enabled, decrypt all your file" => "加密應用程式已經停用，請您解密您所有的檔案",
 "Log-in password" => "登入密碼",