13 files changed, 91 insertions, 11 deletions
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 8d8848e6a5d..7c4b81138a3 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -28,10 +28,11 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "Nahrávanie zlyhalo. Nepodarilo sa získať informácie o súbore.",
 "Invalid directory." => "Neplatný priečinok.",
 "Files" => "Súbory",
+"All files" => "Všetky súbory",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má 0 bitov",
 "Total file size {size1} exceeds upload limit {size2}" => "Celková veľkosť súboru {size1} prekračuje upload limit {size2}",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "Nie je dostatok voľného miesta, chcete nahrať {size1} ale k dispozíciji je len {size2}",
-"Upload cancelled." => "Odosielanie zrušené.",
+"Upload cancelled." => "Odosielanie je zrušené.",
 "Could not get result from server." => "Nepodarilo sa dostať výsledky zo servera.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
 "URL cannot be empty" => "URL nemôže byť prázdna",
@@ -44,7 +45,8 @@ $TRANSLATIONS = array(
 "Delete" => "Zmazať",
 "Rename" => "Premenovať",
 "Your download is being prepared. This might take some time if the files are big." => "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať.",
-"Pending" => "Prebieha",
+"Pending" => "Čaká",
+"Error moving file." => "Chyba pri presune súboru.",
 "Error moving file" => "Chyba pri presúvaní súboru",
 "Error" => "Chyba",
 "Could not rename file" => "Nemožno premenovať súbor",
@@ -82,6 +84,7 @@ $TRANSLATIONS = array(
 "Download" => "Sťahovanie",
 "Upload too large" => "Nahrávanie je príliš veľké",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
-"Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané."
+"Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané.",
+"Currently scanning" => "Prehľadáva sa"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 0191e0bb448..1d514787a67 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "上传失败。不能获取文件信息。",
 "Invalid directory." => "无效文件夹。",
 "Files" => "文件",
+"All files" => "全部文件",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "不能上传文件 {filename} ，由于它是一个目录或者为0字节",
 "Total file size {size1} exceeds upload limit {size2}" => "总文件大小 {size1} 超过上传限制 {size2}",
 "Not enough free space, you are uploading {size1} but only {size2} is left" => "没有足够的可用空间，您正在上传 {size1} 的文件但是只有 {size2} 可用。",
@@ -74,7 +75,7 @@ $TRANSLATIONS = array(
 "New" => "新建",
 "New text file" => "创建文本文件",
 "Text file" => "文本文件",
-"New folder" => "添加文件夹",
+"New folder" => "增加文件夹",
 "Folder" => "文件夹",
 "From link" => "来自链接",
 "Cancel upload" => "取消上传",
@@ -83,6 +84,7 @@ $TRANSLATIONS = array(
 "Download" => "下载",
 "Upload too large" => "上传文件过大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",
-"Files are being scanned, please wait." => "文件正在被扫描，请稍候。"
+"Files are being scanned, please wait." => "文件正在被扫描，请稍候。",
+"Currently scanning" => "正在扫描"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index 4d277e9b174..0647ff6b769 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -8,15 +8,22 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "不能修改密码。旧密码可能不正确。",
 "Private key password successfully updated." => "私钥密码成功更新。",
 "Could not update the private key password. Maybe the old password was not correct." => "无法更新私钥密码。可能旧密码不正确。",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "加密应用还没有初始化！可能加密应用在你会话期间已被重新启用。请注销并重新登录，以初始化加密应用。",
+"Missing requirements." => "必填项未填写。",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "请确认安装了 PHP 5.3.3 或更新版本，且 OpenSSL 及其 PHP 扩展已经启用并正确配置。加密应用现在已被禁用。",
+"Following users are not set up for encryption:" => "以下用户还没有设置加密：",
+"Go directly to your " => "直接进入你的",
 "personal settings" => "个人设置",
 "Encryption" => "加密",
 "Enable recovery key (allow to recover users files in case of password loss):" => "启用恢复密钥（允许你在密码丢失后恢复文件）：",
 "Recovery key password" => "恢复密钥密码",
+"Repeat Recovery key password" => "重复恢复密钥密码",
 "Enabled" => "开启",
 "Disabled" => "禁用",
 "Change recovery key password:" => "更改恢复密钥密码",
 "Old Recovery key password" => "旧的恢复密钥密码",
 "New Recovery key password" => "新的恢复密钥密码",
+"Repeat New Recovery key password" => "重复新的密钥恢复密码",
 "Change Password" => "修改密码",
 "Your private key password no longer match your log-in password:" => "您的私钥密码不再匹配您的登录密码：",
 "Set your old private key password to your current log-in password." => "讲您旧的私钥密码改为当前登录密码。",
diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php
index f0afc03500f..aa86afa3dca 100644
--- a/apps/files_external/l10n/eu.php
+++ b/apps/files_external/l10n/eu.php
@@ -4,8 +4,11 @@ $TRANSLATIONS = array(
 "Local" => "Bertakoa",
 "Location" => "Kokapena",
 "Amazon S3" => "Amazon S3",
+"Key" => "Gakoa",
+"Access Key" => "Sarbide gakoa",
 "Port (optional)" => "Portua (hautazkoa)",
 "Enable SSL" => "Gaitu SSL",
+"App key" => "Aplikazio gakoa",
 "Host" => "Ostalaria",
 "Username" => "Erabiltzaile izena",
 "Password" => "Pasahitza",
@@ -17,6 +20,7 @@ $TRANSLATIONS = array(
 "Please provide a valid Dropbox app key and secret." => "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua",
 "Error configuring Google Drive storage" => "Errore bat egon da Google Drive konfiguratzean",
 "Personal" => "Pertsonala",
+"System" => "Sistema",
 "Saved" => "Gordeta",
 "<b>Note:</b> " => "<b>Oharra:</b>",
 " and " => "eta",
diff --git a/apps/files_external/l10n/fi_FI.php b/apps/files_external/l10n/fi_FI.php
index cbdb5a1fed9..1ad977d1648 100644
--- a/apps/files_external/l10n/fi_FI.php
+++ b/apps/files_external/l10n/fi_FI.php
@@ -5,6 +5,8 @@ $TRANSLATIONS = array(
 "Location" => "Sijainti",
 "Amazon S3" => "Amazon S3",
 "Key" => "Avain",
+"Amazon S3 and compliant" => "Amazon S3 ja yhteensopivat",
+"Hostname (optional)" => "Verkkonimi (valinnainen)",
 "Port (optional)" => "Portti (valinnainen)",
 "Region (optional)" => "Alue (valinnainen)",
 "Enable SSL" => "Käytä SSL:ää",
@@ -29,7 +31,9 @@ $TRANSLATIONS = array(
 "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön.",
 "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Huomio:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön.",
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Huomio:</b> \"%s\" ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan puuttuva kohde.",
+"You don't have any external storages" => "Käytössäsi ei ole erillisiä tallennustiloja",
 "Name" => "Nimi",
+"Storage type" => "Tallennustilan tyyppi",
 "External Storage" => "Erillinen tallennusväline",
 "Folder name" => "Kansion nimi",
 "Configuration" => "Asetukset",
diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php
index 38e9275c3a7..f646007c923 100644
--- a/apps/files_external/l10n/sk_SK.php
+++ b/apps/files_external/l10n/sk_SK.php
@@ -3,23 +3,53 @@ $TRANSLATIONS = array(
 "External storage" => "Externé úložisko",
 "Local" => "Lokálny",
 "Location" => "Umiestnenie",
+"Amazon S3" => "Amazon S3",
+"Key" => "Kľúč",
+"Secret" => "Tajné",
+"Bucket" => "Sektor",
+"Amazon S3 and compliant" => "Amazon S3 a kompatibilné",
+"Access Key" => "Prístupový kľúč",
+"Secret Key" => "Tajný kľúč",
+"Hostname (optional)" => "Hostname (voliteľný)",
+"Port (optional)" => "Port (voliteľný)",
+"Region (optional)" => "Región (voliteľný)",
+"Enable SSL" => "Povoliť SSL",
+"App key" => "Kľúč aplikácie",
 "Host" => "Hostiteľ",
 "Username" => "Používateľské meno",
 "Password" => "Heslo",
+"Root" => "Root",
+"Secure ftps://" => "Zabezpečené ftps://",
+"Client ID" => "Client ID",
+"OpenStack Object Storage" => "OpenStack Object Storage",
+"Username (required)" => "Používateľské meno (povinné)",
+"Bucket (required)" => "Sektor (povinné)",
+"Region (optional for OpenStack Object Storage)" => "Región (voliteľné pre OpenStack Object Storage)",
+"API Key (required for Rackspace Cloud Files)" => "API Key (požadované pre Rackspace Cloud Files)",
+"Tenantname (required for OpenStack Object Storage)" => "Tenantname (požadované pre OpenStack Object Storage)",
+"Password (required for OpenStack Object Storage)" => "Heslo (požadované pre OpenStack Object Storage)",
+"Service Name (required for OpenStack Object Storage)" => "Meno služby (požadované pre OpenStack Object Storage)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "URL of identity endpoint (požadované pre OpenStack Object Storage)",
+"Timeout of HTTP requests in seconds (optional)" => "Vypršanie HTTP požadiavkiek v sekundách (voliteľné)",
 "Share" => "Zdieľať",
+"SMB / CIFS using OC login" => "SMB / CIFS s použitím OC prihlásenia",
 "URL" => "URL",
+"Secure https://" => "Zabezpečené https://",
+"Remote subfolder" => "Vzdialený podpriečinok",
 "Access granted" => "Prístup povolený",
 "Error configuring Dropbox storage" => "Chyba pri konfigurácii úložiska Dropbox",
 "Grant access" => "Povoliť prístup",
 "Please provide a valid Dropbox app key and secret." => "Zadajte platný kľúč aplikácie a heslo Dropbox",
 "Error configuring Google Drive storage" => "Chyba pri konfigurácii úložiska Google drive",
 "Personal" => "Osobné",
+"System" => "Systém",
 "Saved" => "Uložené",
 "<b>Note:</b> " => "<b>Poznámka:</b> ",
 " and " => "a",
 "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
 "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Poznámka:</b> FTP podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Poznámka:</b> \"%s\" nie je nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
+"You don't have any external storages" => "Nemáte žiadne externé úložisko",
 "Name" => "Názov",
 "External Storage" => "Externé úložisko",
 "Folder name" => "Názov priečinka",
diff --git a/apps/files_external/l10n/sq.php b/apps/files_external/l10n/sq.php
index 01fa6770fd7..1194279a558 100644
--- a/apps/files_external/l10n/sq.php
+++ b/apps/files_external/l10n/sq.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
 "URL" => "URL-i",
 "Personal" => "Personale",
 "Name" => "Emri",
+"Folder name" => "Emri i Skedarit",
 "Groups" => "Grupet",
 "Users" => "Përdoruesit",
 "Delete" => "Elimino"
diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php
index c8e01b2867f..b94a573d95a 100644
--- a/apps/files_external/l10n/zh_CN.php
+++ b/apps/files_external/l10n/zh_CN.php
@@ -34,7 +34,7 @@ $TRANSLATIONS = array(
 "Configuration" => "配置",
 "Options" => "选项",
 "Available for" => "可用于",
-"Add storage" => "添加存储",
+"Add storage" => "增加存储",
 "No user or group" => "无用户或组",
 "All Users" => "所有用户",
 "Groups" => "组",
diff --git a/apps/files_sharing/l10n/sk_SK.php b/apps/files_sharing/l10n/sk_SK.php
index d759b45ab55..7e3a7cef678 100644
--- a/apps/files_sharing/l10n/sk_SK.php
+++ b/apps/files_sharing/l10n/sk_SK.php
@@ -1,5 +1,12 @@
 <?php
 $TRANSLATIONS = array(
+"Shared with you" => "Zdieľané s vami",
+"Shared with others" => "Zdieľané s ostanými",
+"Shared by link" => "Zdieľané pomocou odkazu",
+"No files have been shared with you yet." => "Zatiaľ s vami nikto žiadne súbory nezdieľal.",
+"You haven't shared any files yet." => "Zatiaľ ste nezdieľali žiadne súbory.",
+"You haven't shared any files by link yet." => "Zatiaľ ste pomocou odkazu nezdieľali žiaden súbor.",
+"Could not load template" => "Šablónu nemožno nahrať",
 "Saved" => "Uložené",
 "Reset" => "Resetovať",
 "Shared by {owner}" => "Zdieľa {owner}",
@@ -8,6 +15,7 @@ $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Heslo je chybné. Skúste to znova.",
 "Password" => "Heslo",
 "Name" => "Názov",
+"Share time" => "Čas zdieľania",
 "Sorry, this link doesn’t seem to work anymore." => "To je nepríjemné, ale tento odkaz už nie je funkčný.",
 "Reasons might be:" => "Možné dôvody:",
 "the item was removed" => "položka bola presunutá",
@@ -17,6 +25,9 @@ $TRANSLATIONS = array(
 "Download" => "Sťahovanie",
 "Download %s" => "Stiahnuť %s",
 "Direct link" => "Priama linka",
+"Mail templates" => "Emailové šablóny",
+"Theme" => "Téma",
+"Template" => "Šablóna",
 "Save" => "Uložiť"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php
index 3205eabfea5..8be44a028e8 100644
--- a/apps/user_ldap/l10n/nb_NO.php
+++ b/apps/user_ldap/l10n/nb_NO.php
@@ -52,7 +52,7 @@ $TRANSLATIONS = array(
 "LDAP Username:" => "LDAP-brukernavn:",
 "LDAP Email Address:" => "LDAP-epostadresse:",
 "Other Attributes:" => "Andre attributter:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Definerer filteret som skal brukes når innlogging forsøkes. %%uid erstatter brukernavnet i innloggingshandlingen. Eksempel: \"uid=%%uid\"",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Definerer filteret som skal brukes når noen prøver å logge inn. %%uid erstatter brukernavnet i innloggingen. Eksempel: \"uid=%%uid\"",
 "1. Server" => "1. server",
 "%s. Server:" => "%s. server:",
 "Add Server Configuration" => "Legg til tjener-konfigurasjon",
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index 9d6b39c14ee..66535e34b62 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -12,10 +12,14 @@ $TRANSLATIONS = array(
 "Deletion failed" => "Odstránenie zlyhalo",
 "Take over settings from recent server configuration?" => "Prebrať nastavenia z nedávneho nastavenia servera?",
 "Keep settings?" => "Ponechať nastavenia?",
+"{nthServer}. Server" => "{nthServer}. Server",
 "Cannot add server configuration" => "Nemožno pridať nastavenie servera",
 "mappings cleared" => "mapovanie vymazané",
 "Success" => "Úspešné",
 "Error" => "Chyba",
+"Please specify a Base DN" => "Prosím, zadajte základnú DN",
+"Could not determine Base DN" => "Nemožno určiť základnú DN",
+"Please specify the port" => "Prosím, zadajte port",
 "Configuration OK" => "Konfigurácia je v poriadku",
 "Configuration incorrect" => "Nesprávna konfigurácia",
 "Configuration incomplete" => "Nekompletná konfigurácia",
@@ -30,6 +34,9 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("%s nájdený používateľ","%s nájdení používatelia","%s nájdených používateľov"),
 "Invalid Host" => "Neplatný hostiteľ",
 "Could not find the desired feature" => "Nemožno nájsť požadovanú funkciu",
+"Server" => "Server",
+"User Filter" => "Filter používateľov",
+"Login Filter" => "Filter prihlasovania",
 "Group Filter" => "Filter skupiny",
 "Save" => "Uložiť",
 "Test Configuration" => "Test nastavenia",
@@ -41,12 +48,15 @@ $TRANSLATIONS = array(
 "Raw LDAP filter" => "Raw LDAP filter",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Tento filter LDAP určuje, ktoré skupiny budú mať prístup k %s inštancii.",
 "groups found" => "nájdené skupiny",
-"Users login with this attribute:" => "Používateľov prihlásiť pomocou tohto atribútu:",
+"Users login with this attribute:" => "Používatelia sa budú prihlasovať pomocou tohto atribútu:",
 "LDAP Username:" => "LDAP používateľské meno:",
 "LDAP Email Address:" => "LDAP emailová adresa:",
 "Other Attributes:" => "Iné atribúty:",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahrádza používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\"",
+"1. Server" => "1. Server",
+"%s. Server:" => "%s. Server:",
 "Add Server Configuration" => "Pridať nastavenia servera.",
+"Delete Configuration" => "Zmazať nastavenia",
 "Host" => "Hostiteľ",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Môžete vynechať protokol, okrem prípadu, kedy sa vyžaduje SSL. Vtedy začnite s ldaps://",
 "Port" => "Port",
@@ -61,6 +71,7 @@ $TRANSLATIONS = array(
 "users found" => "nájdení používatelia",
 "Back" => "Späť",
 "Continue" => "Pokračovať",
+"Expert" => "Expert",
 "Advanced" => "Rozšírené",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth sú navzájom nekompatibilné. Môžete zaznamenať neočakávané správanie. Požiadajte prosím vášho systémového administrátora pre zakázanie jedného z nich.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Upozornenie:</b> nie je nainštalovaný LDAP modul pre PHP, backend vrstva nebude fungovať. Požiadajte administrátora systému, aby ho nainštaloval.",
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index d730706cce1..fc9c6ec3f92 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -7,7 +7,7 @@ $TRANSLATIONS = array(
 "Deletion failed" => "删除失败",
 "Take over settings from recent server configuration?" => "从近期的服务器配置中导入设置？",
 "Keep settings?" => "保留设置吗？",
-"Cannot add server configuration" => "无法添加服务器配置",
+"Cannot add server configuration" => "无法增加服务器配置",
 "mappings cleared" => "清除映射",
 "Success" => "成功",
 "Error" => "错误",
@@ -22,7 +22,7 @@ $TRANSLATIONS = array(
 "Save" => "保存",
 "Test Configuration" => "测试配置",
 "Help" => "帮助",
-"Add Server Configuration" => "添加服务器配置",
+"Add Server Configuration" => "增加服务器配置",
 "Host" => "主机",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "可以忽略协议，但如要使用SSL，则需以ldaps://开头",
 "Port" => "端口",
@@ -35,6 +35,7 @@ $TRANSLATIONS = array(
 "Back" => "返回",
 "Continue" => "继续",
 "Advanced" => "高级",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>警告：</b> 应用 user_ldap 和 user_webdavauth 之间不兼容。您可能遭遇未预料的行为。请让系统管理员禁用其中一个。",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>警告：</b> PHP LDAP 模块未安装，后端将无法工作。请请求您的系统管理员安装该模块。",
 "Connection Settings" => "连接设置",
 "Configuration Active" => "现行配置",
@@ -49,11 +50,13 @@ $TRANSLATIONS = array(
 "in seconds. A change empties the cache." => "以秒计。修改将清空缓存。",
 "Directory Settings" => "目录设置",
 "User Display Name Field" => "用户显示名称字段",
+"The LDAP attribute to use to generate the user's display name." => "用来生成用户的显示名称的 LDAP 属性。",
 "Base User Tree" => "基础用户树",
 "One User Base DN per line" => "每行一个用户基准判别名",
 "User Search Attributes" => "用户搜索属性",
 "Optional; one attribute per line" => "可选;每行一个属性",
 "Group Display Name Field" => "组显示名称字段",
+"The LDAP attribute to use to generate the groups's display name." => "用来生成组的显示名称的 LDAP 属性。",
 "Base Group Tree" => "基础组树",
 "One Group Base DN per line" => "每行一个群组基准判别名",
 "Group Search Attributes" => "群组搜索属性",
@@ -64,11 +67,14 @@ $TRANSLATIONS = array(
 "in bytes" => "字节数",
 "Email Field" => "电邮字段",
 "User Home Folder Naming Rule" => "用户主目录命名规则",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "将用户名称留空(默认)。否则指定一个LDAP/AD属性",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "指定一个 LDAP/AD 属性。留空，则使用用户名称（默认）。",
 "Internal Username" => "内部用户名",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "默认情况下，内部用户名具有唯一识别属性，以确保用户名唯一，且字符不用经过转换。内部用户名有严格的字符限制，只允许使用 [ a-zA-Z0-9_.@- ]。其他字符会被 ASCII 码取代，或者被忽略。当出现冲突时，用户名后会增加或者减少一个数字。内部用户名用于内部用户识别，同时也作为 ownCloud 中用户根文件夹的默认名。其也作为远程 URLs 的一部分，如在所有的 *DAV 服务中。在这种设置下，默认行为可以被覆盖。要实现在 ownCloud 5 之前的类似的效果，在下框中输入用户的显示名称属性。如果留空，则执行默认操作。更改只影响新映射 (或增加) 的 LDAP 用户。",
 "Internal Username Attribute:" => "内部用户名属性：",
 "Override UUID detection" => "超越UUID检测",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "ownCloud 默认会自动检测 UUID 属性。UUID 属性用来无误地识别 LDAP 用户和组。同时，如果上面没有特别设置，内部用户名也基于 UUID 创建。也可以覆盖设置，直接指定一个属性。但一定要确保指定的属性取得的用户和组是唯一的。留空，则执行默认操作。更改只影响新映射 (或增加) 的 LDAP 用户和组。",
 "Username-LDAP User Mapping" => "用户名-LDAP用户映射",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "用户名用于存储和分配数据 (元)。为了准确地识别和确认用户，每个用户都有一个内部用户名。这需要一个 ownCloud 用户名到 LDAP 用户的映射。创建的用户名被映射到 LDAP 用户的 UUID。此外，DN 也会被缓存，以减少 LDAP 连接，但它不用于识别。DN 的变化会被监视到。内部用户名会被用于所有地方。清除映射将导致一片混乱。清除映射不是常用的设置，它会影响到所有的 LDAP 配置！千万不要在正式环境中清除映射，只有在测试或试验时才这样做。",
 "Clear Username-LDAP User Mapping" => "清除用户-LDAP用户映射",
 "Clear Groupname-LDAP Group Mapping" => "清除组用户-LDAP级映射"
 );
diff --git a/apps/user_webdavauth/l10n/sk_SK.php b/apps/user_webdavauth/l10n/sk_SK.php
index 694653d9877..029c3171e7b 100644
--- a/apps/user_webdavauth/l10n/sk_SK.php
+++ b/apps/user_webdavauth/l10n/sk_SK.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "WebDAV Authentication" => "WebDAV overenie",
+"Address:" => "Adresa:",
 "Save" => "Uložiť",
 "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Používateľské prihlasovacie údaje budú odoslané na túto adresu. Tento plugin skontroluje odpoveď servera a interpretuje návratový kód HTTP 401 a 403 ako neplatné prihlasovacie údaje a akýkoľvek iný ako platné prihlasovacie údaje."
 );