4 files changed, 43 insertions, 63 deletions
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index 338317baad7..455ad62d84c 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -30,8 +30,11 @@ $TRANSLATIONS = array(
 "Password" => "Contrasenya",
 "For anonymous access, leave DN and Password empty." => "Per un accés anònim, deixeu la DN i la contrasenya en blanc.",
 "User Login Filter" => "Filtre d'inici de sessió d'usuari",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Defineix el filtre a aplicar quan s'intenta iniciar la sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió. Per exemple: \"uid=%%uid\"",
 "User List Filter" => "Llista de filtres d'usuari",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Defineix el filtre a aplicar quan es mostren usuaris (no textos variables). Per exemple: \"objectClass=person\"",
 "Group Filter" => "Filtre de grup",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Defineix el filtre a aplicar quan es mostren grups (no textos variables). Per exemple: \"objectClass=posixGroup\"",
 "Connection Settings" => "Arranjaments de connexió",
 "Configuration Active" => "Configuració activa",
 "When unchecked, this configuration will be skipped." => "Si està desmarcat, aquesta configuració s'ometrà.",
@@ -45,6 +48,7 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "No ho useu adicionalment per a conexions LDAPS, fallarà.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)",
 "Turn off SSL certificate validation." => "Desactiva la validació de certificat SSL.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "No es recomana, useu-ho només com a prova! Importeu el certificat SSL del servidor LDAP al servidor %s només si la connexió funciona amb aquesta opció.",
 "Cache Time-To-Live" => "Memòria de cau Time-To-Live",
 "in seconds. A change empties the cache." => "en segons. Un canvi buidarà la memòria de cau.",
 "Directory Settings" => "Arranjaments de carpetes",
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index 88006e1b5d9..9469146d359 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -30,8 +30,11 @@ $TRANSLATIONS = array(
 "Password" => "Senha",
 "For anonymous access, leave DN and Password empty." => "Para acesso anônimo, deixe DN e Senha vazios.",
 "User Login Filter" => "Filtro de Login de Usuário",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define o filtro a ser aplicado, o login é feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\"",
 "User List Filter" => "Filtro de Lista de Usuário",
+"Defines the filter to apply, when retrieving users (no placeholders). Example: \"objectClass=person\"" => "Define o filtro a ser aplicado, ao recuperar usuários (sem espaços reservados). Exemplo: \"objectClass=person\"",
 "Group Filter" => "Filtro de Grupo",
+"Defines the filter to apply, when retrieving groups (no placeholders). Example: \"objectClass=posixGroup\"" => "Define o filtro a ser aplicado, ao recuperar grupos (sem espaços reservados). Exemplo: \"objectClass=posixGroup\"",
 "Connection Settings" => "Configurações de Conexão",
 "Configuration Active" => "Configuração ativa",
 "When unchecked, this configuration will be skipped." => "Quando não marcada, esta configuração será ignorada.",
@@ -45,6 +48,7 @@ $TRANSLATIONS = array(
 "Do not use it additionally for LDAPS connections, it will fail." => "Não use adicionalmente para conexões LDAPS, pois falhará.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP sensível à caixa alta (Windows)",
 "Turn off SSL certificate validation." => "Desligar validação de certificado SSL.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Não recomendado, use-o somente para teste! Se a conexão só funciona com esta opção, importar o certificado SSL do servidor LDAP em seu servidor %s.",
 "Cache Time-To-Live" => "Cache Time-To-Live",
 "in seconds. A change empties the cache." => "em segundos. Uma mudança esvaziará o cache.",
 "Directory Settings" => "Configurações de Diretório",
diff --git a/apps/user_ldap/l10n/zh_CN.GB2312.php b/apps/user_ldap/l10n/zh_CN.GB2312.php
deleted file mode 100644
index 306b84a588e..00000000000
--- a/apps/user_ldap/l10n/zh_CN.GB2312.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deletion failed" => "删除失败",
-"Success" => "成功",
-"Error" => "出错",
-"Host" => "主机",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "您可以忽略协议，除非您需要 SSL。然后用 ldaps:// 开头",
-"Base DN" => "基本判别名",
-"You can specify Base DN for users and groups in the Advanced tab" => "您可以在高级选项卡中为用户和群组指定基本判别名",
-"User DN" => "用户判别名",
-"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "客户机用户的判别名，将用于绑定，例如 uid=agent, dc=example, dc=com。匿名访问请留空判别名和密码。",
-"Password" => "密码",
-"For anonymous access, leave DN and Password empty." => "匿名访问请留空判别名和密码。",
-"User Login Filter" => "用户登录过滤器",
-"User List Filter" => "用户列表过滤器",
-"Group Filter" => "群组过滤器",
-"Port" => "端口",
-"Use TLS" => "使用 TLS",
-"Case insensitve LDAP server (Windows)" => "大小写不敏感的 LDAP 服务器 (Windows)",
-"Turn off SSL certificate validation." => "关闭 SSL 证书校验。",
-"in seconds. A change empties the cache." => "以秒计。修改会清空缓存。",
-"User Display Name Field" => "用户显示名称字段",
-"Base User Tree" => "基本用户树",
-"Group Display Name Field" => "群组显示名称字段",
-"Base Group Tree" => "基本群组树",
-"Group-Member association" => "群组-成员组合",
-"in bytes" => "以字节计",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "用户名请留空 (默认)。否则，请指定一个 LDAP/AD 属性。",
-"Help" => "帮助"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index 38bed895742..2cc1ac99336 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -3,56 +3,59 @@ $TRANSLATIONS = array(
 "Failed to clear the mappings." => "清除映射失敗",
 "Failed to delete the server configuration" => "刪除伺服器設定時失敗",
 "The configuration is valid and the connection could be established!" => "設定有效且連線可建立",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "設定有效但連線無法建立。請檢查伺服器的設定與認證資料。",
-"The configuration is invalid. Please look in the ownCloud log for further details." => "設定無效。更多細節請參閱ownCloud的記錄檔。",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "設定有效但連線無法建立，請檢查伺服器設定與認證資料。",
+"The configuration is invalid. Please look in the ownCloud log for further details." => "設定無效，更多細節請參閱 ownCloud 的記錄檔。",
 "Deletion failed" => "移除失敗",
-"Take over settings from recent server configuration?" => "要使用最近一次的伺服器設定嗎?",
-"Keep settings?" => "維持設定嗎?",
+"Take over settings from recent server configuration?" => "要使用最近一次的伺服器設定嗎？",
+"Keep settings?" => "維持設定嗎？",
 "Cannot add server configuration" => "無法新增伺服器設定",
 "mappings cleared" => "映射已清除",
 "Success" => "成功",
 "Error" => "錯誤",
 "Connection test succeeded" => "連線測試成功",
 "Connection test failed" => "連線測試失敗",
-"Do you really want to delete the current Server Configuration?" => "您真的確定要刪除現在的伺服器設定嗎?",
-"Confirm Deletion" => "確認已刪除",
-"<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 模組，後端系統將無法運作。請要求您的系統管理員安裝模組。",
+"Do you really want to delete the current Server Configuration?" => "您真的要刪除現在的伺服器設定嗎？",
+"Confirm Deletion" => "確認刪除",
+"<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 模組，後端系統將無法運作，請要求您的系統管理員安裝模組。",
 "Server configuration" => "伺服器設定",
 "Add Server Configuration" => "新增伺服器設定",
 "Host" => "主機",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "若您不需要SSL加密傳輸則可忽略通訊協定。若非如此請從ldaps://開始",
-"One Base DN per line" => "一行一個Base DN",
-"You can specify Base DN for users and groups in the Advanced tab" => "您可以在進階標籤頁裡面指定使用者及群組的Base DN",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "若您不需要 SSL 加密連線則不需輸入通訊協定，反之請輸入 ldaps://",
+"Base DN" => "Base DN",
+"One Base DN per line" => "一行一個 Base DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "您可以在進階標籤頁裡面指定使用者及群組的 Base DN",
+"User DN" => "User DN",
 "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "客戶端使用者的DN與特定字詞的連結需要完善，例如:uid=agent,dc=example,dc=com。若是匿名連接，則將DN與密碼欄位留白。",
 "Password" => "密碼",
-"For anonymous access, leave DN and Password empty." => "匿名連接時請將DN與密碼欄位留白",
-"User Login Filter" => "使用者登入過濾器",
-"User List Filter" => "使用者名單篩選器",
-"Group Filter" => "群組篩選器",
+"For anonymous access, leave DN and Password empty." => "匿名連接時請將 DN 與密碼欄位留白",
+"User Login Filter" => "User Login Filter",
+"User List Filter" => "User List Filter",
+"Group Filter" => "Group Filter",
 "Connection Settings" => "連線設定",
-"Configuration Active" => "設定為主動模式",
+"Configuration Active" => "設定使用中",
 "When unchecked, this configuration will be skipped." => "沒有被勾選時，此設定會被略過。",
-"Port" => "連接阜",
+"Port" => "連接埠",
 "Backup (Replica) Host" => "備用主機",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "請給定一個可選的備用主機。必須是LDAP/AD中央伺服器的複本。",
-"Backup (Replica) Port" => "備用(複本)連接阜",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "可以選擇性設定備用主機，必須是 LDAP/AD 中央伺服器的複本。",
+"Backup (Replica) Port" => "備用（複本）連接埠",
 "Disable Main Server" => "停用主伺服器",
-"Use TLS" => "使用TLS",
-"Case insensitve LDAP server (Windows)" => "不區分大小寫的LDAP伺服器(Windows)",
-"Turn off SSL certificate validation." => "關閉 SSL 憑證驗證",
+"Use TLS" => "使用 TLS",
+"Do not use it additionally for LDAPS connections, it will fail." => "不要同時與 LDAPS 使用，會有問題。",
+"Case insensitve LDAP server (Windows)" => "不區分大小寫的 LDAP 伺服器 (Windows)",
+"Turn off SSL certificate validation." => "關閉 SSL 憑證檢查",
 "Cache Time-To-Live" => "快取的存活時間",
-"in seconds. A change empties the cache." => "以秒為單位。更變後會清空快取。",
-"Directory Settings" => "目錄選項",
-"User Display Name Field" => "使用者名稱欄位",
-"Base User Tree" => "Base使用者數",
-"One User Base DN per line" => "一行一個使用者Base DN",
-"User Search Attributes" => "使用者搜索屬性",
-"Optional; one attribute per line" => "可選的; 一行一項屬性",
+"in seconds. A change empties the cache." => "以秒為單位。變更後會清空快取。",
+"Directory Settings" => "目錄設定",
+"User Display Name Field" => "使用者顯示名稱欄位",
+"Base User Tree" => "Base User Tree",
+"One User Base DN per line" => "一行一個使用者 Base DN",
+"User Search Attributes" => "User Search Attributes",
+"Optional; one attribute per line" => "非必要，一行一項屬性",
 "Group Display Name Field" => "群組顯示名稱欄位",
-"Base Group Tree" => "Base群組樹",
-"One Group Base DN per line" => "一行一個群組Base DN",
-"Group Search Attributes" => "群組搜索屬性",
-"Group-Member association" => "群組成員的關係",
+"Base Group Tree" => "Base Group Tree",
+"One Group Base DN per line" => "一行一個 Group Base DN",
+"Group Search Attributes" => "Group Search Attributes",
+"Group-Member association" => "Group-Member association",
 "Special Attributes" => "特殊屬性",
 "Quota Field" => "配額欄位",
 "Quota Default" => "預設配額",