Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/l10n
diff options
context:
space:
mode:
authorJenkins for ownCloud <thomas.mueller@tmit.eu>2012-12-15 03:12:10 +0400
committerJenkins for ownCloud <thomas.mueller@tmit.eu>2012-12-15 03:12:10 +0400
commit9f5868cf187fe0eedef79c9e468c589560bab1e0 (patch)
tree3e7bb3d161e22c61ade5ba37fdbf086a5a6fb8e8 /l10n
parentf0893fb8fe7f0642ae30de2e1168472377c127e2 (diff)
[tx-robot] updated from transifex
Diffstat (limited to 'l10n')
-rw-r--r--l10n/ar/user_ldap.po89
-rw-r--r--l10n/bg_BG/user_ldap.po89
-rw-r--r--l10n/ca/user_ldap.po89
-rw-r--r--l10n/cs_CZ/user_ldap.po87
-rw-r--r--l10n/da/user_ldap.po87
-rw-r--r--l10n/de/core.po45
-rw-r--r--l10n/de/user_ldap.po87
-rw-r--r--l10n/de_DE/core.po55
-rw-r--r--l10n/de_DE/user_ldap.po87
-rw-r--r--l10n/el/user_ldap.po87
-rw-r--r--l10n/eo/user_ldap.po87
-rw-r--r--l10n/es/core.po55
-rw-r--r--l10n/es/user_ldap.po87
-rw-r--r--l10n/es_AR/user_ldap.po87
-rw-r--r--l10n/et_EE/user_ldap.po87
-rw-r--r--l10n/eu/user_ldap.po89
-rw-r--r--l10n/fa/user_ldap.po89
-rw-r--r--l10n/fi_FI/core.po46
-rw-r--r--l10n/fi_FI/user_ldap.po87
-rw-r--r--l10n/fr/user_ldap.po89
-rw-r--r--l10n/gl/user_ldap.po87
-rw-r--r--l10n/he/user_ldap.po89
-rw-r--r--l10n/hi/user_ldap.po89
-rw-r--r--l10n/hr/user_ldap.po89
-rw-r--r--l10n/hu_HU/user_ldap.po89
-rw-r--r--l10n/ia/user_ldap.po89
-rw-r--r--l10n/id/user_ldap.po87
-rw-r--r--l10n/is/user_ldap.po87
-rw-r--r--l10n/it/core.po38
-rw-r--r--l10n/it/user_ldap.po89
-rw-r--r--l10n/ja_JP/core.po55
-rw-r--r--l10n/ja_JP/user_ldap.po87
-rw-r--r--l10n/ka_GE/user_ldap.po87
-rw-r--r--l10n/ko/user_ldap.po87
-rw-r--r--l10n/ku_IQ/user_ldap.po87
-rw-r--r--l10n/lb/user_ldap.po89
-rw-r--r--l10n/lt_LT/user_ldap.po89
-rw-r--r--l10n/lv/user_ldap.po89
-rw-r--r--l10n/mk/user_ldap.po89
-rw-r--r--l10n/ms_MY/user_ldap.po89
-rw-r--r--l10n/nb_NO/user_ldap.po87
-rw-r--r--l10n/nl/user_ldap.po87
-rw-r--r--l10n/nn_NO/user_ldap.po89
-rw-r--r--l10n/oc/user_ldap.po87
-rw-r--r--l10n/pl/user_ldap.po89
-rw-r--r--l10n/pl_PL/user_ldap.po89
-rw-r--r--l10n/pt_BR/user_ldap.po87
-rw-r--r--l10n/pt_PT/user_ldap.po87
-rw-r--r--l10n/ro/user_ldap.po89
-rw-r--r--l10n/ru/user_ldap.po89
-rw-r--r--l10n/ru_RU/user_ldap.po87
-rw-r--r--l10n/si_LK/user_ldap.po87
-rw-r--r--l10n/sk_SK/user_ldap.po87
-rw-r--r--l10n/sl/user_ldap.po87
-rw-r--r--l10n/sq/user_ldap.po87
-rw-r--r--l10n/sr/user_ldap.po89
-rw-r--r--l10n/sr@latin/user_ldap.po89
-rw-r--r--l10n/sv/user_ldap.po89
-rw-r--r--l10n/ta_LK/user_ldap.po87
-rw-r--r--l10n/templates/core.pot34
-rw-r--r--l10n/templates/files.pot2
-rw-r--r--l10n/templates/files_encryption.pot2
-rw-r--r--l10n/templates/files_external.pot2
-rw-r--r--l10n/templates/files_sharing.pot2
-rw-r--r--l10n/templates/files_versions.pot2
-rw-r--r--l10n/templates/lib.pot2
-rw-r--r--l10n/templates/settings.pot2
-rw-r--r--l10n/templates/user_ldap.pot83
-rw-r--r--l10n/templates/user_webdavauth.pot2
-rw-r--r--l10n/th_TH/user_ldap.po89
-rw-r--r--l10n/tr/user_ldap.po89
-rw-r--r--l10n/uk/user_ldap.po87
-rw-r--r--l10n/vi/user_ldap.po87
-rw-r--r--l10n/zh_CN.GB2312/user_ldap.po87
-rw-r--r--l10n/zh_CN/user_ldap.po87
-rw-r--r--l10n/zh_HK/user_ldap.po87
-rw-r--r--l10n/zh_TW/user_ldap.po87
-rw-r--r--l10n/zu_ZA/user_ldap.po87
78 files changed, 3349 insertions, 2526 deletions
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 51ea5c8216f..6a78dcfd054 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 23f9ad3829b..7d102e98bdf 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: bg_BG\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 78f5bcc2ccd..9aea1eefd76 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -8,164 +8,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 13:55+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Màquina"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN Base"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN Usuari"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "La DN de l'usuari client amb la que s'haurà de fer, per exemple uid=agent,dc=exemple,dc=com. Per un accés anònim, deixeu la DN i la contrasenya en blanc."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Contrasenya"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Per un accés anònim, deixeu la DN i la contrasenya en blanc."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtre d'inici de sessió d'usuari"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Defineix el filtre a aplicar quan s'intenta l'inici de sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "useu el paràmetre de substitució %%uid, per exemple \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Llista de filtres d'usuari"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Defineix el filtre a aplicar quan es mostren usuaris"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=persona\""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtre de grup"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Defineix el filtre a aplicar quan es mostren grups."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Arbre base d'usuaris"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Arbre base de grups"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Associació membres-grup"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Usa TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "No ho useu en connexions SSL, fallarà."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Desactiva la validació de certificat SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Si la connexió només funciona amb aquesta opció, importeu el certificat SSL del servidor LDAP en el vostre servidor ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "No recomanat, ús només per proves."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Camp per mostrar el nom d'usuari"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atribut LDAP a usar per generar el nom d'usuari ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Camp per mostrar el nom del grup"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atribut LDAP a usar per generar el nom de grup ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "en segons. Un canvi buidarà la memòria de cau."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 808367304a8..ccae79fe8d9 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 13:37+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,153 +20,166 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Počítač"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Základní DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Uživatelské DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "DN klentského uživatele ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte údaje DN and Heslo prázdné."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Heslo"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Pro anonymní přístup, ponechte údaje DN and heslo prázdné."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtr přihlášení uživatelů"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "použijte zástupný vzor %%uid, např. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filtr uživatelských seznamů"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Určuje použitý filtr, pro získávaní uživatelů."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "bez zástupných znaků, např. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtr skupin"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Určuje použitý filtr, pro získávaní skupin."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "bez zástupných znaků, např. \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Základní uživatelský strom"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Základní skupinový strom"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asociace člena skupiny"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Použít TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Nepoužívejte pro připojení pomocí SSL, připojení selže."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP server nerozlišující velikost znaků (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Vypnout ověřování SSL certifikátu."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Pokud připojení pracuje pouze s touto možností, tak importujte SSL certifikát SSL serveru do Vašeho serveru ownCloud"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Není doporučeno, pouze pro testovací účely."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Pole pro zobrazované jméno uživatele"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atribut LDAP použitý k vytvoření jména uživatele ownCloud"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Pole pro zobrazení jména skupiny"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atribut LDAP použitý k vytvoření jména skupiny ownCloud"
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "v bajtech"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "ve vteřinách. Změna vyprázdní vyrovnávací paměť."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Nápověda"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 95a083e9f1e..00ec233a6eb 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-24 02:02+0200\n"
-"PO-Revision-Date: 2012-10-23 09:31+0000\n"
-"Last-Translator: Frederik Lassen <frederiklassen@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,153 +21,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Bruger DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Kodeord"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Brug TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Anbefales ikke, brug kun for at teste."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Hjælp"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index fa82ef3b2e6..0913372a1d7 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -7,6 +7,7 @@
# <alex.hotz@gmail.com>, 2011.
# <blobbyjj@ymail.com>, 2012.
# <georg.stefan.germany@googlemail.com>, 2011.
+# I Robot <owncloud-bot@tmit.eu>, 2012.
# I Robot <thomas.mueller@tmit.eu>, 2012.
# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
# <mail@felixmoeller.de>, 2012.
@@ -21,8 +22,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 16:40+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
@@ -220,18 +221,18 @@ msgstr "Über einen Link freigeben"
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "Passwort"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Link per E-Mail verschicken"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Senden"
#: js/share.js:177
msgid "Set expiration date"
@@ -299,11 +300,11 @@ msgstr "Fehler beim Setzen des Ablaufdatums"
#: js/share.js:568
msgid "Sending ..."
-msgstr ""
+msgstr "Sende ..."
#: js/share.js:579
msgid "Email sent"
-msgstr ""
+msgstr "E-Mail wurde verschickt"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -325,8 +326,8 @@ msgstr "Die E-Mail zum Zurücksetzen wurde versendet."
msgid "Request failed!"
msgstr "Die Anfrage schlug fehl!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "Benutzername"
@@ -415,44 +416,44 @@ msgstr "Dein Datenverzeichnis und deine Datein sind vielleicht vom Internet aus
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>Administrator-Konto</strong> anlegen"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Fortgeschritten"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Datenverzeichnis"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Datenbank einrichten"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "wird verwendet"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Datenbank-Benutzer"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Datenbank-Passwort"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Datenbank-Name"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Datenbank-Tablespace"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Datenbank-Host"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Installation abschließen"
@@ -558,11 +559,11 @@ msgstr "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen."
msgid "Lost your password?"
msgstr "Passwort vergessen?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "merken"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "Einloggen"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 71044b0d502..cea509ce041 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 09:13+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,153 +24,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Basis-DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Benutzer-DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lasse DN und Passwort leer."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Passwort"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Lasse die Felder von DN und Passwort für anonymen Zugang leer."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Benutzer-Login-Filter"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Benutzer-Filter-Liste"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definiert den Filter für die Anfrage der Benutzer."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Gruppen-Filter"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definiert den Filter für die Anfrage der Gruppen."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Basis-Benutzerbaum"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Basis-Gruppenbaum"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Assoziation zwischen Gruppe und Benutzer"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Nutze TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Verwende dies nicht für SSL-Verbindungen, es wird fehlschlagen."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Schalte die SSL-Zertifikatsprüfung aus."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Nicht empfohlen, nur zu Testzwecken."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Feld für den Anzeigenamen des Benutzers"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. "
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Feld für den Anzeigenamen der Gruppe"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. "
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "in Bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "in Sekunden. Eine Änderung leert den Cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Hilfe"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index f106dc2fb2a..faa7f085445 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -7,6 +7,7 @@
# <alex.hotz@gmail.com>, 2011.
# <a.tangemann@web.de>, 2012.
# <blobbyjj@ymail.com>, 2012.
+# <deh3nne@deviantdev.com>, 2012.
# <georg.stefan.germany@googlemail.com>, 2011.
# I Robot <thomas.mueller@tmit.eu>, 2012.
# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
@@ -21,9 +22,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 12:15+0000\n"
+"Last-Translator: deh3nne <deh3nne@deviantdev.com>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -34,26 +35,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Der Nutzer %s teilt eine Datei mit dir"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Der Nutzer %s teilt einen Ordner mit dir"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "Der Nutzer %s teilt die Datei \"%s\" mit dir. Du kannst diese hier herunterladen: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "Der Nutzer %s teilt den Ornder \"%s\" mit dir. Du kannst diesen hier herunterladen: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -220,18 +221,18 @@ msgstr "Über einen Link freigeben"
msgid "Password protect"
msgstr "Passwortschutz"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "Passwort"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Link per Mail an Person schicken"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Senden"
#: js/share.js:177
msgid "Set expiration date"
@@ -299,11 +300,11 @@ msgstr "Fehler beim Setzen des Ablaufdatums"
#: js/share.js:568
msgid "Sending ..."
-msgstr ""
+msgstr "Sende ..."
#: js/share.js:579
msgid "Email sent"
-msgstr ""
+msgstr "Email gesendet"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -325,8 +326,8 @@ msgstr "E-Mail zum Zurücksetzen des Passworts gesendet."
msgid "Request failed!"
msgstr "Die Anfrage schlug fehl!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "Benutzername"
@@ -415,44 +416,44 @@ msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich über das Inte
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>Administrator-Konto</strong> anlegen"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Fortgeschritten"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Datenverzeichnis"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Datenbank einrichten"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "wird verwendet"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Datenbank-Benutzer"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Datenbank-Passwort"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Datenbank-Name"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Datenbank-Tablespace"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Datenbank-Host"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Installation abschließen"
@@ -558,11 +559,11 @@ msgstr "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern."
msgid "Lost your password?"
msgstr "Passwort vergessen?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "merken"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "Einloggen"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 430a4290235..8e59bdac23d 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 21:41+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,153 +24,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Basis-DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Sie können Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Benutzer-DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lassen Sie DN und Passwort leer."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Passwort"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Lassen Sie die Felder von DN und Passwort für anonymen Zugang leer."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Benutzer-Login-Filter"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "verwenden Sie %%uid Platzhalter, z. B. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Benutzer-Filter-Liste"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definiert den Filter für die Anfrage der Benutzer."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Gruppen-Filter"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definiert den Filter für die Anfrage der Gruppen."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Basis-Benutzerbaum"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Basis-Gruppenbaum"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Assoziation zwischen Gruppe und Benutzer"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Nutze TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Verwenden Sie dies nicht für SSL-Verbindungen, es wird fehlschlagen."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Schalten Sie die SSL-Zertifikatsprüfung aus."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Nicht empfohlen, nur zu Testzwecken."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Feld für den Anzeigenamen des Benutzers"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. "
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Feld für den Anzeigenamen der Gruppe"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. "
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "in Bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "in Sekunden. Eine Änderung leert den Cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Hilfe"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 4712df12fdd..cea052cafa1 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 06:46+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,153 +21,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "User DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Συνθηματικό"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "User Login Filter"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "User List Filter"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Group Filter"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Θύρα"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Base User Tree"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Base Group Tree"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Group-Member association"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Χρήση TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Δεν προτείνεται, χρήση μόνο για δοκιμές."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Πεδίο Ονόματος Χρήστη"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Group Display Name Field"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "σε bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Βοήθεια"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 0f048daf6be..419be520bc0 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-14 02:05+0200\n"
-"PO-Revision-Date: 2012-10-13 05:41+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Gastigo"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Baz-DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Uzanto-DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Pasvorto"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtrilo de uzantensaluto"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Ĝi difinas la filtrilon aplikotan, kiam oni provas ensaluti. %%uid anstataŭigas la uzantonomon en la ensaluta ago."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "uzu la referencilon %%uid, ekz.: \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filtrilo de uzantolisto"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas uzantoj."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sen ajna referencilo, ekz.: \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtrilo de grupo"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas grupoj."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sen ajna referencilo, ekz.: \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Pordo"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Baza uzantarbo"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Baza gruparbo"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asocio de grupo kaj membro"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Uzi TLS-on"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Ne uzu ĝin por SSL-konektoj, ĝi malsukcesos."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-servilo blinda je litergrandeco (Vindozo)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Malkapabligi validkontrolon de SSL-atestiloj."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Se la konekto nur funkcias kun ĉi tiu malnepro, enportu la SSL-atestilo de la LDAP-servilo en via ownCloud-servilo."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Ne rekomendata, uzu ĝin nur por testoj."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Kampo de vidignomo de uzanto"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la uzanto."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Kampo de vidignomo de grupo"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la grupo."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "duumoke"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lasu malplena por uzantonomo (defaŭlto). Alie, specifu LDAP/AD-atributon."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Helpo"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index c4ac4a05389..3aebf45effa 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -6,6 +6,7 @@
# <javierkaiser@gmail.com>, 2012.
# Javier Llorente <javier@opensuse.org>, 2012.
# <juanma@kde.org.ar>, 2011-2012.
+# <malmirk@gmail.com>, 2012.
# oSiNaReF <>, 2012.
# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
# <rodrigo.calvo@gmail.com>, 2012.
@@ -17,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 11:51+0000\n"
+"Last-Translator: malmirk <malmirk@gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,26 +31,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "El usuario %s ha compartido un archivo contigo"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "El usuario %s ha compartido una carpeta contigo"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "El usuario %s ha compartido el archivo \"%s\" contigo. Puedes descargarlo aquí: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "El usuario %s ha compartido la carpeta \"%s\" contigo. Puedes descargarla aquí: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -216,18 +217,18 @@ msgstr "Compartir con enlace"
msgid "Password protect"
msgstr "Protegido por contraseña"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "Contraseña"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Enviar un enlace por correo electrónico a una persona"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Enviar"
#: js/share.js:177
msgid "Set expiration date"
@@ -295,11 +296,11 @@ msgstr "Error estableciendo fecha de caducidad"
#: js/share.js:568
msgid "Sending ..."
-msgstr ""
+msgstr "Enviando..."
#: js/share.js:579
msgid "Email sent"
-msgstr ""
+msgstr "Correo electrónico enviado"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -321,8 +322,8 @@ msgstr "Email de reconfiguración enviado."
msgid "Request failed!"
msgstr "Pedido fallado!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "Nombre de usuario"
@@ -411,44 +412,44 @@ msgstr "Su directorio de datos y sus archivos están probablemente accesibles de
msgid "Create an <strong>admin account</strong>"
msgstr "Crea una <strong>cuenta de administrador</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Avanzado"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Directorio de almacenamiento"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Configurar la base de datos"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "se utilizarán"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Usuario de la base de datos"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Contraseña de la base de datos"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Nombre de la base de datos"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Espacio de tablas de la base de datos"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Host de la base de datos"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Completar la instalación"
@@ -554,11 +555,11 @@ msgstr "Por favor cambie su contraseña para asegurar su cuenta nuevamente."
msgid "Lost your password?"
msgstr "¿Has perdido tu contraseña?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "recuérdame"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "Entrar"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index fdf3b2be402..764ee2f3365 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 14:15+0000\n"
-"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,153 +23,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Servidor"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN usuario"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, deje DN y contraseña vacíos."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Contraseña"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para acceso anónimo, deje DN y contraseña vacíos."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtro de inicio de sesión de usuario"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazrá el nombre de usuario en el proceso de login."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "usar %%uid como placeholder, ej: \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Lista de filtros de usuario"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "Sin placeholder, ej: \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtro de grupo"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Define el filtro a aplicar, cuando se obtienen grupos."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "Con cualquier placeholder, ej: \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Puerto"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Árbol base de usuario"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Árbol base de grupo"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asociación Grupo-Miembro"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "No usarlo para SSL, habrá error."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Apagar la validación por certificado SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "No recomendado, sólo para pruebas."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Campo de nombre de usuario a mostrar"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Campo de nombre de grupo a mostrar"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "en segundos. Un cambio vacía la cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Ayuda"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 218284e3da9..80ab2e1f1f5 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-25 02:02+0200\n"
-"PO-Revision-Date: 2012-09-24 22:51+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Servidor"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN usuario"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, dejá DN y contraseña vacíos."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Contraseña"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para acceso anónimo, dejá DN y contraseña vacíos."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtro de inicio de sesión de usuario"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazará el nombre de usuario en el proceso de inicio de sesión."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "usar %%uid como plantilla, p. ej.: \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Lista de filtros de usuario"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "Sin plantilla, p. ej.: \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtro de grupo"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Define el filtro a aplicar cuando se obtienen grupos."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Puerto"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Árbol base de usuario"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Árbol base de grupo"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asociación Grupo-Miembro"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "No usarlo para SSL, dará error."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Desactivar la validación por certificado SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Si la conexión sólo funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "No recomendado, sólo para pruebas."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Campo de nombre de usuario a mostrar"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Campo de nombre de grupo a mostrar"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "en segundos. Cambiarlo vacía la cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Ayuda"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index ccccf7cb20a..c8207cb0467 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-30 00:01+0100\n"
-"PO-Revision-Date: 2012-10-29 22:48+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Baas DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaardilt"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Kasutaja DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "Klientkasutaja DN, kellega seotakse, nt. uid=agent,dc=näidis,dc=com. Anonüümseks ligipääsuks jäta DN ja parool tühjaks."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Parool"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Anonüümseks ligipääsuks jäta DN ja parool tühjaks."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Kasutajanime filter"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Kasutajate nimekirja filter"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Määrab kasutajaid hankides filtri, mida rakendatakse."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Grupi filter"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Määrab gruppe hankides filtri, mida rakendatakse."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Baaskasutaja puu"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Baasgrupi puu"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Grupiliikme seotus"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Kasutaja TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Ära kasuta seda SSL ühenduse jaoks, see ei toimi."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Mittetõstutundlik LDAP server (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Lülita SSL sertifikaadi kontrollimine välja."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma ownCloud serverisse."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Pole soovitatav, kasuta ainult testimiseks."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Kasutaja näidatava nime väli"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP omadus, mida kasutatakse kasutaja ownCloudi nime loomiseks."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Grupi näidatava nime väli"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP omadus, mida kasutatakse ownCloudi grupi nime loomiseks."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "baitides"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "sekundites. Muudatus tühjendab vahemälu."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Abiinfo"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index a8b8ab93ae8..262c0ba4f38 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -8,164 +8,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 21:29+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: eu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Hostalaria"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Oinarrizko DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Erabiltzaile DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Pasahitza"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Erabiltzaileen saioa hasteko iragazkia"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "erabili %%uid txantiloia, adb. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Erabiltzaile zerrendaren Iragazkia"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "txantiloirik gabe, adb. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Taldeen iragazkia"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "txantiloirik gabe, adb. \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Portua"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Oinarrizko Erabiltzaile Zuhaitza"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Oinarrizko Talde Zuhaitza"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Talde-Kide elkarketak"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Erabili TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Ez erabili SSL konexioetan, huts egingo du."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Ezgaitu SSL ziurtagirien egiaztapena."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Ez da aholkatzen, erabili bakarrik frogak egiteko."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Erabiltzaileen bistaratzeko izena duen eremua"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "ownCloud erabiltzailearen izena sortzeko erabiliko den LDAP atributua"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Taldeen bistaratzeko izena duen eremua"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "ownCloud taldearen izena sortzeko erabiliko den LDAP atributua"
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "bytetan"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "segundutan. Aldaketak katxea husten du."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Laguntza"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 4a711bf2019..f7e8c607e27 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -8,164 +8,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "میزبانی"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "رمز عبور"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "راه‌نما"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index e57ca7e117c..c7c2c1c4a14 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 13:22+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -213,18 +213,18 @@ msgstr "Jaa linkillä"
msgid "Password protect"
msgstr "Suojaa salasanalla"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "Salasana"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Lähetä linkki sähköpostitse"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "Lähetä"
#: js/share.js:177
msgid "Set expiration date"
@@ -292,11 +292,11 @@ msgstr "Virhe päättymispäivää asettaessa"
#: js/share.js:568
msgid "Sending ..."
-msgstr ""
+msgstr "Lähetetään..."
#: js/share.js:579
msgid "Email sent"
-msgstr ""
+msgstr "Sähköposti lähetetty"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -318,8 +318,8 @@ msgstr ""
msgid "Request failed!"
msgstr "Pyyntö epäonnistui!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "Käyttäjätunnus"
@@ -408,44 +408,44 @@ msgstr "Data-kansio ja tiedostot ovat ehkä saavutettavissa Internetistä. .htac
msgid "Create an <strong>admin account</strong>"
msgstr "Luo <strong>ylläpitäjän tunnus</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Lisäasetukset"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Datakansio"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Muokkaa tietokantaa"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "käytetään"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Tietokannan käyttäjä"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Tietokannan salasana"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Tietokannan nimi"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Tietokannan taulukkotila"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Tietokantapalvelin"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Viimeistele asennus"
@@ -551,11 +551,11 @@ msgstr "Vaihda salasanasi suojataksesi tilisi uudelleen."
msgid "Lost your password?"
msgstr "Unohditko salasanasi?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "muista"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "Kirjaudu sisään"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 085ca3dd65b..6f821f095c1 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 10:56+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,153 +21,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Isäntä"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Voit jättää protokollan määrittämättä, paitsi kun vaadit SSL:ää. Aloita silloin ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Oletus DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset'-välilehdeltä "
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Käyttäjän DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "Asiakasohjelman DN, jolla yhdistäminen tehdään, ts. uid=agent,dc=example,dc=com. Mahdollistaaksesi anonyymin yhteyden, jätä DN ja salasana tyhjäksi."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Salasana"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi "
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Login suodatus"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Määrittelee käytettävän suodattimen, kun sisäänkirjautumista yritetään. %%uid korvaa sisäänkirjautumisessa käyttäjätunnuksen."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "käytä %%uid paikanvaraajaa, ts. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Käyttäjien suodatus"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Määrittelee käytettävän suodattimen, kun käyttäjiä haetaan. "
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ilman paikanvaraustermiä, ts. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Ryhmien suodatus"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Määrittelee käytettävän suodattimen, kun ryhmiä haetaan. "
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ilman paikanvaraustermiä, ts. \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Portti"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Oletuskäyttäjäpuu"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Ryhmien juuri"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Ryhmän ja jäsenen assosiaatio (yhteys)"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Käytä TLS:ää"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Älä käytä SSL-yhteyttä varten, se epäonnistuu. "
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Kirjainkoosta piittamaton LDAP-palvelin (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Poista käytöstä SSL-varmenteen vahvistus"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Jos yhteys toimii vain tällä valinnalla, siirrä LDAP-palvelimen SSL-varmenne ownCloud-palvelimellesi."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Ei suositella, käytä vain testausta varten."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Käyttäjän näytettävän nimen kenttä"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP-attribuutti, jota käytetään käyttäjän ownCloud-käyttäjänimenä "
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Ryhmän \"näytettävä nimi\"-kenttä"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP-attribuutti, jota käytetään luomaan ryhmän ownCloud-nimi"
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "tavuissa"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "sekunneissa. Muutos tyhjentää välimuistin."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Ohje"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 7fca3da0d59..fee57ce5e39 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -12,164 +12,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 08:51+0000\n"
-"Last-Translator: Windes <windes@tructor.net>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Hôte"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN Racine"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Vous pouvez détailler les DN Racines de vos utilisateurs et groupes dans l'onglet Avancé"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN Utilisateur (Autorisé à consulter l'annuaire)"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "Le DN de l'utilisateur client avec lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour l'accès anonyme, laisser le DN et le mot de passe vides."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Mot de passe"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Modèle d'authentification utilisateurs"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filtre d'utilisateurs"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sans élément de substitution, par exemple \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtre de groupes"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Définit le filtre à appliquer lors de la récupération des groupes."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "DN racine de l'arbre utilisateurs"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "DN racine de l'arbre groupes"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Association groupe-membre"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Utiliser TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Ne pas utiliser pour les connexions SSL, car cela échouera."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Serveur LDAP insensible à la casse (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Désactiver la validation du certificat SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Non recommandé, utilisation pour tests uniquement."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Champ \"nom d'affichage\" de l'utilisateur"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Champ \"nom d'affichage\" du groupe"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "en octets"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "en secondes. Tout changement vide le cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Laisser vide "
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Aide"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 8f640a984aa..e61cf22989a 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-08 00:09+0100\n"
-"PO-Revision-Date: 2012-12-06 11:45+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,153 +20,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Servidor"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Pode especificar a DN base para usuarios e grupos na lapela de «Avanzado»"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN do usuario"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "O DN do cliente do usuario co que hai que estabelecer unha conexión, p.ex uid=axente, dc=exemplo, dc=com. Para o acceso en anónimo de o DN e o contrasinal baleiros."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Contrasinal"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para o acceso anónimo deixe o DN e o contrasinal baleiros."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtro de acceso de usuarios"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "usar a marca de posición %%uid, p.ex «uid=%%uid»"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filtro da lista de usuarios"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Define o filtro a aplicar cando se recompilan os usuarios."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sen ningunha marca de posición, como p.ex «objectClass=persoa»."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtro de grupo"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Define o filtro a aplicar cando se recompilan os grupos."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix»."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Porto"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Base da árbore de usuarios"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Base da árbore de grupo"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asociación de grupos e membros"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Non empregualo para conexións SSL: fallará."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Desactiva a validación do certificado SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Non se recomenda. Só para probas."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Campo de mostra do nome de usuario"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "O atributo LDAP a empregar para xerar o nome de usuario de ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Campo de mostra do nome de grupo"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "O atributo LDAP úsase para xerar os nomes dos grupos de ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "en segundos. Calquera cambio baleira a caché."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Axuda"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 88370513135..fb4f06d8441 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 1ca5b6139b6..ae9f03b0212 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index a7e026ac791..5861922d336 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index cacb371b1b5..330b4cd1465 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hu_HU\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 73b531764ae..cae53dce374 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ia\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 8069104219e..193df390395 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-22 02:02+0200\n"
-"PO-Revision-Date: 2012-10-21 05:36+0000\n"
-"Last-Translator: elmakong <mr.pige_ina@yahoo.co.id>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "kata kunci"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "gunakan saringan login"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "saringan grup"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "gunakan TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "jangan gunakan untuk koneksi SSL, itu akan gagal."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "matikan validasi sertivikat SSL"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "tidak disarankan, gunakan hanya untuk pengujian."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "dalam bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "dalam detik. perubahan mengosongkan cache"
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "bantuan"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 469ae8a332d..06ab3b51ea6 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-06 00:11+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 7dedc7efb1e..d1d6f74af3f 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
-"PO-Revision-Date: 2012-12-13 09:09+0000\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 08:54+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
@@ -211,14 +211,14 @@ msgstr "Condividi con collegamento"
msgid "Password protect"
msgstr "Proteggi con password"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "Password"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "Invia collegamento via email"
#: js/share.js:173
msgid "Send"
@@ -316,8 +316,8 @@ msgstr "Email di ripristino inviata."
msgid "Request failed!"
msgstr "Richiesta non riuscita!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "Nome utente"
@@ -406,44 +406,44 @@ msgstr "La cartella dei dati e i tuoi file sono probabilmente accessibili da Int
msgid "Create an <strong>admin account</strong>"
msgstr "Crea un <strong>account amministratore</strong>"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "Avanzate"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "Cartella dati"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "Configura il database"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "sarà utilizzato"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "Utente del database"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "Password del database"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "Nome del database"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "Spazio delle tabelle del database"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "Host del database"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "Termina la configurazione"
@@ -549,11 +549,11 @@ msgstr "Cambia la password per rendere nuovamente sicuro il tuo account."
msgid "Lost your password?"
msgstr "Hai perso la password?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "ricorda"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "Accedi"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 9c8655920c6..43fae95bfb9 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -9,164 +9,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 05:37+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN utente"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agent,dc=example,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Password"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtro per l'accesso utente"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "utilizza il segnaposto %%uid, ad esempio \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filtro per l'elenco utenti"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Specifica quale filtro utilizzare durante il recupero degli utenti."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "senza nessun segnaposto, per esempio \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtro per il gruppo"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Specifica quale filtro utilizzare durante il recupero dei gruppi."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "senza nessun segnaposto, per esempio \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Porta"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Struttura base dell'utente"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Struttura base del gruppo"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Associazione gruppo-utente "
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Usa TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Non utilizzare per le connessioni SSL, fallirà."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Case insensitve LDAP server (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Disattiva il controllo del certificato SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Non consigliato, utilizzare solo per test."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Campo per la visualizzazione del nome utente"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "L'attributo LDAP da usare per generare il nome dell'utente ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Campo per la visualizzazione del nome del gruppo"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "L'attributo LDAP da usare per generare il nome del gruppo ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "in byte"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "in secondi. Il cambio svuota la cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Aiuto"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index a60188539af..ae1bd30ee44 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -4,14 +4,15 @@
#
# Translators:
# Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012.
# <tetuyano+transi@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 11:56+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,26 +23,26 @@ msgstr ""
#: ajax/share.php:84
#, php-format
msgid "User %s shared a file with you"
-msgstr ""
+msgstr "ユーザ %s はあなたとファイルを共有しています"
#: ajax/share.php:86
#, php-format
msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "ユーザ %s はあなたとフォルダを共有しています"
#: ajax/share.php:88
#, php-format
msgid ""
"User %s shared the file \"%s\" with you. It is available for download here: "
"%s"
-msgstr ""
+msgstr "ユーザ %s はあなたとファイル \"%s\" を共有しています。こちらからダウンロードできます: %s"
#: ajax/share.php:90
#, php-format
msgid ""
"User %s shared the folder \"%s\" with you. It is available for download "
"here: %s"
-msgstr ""
+msgstr "ユーザ %s はあなたとフォルダ \"%s\" を共有しています。こちらからダウンロードできます: %s"
#: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
msgid "Category type not provided."
@@ -208,18 +209,18 @@ msgstr "URLリンクで共有"
msgid "Password protect"
msgstr "パスワード保護"
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr "パスワード"
#: js/share.js:172
msgid "Email link to person"
-msgstr ""
+msgstr "メールリンク"
#: js/share.js:173
msgid "Send"
-msgstr ""
+msgstr "送信"
#: js/share.js:177
msgid "Set expiration date"
@@ -287,11 +288,11 @@ msgstr "有効期限の設定でエラー発生"
#: js/share.js:568
msgid "Sending ..."
-msgstr ""
+msgstr "送信中..."
#: js/share.js:579
msgid "Email sent"
-msgstr ""
+msgstr "メールを送信しました"
#: lostpassword/controller.php:47
msgid "ownCloud password reset"
@@ -313,8 +314,8 @@ msgstr "リセットメールを送信します。"
msgid "Request failed!"
msgstr "リクエスト失敗!"
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr "ユーザ名"
@@ -403,44 +404,44 @@ msgstr "データディレクトリとファイルが恐らくインターネッ
msgid "Create an <strong>admin account</strong>"
msgstr "<strong>管理者アカウント</strong>を作成してください"
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr "詳細設定"
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr "データフォルダ"
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr "データベースを設定してください"
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr "が使用されます"
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr "データベースのユーザ名"
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr "データベースのパスワード"
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr "データベース名"
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr "データベースの表領域"
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr "データベースのホスト名"
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr "セットアップを完了します"
@@ -546,11 +547,11 @@ msgstr "アカウント保護の為、パスワードを再度の変更をお願
msgid "Lost your password?"
msgstr "パスワードを忘れましたか?"
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr "パスワードを記憶する"
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr "ログイン"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index bd04cb5c537..2a88e6fa060 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 02:03+0200\n"
-"PO-Revision-Date: 2012-10-01 08:48+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,153 +20,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "ホスト"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "ベースDN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "拡張タブでユーザとグループのベースDNを指定することができます。"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "ユーザDN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "クライアントユーザーのDNは、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "パスワード"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "匿名アクセスの場合は、DNとパスワードを空にしてください。"
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "ユーザログインフィルタ"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "ログインするときに適用するフィルターを定義する。%%uid がログイン時にユーザー名に置き換えられます。"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "%%uid プレースホルダーを利用してください。例 \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "ユーザリストフィルタ"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "ユーザーを取得するときに適用するフィルターを定義する。"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "プレースホルダーを利用しないでください。例 \"objectClass=person\""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "グループフィルタ"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "グループを取得するときに適用するフィルターを定義する。"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "ポート"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "ベースユーザツリー"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "ベースグループツリー"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "グループとメンバーの関連付け"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "TLSを利用"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "SSL接続に利用しないでください、失敗します。"
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "大文字/小文字を区別しないLDAPサーバ(Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "SSL証明書の確認を無効にする。"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "接続がこのオプションでのみ動作する場合は、LDAPサーバのSSL証明書をownCloudサーバにインポートしてください。"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "推奨しません、テスト目的でのみ利用してください。"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "ユーザ表示名のフィールド"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "ユーザのownCloud名の生成に利用するLDAP属性。"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "グループ表示名のフィールド"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "グループのownCloud名の生成に利用するLDAP属性。"
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "バイト"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "秒。変更後にキャッシュがクリアされます。"
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "ユーザ名を空のままにしてください(デフォルト)。そうでない場合は、LDAPもしくはADの属性を指定してください。"
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "ヘルプ"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index bdf29a00b31..0df8aa5b1a4 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-22 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index f9102c199e2..b10823d7147 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-10 00:11+0100\n"
-"PO-Revision-Date: 2012-12-09 06:10+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,153 +20,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "호스트"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "SSL을 사용하는 경우가 아니라면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오."
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "기본 DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "고급 탭에서 사용자 및 그룹에 대한 기본 DN을 지정할 수 있습니다."
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "사용자 DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "바인딩 작업을 수행할 클라이언트 사용자 DN입니다. 예를 들어서 uid=agent,dc=example,dc=com입니다. 익명 접근을 허용하려면 DN과 암호를 비워 두십시오."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "암호"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "익명 접근을 허용하려면 DN과 암호를 비워 두십시오."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "사용자 로그인 필터"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "로그인을 시도할 때 적용할 필터입니다. %%uid는 로그인 작업에서의 사용자 이름으로 대체됩니다."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "%%uid 자리 비움자를 사용하십시오. 예제: \"uid=%%uid\"\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "사용자 목록 필터"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "사용자를 검색할 때 적용할 필터를 정의합니다."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=person\""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "그룹 필터"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "그룹을 검색할 때 적용할 필터를 정의합니다."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "포트"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "기본 사용자 트리"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "기본 그룹 트리"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "그룹-회원 연결"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "TLS 사용"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "SSL 연결 시 사용하는 경우 연결되지 않습니다."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "서버에서 대소문자를 구분하지 않음 (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "SSL 인증서 유효성 검사를 해제합니다."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "이 옵션을 사용해야 연결할 수 있는 경우에는 LDAP 서버의 SSL 인증서를 ownCloud로 가져올 수 있습니다."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "추천하지 않음, 테스트로만 사용하십시오."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "사용자의 표시 이름 필드"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP 속성은 사용자의 ownCloud 이름을 생성하기 위해 사용합니다."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "그룹의 표시 이름 필드"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP 속성은 그룹의 ownCloud 이름을 생성하기 위해 사용합니다."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "바이트"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "초. 항목 변경 시 캐시가 갱신됩니다."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "사용자 이름을 사용하려면 비워 두십시오(기본값). 기타 경우 LDAP/AD 속성을 지정하십시오."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "도움말"
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index bfa7aee57b7..f4e484f84f7 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-07 02:03+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index ea1a1452c6f..be1657cb3d3 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: lb\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 7e15e309ec7..9891d24f372 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -8,164 +8,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: lt_LT\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Slaptažodis"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Grupės filtras"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Prievadas"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Naudoti TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Išjungti SSL sertifikato tikrinimą."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Nerekomenduojama, naudokite tik testavimui."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Pagalba"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 2ec176f9288..b0d8f36bed3 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 126d33adf67..d1eddd1fb0c 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: mk\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index e0ec2850865..4509f10da64 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ms_MY\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 1ebfbe8b544..b415afa31aa 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-31 00:01+0100\n"
-"PO-Revision-Date: 2012-10-30 13:08+0000\n"
-"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Passord"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Gruppefilter"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Bruk TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Ikke bruk for SSL tilkoblinger, dette vil ikke fungere."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Ikke anbefalt, bruk kun for testing"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "i bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "i sekunder. En endring tømmer bufferen."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Hjelp"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index e6819a76937..a608c7eddea 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-13 00:05+0100\n"
-"PO-Revision-Date: 2012-11-12 09:35+0000\n"
-"Last-Translator: Len <lenny@weijl.org>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Basis DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Je kunt het standaard DN voor gebruikers en groepen specificeren in het tab Geavanceerd."
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Gebruikers DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "De DN van de client gebruiker waarmee de verbinding zal worden gemaakt, bijv. uid=agent,dc=example,dc=com. Voor anonieme toegang laat je het DN en het wachtwoord leeg."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Wachtwoord"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Voor anonieme toegang, laat de DN en het wachtwoord leeg."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Gebruikers Login Filter"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Definiëerd de toe te passen filter indien er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam in de login actie."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "gebruik %%uid placeholder, bijv. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Gebruikers Lijst Filter"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definiëerd de toe te passen filter voor het ophalen van gebruikers."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "zonder een placeholder, bijv. \"objectClass=person\""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Groep Filter"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definiëerd de toe te passen filter voor het ophalen van groepen."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "zonder een placeholder, bijv. \"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Poort"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Basis Gebruikers Structuur"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Basis Groupen Structuur"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Groepslid associatie"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Gebruik TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Gebruik niet voor SSL connecties, deze mislukken."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Niet-hoofdlettergevoelige LDAP server (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Schakel SSL certificaat validatie uit."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar je ownCloud server."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Niet aangeraden, gebruik alleen voor test doeleinden."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Gebruikers Schermnaam Veld"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de gebruikers."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Groep Schermnaam Veld"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de groepen."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "in bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "in seconden. Een verandering maakt de cache leeg."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Help"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 2d5b008d920..7f064cb1e25 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: nn_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index e4321202c2f..29bd7864d7e 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-08 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index d351bc786e2..cc48efb7dfe 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -9,164 +9,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 15:50+0000\n"
-"Last-Translator: Paweł Ciecierski <pciecierski@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Baza DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Użytkownik DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "DN użytkownika klienta, z którym powiązanie wykonuje się, np. uid=agent,dc=example,dc=com. Dla dostępu anonimowego pozostawić DN i hasło puste"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Hasło"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Dla dostępu anonimowego pozostawić DN i hasło puste."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtr logowania użytkownika"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Definiuje filtr do zastosowania, gdy podejmowana jest próba logowania. %%uid zastępuje nazwę użytkownika w działaniu logowania."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "Użyj %%uid zastępczy, np. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Lista filtrów użytkownika"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definiuje filtry do zastosowania, podczas pobierania użytkowników."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "bez żadnych symboli zastępczych np. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Grupa filtrów"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definiuje filtry do zastosowania, podczas pobierania grup."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "bez żadnych symboli zastępczych np. \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Drzewo bazy użytkowników"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Drzewo bazy grup"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Członek grupy stowarzyszenia"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Użyj TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Nie używaj SSL dla połączeń, jeśli się nie powiedzie."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Wielkość liter serwera LDAP (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Wyłączyć sprawdzanie poprawności certyfikatu SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP w serwerze ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Niezalecane, użyj tylko testowo."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Pole wyświetlanej nazwy użytkownika"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atrybut LDAP służy do generowania nazwy użytkownika ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Pole wyświetlanej nazwy grupy"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atrybut LDAP służy do generowania nazwy grup ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "w bajtach"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "w sekundach. Zmiana opróżnia pamięć podręczną."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Pomoc"
diff --git a/l10n/pl_PL/user_ldap.po b/l10n/pl_PL/user_ldap.po
index 554396a6fe0..de4bd2f3523 100644
--- a/l10n/pl_PL/user_ldap.po
+++ b/l10n/pl_PL/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index ddfc711b8ea..fdd9c02d90a 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
-"PO-Revision-Date: 2012-09-23 17:35+0000\n"
-"Last-Translator: sedir <philippi.sedir@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Host"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN Base"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Você pode especificar DN Base para usuários e grupos na guia Avançada"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN Usuário"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "O DN do cliente usuário com qual a ligação deverá ser feita, ex. uid=agent,dc=example,dc=com. Para acesso anônimo, deixe DN e Senha vazios."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Senha"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para acesso anônimo, deixe DN e Senha vazios."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtro de Login de Usuário"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Define o filtro pra aplicar ao efetuar uma tentativa de login. %%uuid substitui o nome de usuário na ação de login."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "use %%uid placeholder, ex. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filtro de Lista de Usuário"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Define filtro a aplicar ao obter usuários."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sem nenhum espaço reservado, ex. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtro de Grupo"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Define o filtro a aplicar ao obter grupos."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sem nenhum espaço reservado, ex. \"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Porta"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Árvore de Usuário Base"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Árvore de Grupo Base"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Associação Grupo-Membro"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Não use-o para conexões SSL, pois falhará."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP sensível à caixa alta (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Desligar validação de certificado SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Se a conexão só funciona com essa opção, importe o certificado SSL do servidor LDAP no seu servidor ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Não recomendado, use somente para testes."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Campo Nome de Exibição de Usuário"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "O atributo LDAP para usar para gerar nome ownCloud do usuário."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Campo Nome de Exibição de Grupo"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "O atributo LDAP para usar para gerar nome ownCloud do grupo."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "em bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "em segundos. Uma mudança esvaziará o cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 07c6f1ca249..075000a1004 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-08 00:01+0100\n"
-"PO-Revision-Date: 2012-11-07 15:39+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,153 +22,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Anfitrião"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Pode especificar o ND Base para utilizadores e grupos no separador Avançado"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN do utilizador"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "O DN to cliente "
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Palavra-passe"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para acesso anónimo, deixe DN e a Palavra-passe vazios."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtro de login de utilizador"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Define o filtro a aplicar, para aquando de uma tentativa de login. %%uid substitui o nome de utilizador utilizado."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "Use a variável %%uid , exemplo: \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Utilizar filtro"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Defina o filtro a aplicar, ao recuperar utilizadores."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "Sem variável. Exemplo: \"objectClass=pessoa\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filtrar por grupo"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Defina o filtro a aplicar, ao recuperar grupos."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "Sem nenhuma variável. Exemplo: \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Porto"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Base da árvore de utilizadores."
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Base da árvore de grupos."
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Associar utilizador ao grupo."
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Não use para ligações SSL, irá falhar."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP (Windows) não sensível a maiúsculas."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Desligar a validação de certificado SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Se a ligação apenas funcionar com está opção, importe o certificado SSL do servidor LDAP para o seu servidor do ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Não recomendado, utilizado apenas para testes!"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Mostrador do nome de utilizador."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atributo LDAP para gerar o nome de utilizador do ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Mostrador do nome do grupo."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atributo LDAP para gerar o nome do grupo do ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "em bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "em segundos. Uma alteração esvazia a cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 8b79d7561fa..a7e5abcc360 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -9,164 +9,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 17:51+0000\n"
-"Last-Translator: iuranemo <iuranemo@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Gazdă"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN de bază"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN al utilizatorului"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "DN-ul clientului utilizator cu care se va efectua conectarea, d.e. uid=agent,dc=example,dc=com. Pentru acces anonim, lăsăți DN și Parolă libere."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Parolă"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Pentru acces anonim, lăsați DN și Parolă libere."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filtrare după Nume Utilizator"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Definește fitrele care trebuie aplicate, când se încearcă conectarea. %%uid înlocuiește numele utilizatorului în procesul de conectare."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "folosiți substituentul %%uid , d.e. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filtrarea după lista utilizatorilor"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definește filtrele care trebui aplicate, când se peiau utilzatorii."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "fără substituenți, d.e. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Fitrare Grup"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definește filtrele care se aplică, când se preiau grupurile."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "fără substituenți, d.e. \"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Portul"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Arborele de bază al Utilizatorilor"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Arborele de bază al Grupurilor"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asocierea Grup-Membru"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Utilizează TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "A nu se utiliza pentru conexiuni SSL, va eșua."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Server LDAP insensibil la majuscule (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Oprește validarea certificatelor SSL "
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Dacă conexiunea lucrează doar cu această opțiune, importează certificatul SSL al serverului LDAP în serverul ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Nu este recomandat, a se utiliza doar pentru testare."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Câmpul cu numele vizibil al utilizatorului"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atributul LDAP folosit pentru a genera numele de utilizator din ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Câmpul cu numele grupului"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atributul LDAP folosit pentru a genera numele grupurilor din ownCloud"
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "în octeți"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "în secunde. O schimbare curăță memoria tampon."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Ajutor"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index b3dbb4c446e..4f3fec369ea 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -9,164 +9,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 05:08+0000\n"
-"Last-Translator: Denis <reg.transifex.net@demitel.ru>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Сервер"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Базовый DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN пользователя"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "DN-клиента пользователя, с которым связывают должно быть заполнено, например, uid=агент, dc=пример, dc=com. Для анонимного доступа, оставьте DN и пароль пустыми."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Пароль"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Для анонимного доступа оставьте DN и пароль пустыми."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Фильтр входа пользователей"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "используйте заполнитель %%uid, например: \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Фильтр списка пользователей"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Определяет фильтр для применения при получении пользователей."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "без заполнителя, например: \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Фильтр группы"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Определяет фильтр для применения при получении группы."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "без заполнения, например \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Порт"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "База пользовательского дерева"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "База группового дерева"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Ассоциация Группа-Участник"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Использовать TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Не используйте для соединений SSL"
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Нечувствительный к регистру сервер LDAP (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Отключить проверку сертификата SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Если соединение работает только с этой опцией, импортируйте на ваш сервер ownCloud сертификат SSL сервера LDAP."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Не рекомендуется, используйте только для тестирования."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Поле отображаемого имени пользователя"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Атрибут LDAP для генерации имени пользователя ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Поле отображаемого имени группы"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Атрибут LDAP для генерации имени группы ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "в байтах"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "в секундах. Изменение очистит кэш."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Помощь"
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
index a66fb2f7962..487a8e46222 100644
--- a/l10n/ru_RU/user_ldap.po
+++ b/l10n/ru_RU/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:03+0200\n"
-"PO-Revision-Date: 2012-10-15 13:57+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Хост"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Вы можете пропустить протокол, если Вам не требуется SSL. Затем начните с ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "База DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Вы можете задать Base DN для пользователей и групп во вкладке «Дополнительно»"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN пользователя"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "DN клиентского пользователя, с которого должна осуществляться привязка, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте поля DN и Пароль пустыми."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Пароль"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Для анонимного доступа оставьте поля DN и пароль пустыми."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Фильтр имен пользователей"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Задает фильтр, применяемый при загрузке пользователя. %%uid заменяет имя пользователя при входе."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "используйте %%uid заполнитель, например, \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Фильтр списка пользователей"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Задает фильтр, применяемый при получении пользователей."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "без каких-либо заполнителей, например, \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Групповой фильтр"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Задает фильтр, применяемый при получении групп."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "без каких-либо заполнителей, например, \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Порт"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Базовое дерево пользователей"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Базовое дерево групп"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Связь член-группа"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Использовать TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Не используйте это SSL-соединений, это не будет выполнено."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Нечувствительный к регистру LDAP-сервер (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Выключить проверку сертификата SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Если соединение работает только с этой опцией, импортируйте SSL-сертификат LDAP сервера в ваш ownCloud сервер."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Не рекомендовано, используйте только для тестирования."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Поле, отображаемое как имя пользователя"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Атрибут LDAP, используемый для создания имени пользователя в ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Поле, отображаемое как имя группы"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Атрибут LDAP, используемый для создания группового имени в ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "в байтах"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "в секундах. Изменение очищает кэш."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Помощь"
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index 065c1358f95..f44ac30b3ea 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-27 00:01+0200\n"
-"PO-Revision-Date: 2012-10-26 06:00+0000\n"
-"Last-Translator: Anushke Guneratne <anushke@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "සත්කාරකය"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "SSL අවශ්‍යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්‍රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "මුර පදය"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "පරිශීලක පිවිසුම් පෙරහන"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "පරිශීලක ලැයිස්තු පෙරහන"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "කණ්ඩායම් පෙරහන"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "කණ්ඩායම් සොයා ලබාගන්නා විට, යොදන පෙරහන නියම කරයි"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "තොට"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "TLS භාවිතා කරන්න"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "නිර්දේශ කළ නොහැක. පරීක්ෂණ සඳහා පමණක් භාවිත කරන්න"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "උදව්"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index b11bc381cc6..fde4a583528 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-26 02:02+0200\n"
-"PO-Revision-Date: 2012-10-25 19:25+0000\n"
-"Last-Translator: Roman Priesol <roman@priesol.net>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Hostiteľ"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Môžete vynechať protokol, s výnimkou požadovania SSL. Vtedy začnite s ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Základné DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "V rozšírenom nastavení môžete zadať základné DN pre používateľov a skupiny"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Používateľské DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "DN klientského používateľa, ku ktorému tvoríte väzbu, napr. uid=agent,dc=example,dc=com. Pre anonymný prístup ponechajte údaje DN a Heslo prázdne."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Heslo"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filter prihlásenia používateľov"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "použite zástupný vzor %%uid, napr. \\\"uid=%%uid\\\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filter zoznamov používateľov"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definuje použitý filter, pre získanie používateľov."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "bez zástupných znakov, napr. \"objectClass=person\""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filter skupiny"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definuje použitý filter, pre získanie skupín."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "bez zástupných znakov, napr. \"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Základný používateľský strom"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Základný skupinový strom"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Asociácia člena skupiny"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Použi TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Nepoužívajte pre pripojenie SSL, pripojenie zlyhá."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP server nerozlišuje veľkosť znakov (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Vypnúť overovanie SSL certifikátu."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Ak pripojenie pracuje len s touto možnosťou, tak importujte SSL certifikát LDAP serveru do vášho servera ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Nie je doporučované, len pre testovacie účely."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Pole pre zobrazenia mena používateľa"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atribút LDAP použitý na vygenerovanie mena používateľa ownCloud "
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Pole pre zobrazenie mena skupiny"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atribút LDAP použitý na vygenerovanie mena skupiny ownCloud "
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "v bajtoch"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Pomoc"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 115d6bd0b72..9a2bc5da379 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 17:41+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,153 +20,166 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Gostitelj"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Osnovni DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Osnovni DN za uporabnike in skupine lahko določite v zavihku Napredno"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Uporabnik DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za anonimni dostop sta polji DN in geslo prazni."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Geslo"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Za anonimni dostop sta polji DN in geslo prazni."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filter prijav uporabnikov"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime za prijavo."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "Uporabite vsebnik %%uid, npr. \"uid=%%uid\"."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filter seznama uporabnikov"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Določi filter za uporabo med pridobivanjem uporabnikov."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "Brez kateregakoli vsebnika, npr. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Filter skupin"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Določi filter za uporabo med pridobivanjem skupin."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Vrata"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Osnovno uporabniško drevo"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Osnovno drevo skupine"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Povezava člana skupine"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Uporabi TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Uporaba SSL za povezave bo spodletela."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Strežnik LDAP ne upošteva velikosti črk (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Onemogoči potrditev veljavnosti potrdila SSL."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "V primeru, da povezava deluje le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Polje za uporabnikovo prikazano ime"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atribut LDAP, uporabljen pri ustvarjanju uporabniških imen ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Polje za prikazano ime skupine"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atribut LDAP, uporabljen pri ustvarjanju imen skupin ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "v bajtih"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "v sekundah. Sprememba izprazni predpomnilnik."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Pustite prazno za uporabniško ime (privzeto). V nasprotnem primeru navedite atribut LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Pomoč"
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 16fd4ec4207..3c0afbd378a 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index eaf9622b4f7..2af4aa92fab 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 6f56c8e03d0..47549f334d5 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sr@latin\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 5bab62c0342..d35d99ea4ef 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -8,164 +8,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 09:37+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Server"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Start DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Du kan ange start DN för användare och grupper under fliken Avancerat"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Användare DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "DN för användaren som skall användas, t.ex. uid=agent, dc=example, dc=com. För anonym åtkomst, lämna DN och lösenord tomt."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Lösenord"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "För anonym åtkomst, lämna DN och lösenord tomt."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Filter logga in användare"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Definierar filter att tillämpa vid inloggningsförsök. %% uid ersätter användarnamn i loginåtgärden."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "använd platshållare %%uid, t ex \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Filter lista användare"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definierar filter att tillämpa vid listning av användare."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "utan platshållare, t.ex. \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Gruppfilter"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definierar filter att tillämpa vid listning av grupper."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "utan platshållare, t.ex. \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Port"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Bas för användare i katalogtjänst"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Bas för grupper i katalogtjänst"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Attribut för gruppmedlemmar"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Använd TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Använd inte för SSL-anslutningar, det kommer inte att fungera."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-servern är okänslig för gemener och versaler (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Stäng av verifiering av SSL-certifikat."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Om anslutningen bara fungerar med det här alternativet, importera LDAP-serverns SSL-certifikat i din ownCloud-server."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Rekommenderas inte, använd bara för test. "
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Attribut för användarnamn"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Attribut som används för att generera användarnamn i ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Attribut för gruppnamn"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Attribut som används för att generera gruppnamn i ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "i bytes"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "i sekunder. En förändring tömmer cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Hjälp"
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 2cd27957467..e98a09afa8c 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-21 00:01+0100\n"
-"PO-Revision-Date: 2012-11-20 09:09+0000\n"
-"Last-Translator: suganthi <suganthi@nic.lk>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "ஓம்புனர்"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "தள DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "நீங்கள் பயனாளர்களுக்கும் மேன்மை தத்தலில் உள்ள குழுவிற்கும் தள DN ஐ குறிப்பிடலாம் "
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "பயனாளர் DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "கடவுச்சொல்"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "எந்த ஒதுக்கீடும் இல்லாமல், உதாரணம். \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "துறை "
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "தள பயனாளர் மரம்"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "தள குழு மரம்"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "குழு உறுப்பினர் சங்கம்"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "TLS ஐ பயன்படுத்தவும்"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "SSL இணைப்பிற்கு பயன்படுத்தவேண்டாம், அது தோல்வியடையும்."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "உணர்ச்சியான LDAP சேவையகம் (சாளரங்கள்)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "SSL சான்றிதழின் செல்லுபடியை நிறுத்திவிடவும்"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "இந்த தெரிவுகளில் மட்டும் இணைப்பு வேலைசெய்தால், உங்களுடைய owncloud சேவையகத்திலிருந்து LDAP சேவையகத்தின் SSL சான்றிதழை இறக்குமதி செய்யவும்"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "பரிந்துரைக்கப்படவில்லை, சோதனைக்காக மட்டும் பயன்படுத்தவும்."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "பயனாளர் காட்சிப்பெயர் புலம்"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "பயனாளரின் ownCloud பெயரை உருவாக்க LDAP பண்புக்கூறை பயன்படுத்தவும்."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "குழுவின் காட்சி பெயர் புலம் "
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "ownCloud குழுக்களின் பெயர்களை உருவாக்க LDAP பண்புக்கூறை பயன்படுத்தவும்."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "bytes களில் "
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "செக்கன்களில். ஒரு மாற்றம் இடைமாற்றுநினைவகத்தை வெற்றிடமாக்கும்."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "பயனாளர் பெயரிற்கு வெற்றிடமாக விடவும் (பொது இருப்பு). இல்லாவிடின் LDAP/AD பண்புக்கூறை குறிப்பிடவும்."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "உதவி"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 74a33fc3ddd..630e3926531 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -206,7 +206,7 @@ msgstr ""
msgid "Password protect"
msgstr ""
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
#: templates/verify.php:13
msgid "Password"
msgstr ""
@@ -311,8 +311,8 @@ msgstr ""
msgid "Request failed!"
msgstr ""
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
msgid "Username"
msgstr ""
@@ -401,44 +401,44 @@ msgstr ""
msgid "Create an <strong>admin account</strong>"
msgstr ""
-#: templates/installation.php:48
+#: templates/installation.php:50
msgid "Advanced"
msgstr ""
-#: templates/installation.php:50
+#: templates/installation.php:52
msgid "Data folder"
msgstr ""
-#: templates/installation.php:57
+#: templates/installation.php:59
msgid "Configure the database"
msgstr ""
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
msgid "will be used"
msgstr ""
-#: templates/installation.php:105
+#: templates/installation.php:107
msgid "Database user"
msgstr ""
-#: templates/installation.php:109
+#: templates/installation.php:111
msgid "Database password"
msgstr ""
-#: templates/installation.php:113
+#: templates/installation.php:115
msgid "Database name"
msgstr ""
-#: templates/installation.php:121
+#: templates/installation.php:123
msgid "Database tablespace"
msgstr ""
-#: templates/installation.php:127
+#: templates/installation.php:129
msgid "Database host"
msgstr ""
-#: templates/installation.php:132
+#: templates/installation.php:134
msgid "Finish setup"
msgstr ""
@@ -544,11 +544,11 @@ msgstr ""
msgid "Lost your password?"
msgstr ""
-#: templates/login.php:27
+#: templates/login.php:29
msgid "remember"
msgstr ""
-#: templates/login.php:28
+#: templates/login.php:30
msgid "Log in"
msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 8c56249c2da..775839bdf02 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 15063c507e8..ccb8c5a32f3 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 5ae592eab3e..522a78047c3 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index c43a5b97938..c037b0ebf54 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 89da014ec69..39fd04b5637 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 1a2475ddde0..a134890e469 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 4606b3de7ef..003b49846d2 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:17+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index f6c93d44d74..8ca63857cbe 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,151 +18,164 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may "
+"experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will "
+"not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index edd944b0698..a552795d14f 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 64ad07dbf6e..c8a7bd651bd 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -8,164 +8,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 18:29+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: th_TH\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "โฮสต์"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN ฐาน"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN ของผู้ใช้งาน"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "DN ของผู้ใช้งานที่เป็นลูกค้าอะไรก็ตามที่ผูกอยู่ด้วย เช่น uid=agent, dc=example, dc=com, สำหรับการเข้าถึงโดยบุคคลนิรนาม, ให้เว้นว่าง DN และ รหัสผ่านเอาไว้"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "รหัสผ่าน"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้"
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "ตัวกรองข้อมูลการเข้าสู่ระบบของผู้ใช้งาน"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "กำหนดตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อมีความพยายามในการเข้าสู่ระบบ %%uid จะถูกนำไปแทนที่ชื่อผู้ใช้งานในการกระทำของการเข้าสู่ระบบ"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "ใช้ตัวยึด %%uid, เช่น \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "ตัวกรองข้อมูลรายชื่อผู้ใช้งาน"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลผู้ใช้งาน"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=person\","
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "ตัวกรองข้อมูลกลุ่ม"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลกลุ่ม"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=posixGroup\","
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "พอร์ต"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "รายการผู้ใช้งานหลักแบบ Tree"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "รายการกลุ่มหลักแบบ Tree"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "ความสัมพันธ์ของสมาชิกในกลุ่ม"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "ใช้ TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "กรุณาอย่าใช้การเชื่อมต่อแบบ SSL การเชื่อมต่อจะเกิดการล้มเหลว"
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "เซิร์ฟเวอร์ LDAP ประเภท Case insensitive (วินโดวส์)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "หากการเชื่อมต่อสามารถทำงานได้เฉพาะกับตัวเลือกนี้เท่านั้น, ให้นำเข้าข้อมูลใบรับรองความปลอดภัยแบบ SSL ของเซิร์ฟเวอร์ LDAP ดังกล่าวเข้าไปไว้ในเซิร์ฟเวอร์ ownCloud"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สำหรับสร้างชื่อของผู้ใช้งาน ownCloud"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "ช่องแสดงชื่อกลุ่มที่ต้องการ"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สร้างชื่อกลุ่มของ ownCloud"
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "ในหน่วยไบต์"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า"
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD"
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "ช่วยเหลือ"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 5429c2cff89..da2eff7ebaa 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -7,164 +7,177 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index dd12c4f2b25..5c74f85fff2 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-28 00:10+0100\n"
-"PO-Revision-Date: 2012-11-27 12:54+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Хост"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Базовий DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "DN Користувача"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "DN клієнтського користувача для прив'язки, наприклад: uid=agent,dc=example,dc=com. Для анонімного доступу, залиште DN і Пароль порожніми."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Пароль"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Для анонімного доступу, залиште DN і Пароль порожніми."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Фільтр Користувачів, що під'єднуються"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Визначає фільтр, який застосовується при спробі входу. %%uid замінює ім'я користувача при вході."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "використовуйте %%uid заповнювач, наприклад: \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Фільтр Списку Користувачів"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Визначає фільтр, який застосовується при отриманні користувачів"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "без будь-якого заповнювача, наприклад: \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Фільтр Груп"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Визначає фільтр, який застосовується при отриманні груп."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Порт"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Основне Дерево Користувачів"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Основне Дерево Груп"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Асоціація Група-Член"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Використовуйте TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Не використовуйте його для SSL з'єднань, це не буде виконано."
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Нечутливий до регістру LDAP сервер (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Вимкнути перевірку SSL сертифіката."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Якщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший ownCloud сервер."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Не рекомендується, використовуйте лише для тестів."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Поле, яке відображає Ім'я Користувача"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Атрибут LDAP, який використовується для генерації імен користувачів ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Поле, яке відображає Ім'я Групи"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Атрибут LDAP, який використовується для генерації імен груп ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "в байтах"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "в секундах. Зміна очищує кеш."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD."
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Допомога"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 7f60127a8f9..c6157201e51 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-10 00:01+0100\n"
-"PO-Revision-Date: 2012-11-09 14:01+0000\n"
-"Last-Translator: Sơn Nguyễn <sonnghit@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,153 +20,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "Máy chủ"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Bạn có thể bỏ qua các giao thức, ngoại trừ SSL. Sau đó bắt đầu với ldaps://"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "DN cơ bản"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Bạn có thể chỉ định DN cơ bản cho người dùng và các nhóm trong tab Advanced"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "Người dùng DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "Các DN của người sử dụng đã được thực hiện, ví dụ như uid =agent , dc = example, dc = com. Để truy cập nặc danh ,DN và mật khẩu trống."
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "Mật khẩu"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "Cho phép truy cập nặc danh , DN và mật khẩu trống."
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "Lọc người dùng đăng nhập"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Xác định các bộ lọc để áp dụng, khi đăng nhập . uid%% thay thế tên người dùng trong các lần đăng nhập."
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "use %%uid placeholder, e.g. \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "Lọc danh sách thành viên"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "Xác định các bộ lọc để áp dụng, khi người dụng sử dụng."
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "Bộ lọc nhóm"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Xác định các bộ lọc để áp dụng, khi nhóm sử dụng."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = osixGroup\"."
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "Cổng"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "Cây người dùng cơ bản"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "Cây nhóm cơ bản"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "Nhóm thành viên Cộng đồng"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "Sử dụng TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "Kết nối SSL bị lỗi. "
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "Trường hợp insensitve LDAP máy chủ (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "Tắt xác thực chứng nhận SSL"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Nếu kết nối chỉ hoạt động với tùy chọn này, vui lòng import LDAP certificate SSL trong máy chủ ownCloud của bạn."
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "Không khuyến khích, Chỉ sử dụng để thử nghiệm."
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "Hiển thị tên người sử dụng"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Các thuộc tính LDAP sử dụng để tạo tên người dùng ownCloud."
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "Hiển thị tên nhóm"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Các thuộc tính LDAP sử dụng để tạo các nhóm ownCloud."
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "Theo Byte"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "trong vài giây. Một sự thay đổi bộ nhớ cache."
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD"
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "Giúp đỡ"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 119c7188675..75ea9d9c0e9 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-18 02:01+0200\n"
-"PO-Revision-Date: 2012-09-17 12:39+0000\n"
-"Last-Translator: marguerite su <i@marguerite.su>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "主机"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "您可以忽略协议,除非您需要 SSL。然后用 ldaps:// 开头"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "基本判别名"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "您可以在高级选项卡中为用户和群组指定基本判别名"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "用户判别名"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "客户机用户的判别名,将用于绑定,例如 uid=agent, dc=example, dc=com。匿名访问请留空判别名和密码。"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "密码"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "匿名访问请留空判别名和密码。"
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "用户登录过滤器"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "定义尝试登录时要应用的过滤器。用 %%uid 替换登录操作中使用的用户名。"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "使用 %%uid 占位符,例如 \"uid=%%uid\""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "用户列表过滤器"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "定义撷取用户时要应用的过滤器。"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "不能使用占位符,例如 \"objectClass=person\"。"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "群组过滤器"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "定义撷取群组时要应用的过滤器"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "不能使用占位符,例如 \"objectClass=posixGroup\"。"
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "端口"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "基本用户树"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "基本群组树"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "群组-成员组合"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "使用 TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "不要使用它进行 SSL 连接,会失败的。"
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "大小写不敏感的 LDAP 服务器 (Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "关闭 SSL 证书校验。"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "如果只有使用此选项才能连接,请导入 LDAP 服务器的 SSL 证书到您的 ownCloud 服务器。"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "不推荐,仅供测试"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "用户显示名称字段"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "用于生成用户的 ownCloud 名称的 LDAP 属性。"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "群组显示名称字段"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "用于生成群组的 ownCloud 名称的 LDAP 属性。"
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "以字节计"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr "以秒计。修改会清空缓存。"
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "用户名请留空 (默认)。否则,请指定一个 LDAP/AD 属性。"
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "帮助"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 00e887720fd..be239585259 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-24 02:02+0200\n"
-"PO-Revision-Date: 2012-10-23 05:22+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr "主机"
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "可以忽略协议,但如要使用SSL,则需以ldaps://开头"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "您可以在高级选项卡里为用户和组指定Base DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr "User DN"
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr "客户端使用的DN必须与绑定的相同,比如uid=agent,dc=example,dc=com\n如需匿名访问,将DN和密码保留为空"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "密码"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr "启用匿名访问,将DN和密码保留为空"
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr "用户登录过滤"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "定义当尝试登录时的过滤器。 在登录过程中,%%uid将会被用户名替换"
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "使用 %%uid作为占位符,例如“uid=%%uid”"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr "用户列表过滤"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr "定义拉取用户时的过滤器"
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "没有任何占位符,如 \"objectClass=person\"."
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr "组过滤"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr "定义拉取组信息时的过滤器"
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "无需占位符,例如\"objectClass=posixGroup\""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr "端口"
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr "基础用户树"
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr "基础组树"
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr "组成员关联"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "使用TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr "不要在SSL链接中使用此选项,会导致失败。"
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr "大小写敏感LDAP服务器(Windows)"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "关闭SSL证书验证"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "如果链接仅在此选项时可用,在您的ownCloud服务器中导入LDAP服务器的SSL证书。"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr "暂不推荐,仅供测试"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr "用户显示名称字段"
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "用来生成用户的ownCloud名称的 LDAP属性"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr "组显示名称字段"
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "用来生成组的ownCloud名称的LDAP属性"
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr "字节数"
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "帮助"
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index b59ebba9006..24846079f01 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-19 00:01+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index ca4a4be144c..2bf0669ac23 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-28 00:10+0100\n"
-"PO-Revision-Date: 2012-11-27 14:32+0000\n"
-"Last-Translator: dw4dev <dw4dev@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr "密碼"
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr "使用TLS"
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr "關閉 SSL 憑證驗證"
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr "說明"
diff --git a/l10n/zu_ZA/user_ldap.po b/l10n/zu_ZA/user_ldap.po
index a4f2985ab0e..3add8a2631e 100644
--- a/l10n/zu_ZA/user_ldap.po
+++ b/l10n/zu_ZA/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-06 00:00+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
msgid "Host"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:15
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "Base DN"
msgstr ""
-#: templates/settings.php:9
+#: templates/settings.php:16
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid "User DN"
msgstr ""
-#: templates/settings.php:10
+#: templates/settings.php:17
msgid ""
"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."
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "Password"
msgstr ""
-#: templates/settings.php:11
+#: templates/settings.php:18
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:12
+#: templates/settings.php:19
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:13
+#: templates/settings.php:20
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:14
+#: templates/settings.php:21
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:17
+#: templates/settings.php:24
msgid "Port"
msgstr ""
-#: templates/settings.php:18
+#: templates/settings.php:25
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:19
+#: templates/settings.php:26
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:20
+#: templates/settings.php:27
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:21
+#: templates/settings.php:28
msgid "Do not use it for SSL connections, it will fail."
msgstr ""
-#: templates/settings.php:22
+#: templates/settings.php:29
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:23
+#: templates/settings.php:30
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:24
+#: templates/settings.php:31
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:25
+#: templates/settings.php:32
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:27
+#: templates/settings.php:34
msgid "in bytes"
msgstr ""
-#: templates/settings.php:29
+#: templates/settings.php:36
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:30
+#: templates/settings.php:37
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:32
+#: templates/settings.php:39
msgid "Help"
msgstr ""