From 6a6079176b75c81ee96ee22cc5cff0e0d47c09ef Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Fri, 17 May 2013 02:07:36 +0200
Subject: [PATCH] [tx-robot] updated from transifex
---
apps/files/l10n/nn_NO.php | 20 +--
core/l10n/nn_NO.php | 24 +--
l10n/af_ZA/user_ldap.po | 220 ++++++++++++++++++---------
l10n/ar/user_ldap.po | 220 ++++++++++++++++++---------
l10n/be/user_ldap.po | 220 ++++++++++++++++++---------
l10n/bg_BG/user_ldap.po | 220 ++++++++++++++++++---------
l10n/bn_BD/user_ldap.po | 220 ++++++++++++++++++---------
l10n/ca/user_ldap.po | 220 ++++++++++++++++++---------
l10n/cs_CZ/user_ldap.po | 220 ++++++++++++++++++---------
l10n/cy_GB/user_ldap.po | 220 ++++++++++++++++++---------
l10n/da/user_ldap.po | 220 ++++++++++++++++++---------
l10n/de/user_ldap.po | 222 +++++++++++++++++++---------
l10n/de_DE/files.po | 4 +-
l10n/de_DE/user_ldap.po | 222 +++++++++++++++++++---------
l10n/el/user_ldap.po | 220 ++++++++++++++++++---------
l10n/en@pirate/user_ldap.po | 222 +++++++++++++++++++---------
l10n/eo/user_ldap.po | 220 ++++++++++++++++++---------
l10n/es/files.po | 4 +-
l10n/es/user_ldap.po | 220 ++++++++++++++++++---------
l10n/es_AR/user_ldap.po | 220 ++++++++++++++++++---------
l10n/et_EE/user_ldap.po | 222 +++++++++++++++++++---------
l10n/eu/user_ldap.po | 220 ++++++++++++++++++---------
l10n/fa/user_ldap.po | 220 ++++++++++++++++++---------
l10n/fi_FI/user_ldap.po | 220 ++++++++++++++++++---------
l10n/fr/files.po | 4 +-
l10n/fr/user_ldap.po | 220 ++++++++++++++++++---------
l10n/gl/user_ldap.po | 220 ++++++++++++++++++---------
l10n/he/user_ldap.po | 222 +++++++++++++++++++---------
l10n/hi/user_ldap.po | 220 ++++++++++++++++++---------
l10n/hr/user_ldap.po | 220 ++++++++++++++++++---------
l10n/hu_HU/user_ldap.po | 220 ++++++++++++++++++---------
l10n/ia/user_ldap.po | 220 ++++++++++++++++++---------
l10n/id/user_ldap.po | 220 ++++++++++++++++++---------
l10n/is/user_ldap.po | 220 ++++++++++++++++++---------
l10n/it/settings.po | 4 +-
l10n/it/user_ldap.po | 220 ++++++++++++++++++---------
l10n/ja_JP/user_ldap.po | 222 +++++++++++++++++++---------
l10n/ka/user_ldap.po | 220 ++++++++++++++++++---------
l10n/ka_GE/user_ldap.po | 222 +++++++++++++++++++---------
l10n/kn/user_ldap.po | 220 ++++++++++++++++++---------
l10n/ko/user_ldap.po | 220 ++++++++++++++++++---------
l10n/ku_IQ/user_ldap.po | 220 ++++++++++++++++++---------
l10n/lb/user_ldap.po | 220 ++++++++++++++++++---------
l10n/lt_LT/user_ldap.po | 220 ++++++++++++++++++---------
l10n/lv/user_ldap.po | 220 ++++++++++++++++++---------
l10n/mk/user_ldap.po | 220 ++++++++++++++++++---------
l10n/ms_MY/user_ldap.po | 220 ++++++++++++++++++---------
l10n/my_MM/user_ldap.po | 220 ++++++++++++++++++---------
l10n/nb_NO/user_ldap.po | 220 ++++++++++++++++++---------
l10n/ne/user_ldap.po | 220 ++++++++++++++++++---------
l10n/nl/files.po | 4 +-
l10n/nl/user_ldap.po | 220 ++++++++++++++++++---------
l10n/nn_NO/core.po | 29 ++--
l10n/nn_NO/files.po | 27 ++--
l10n/nn_NO/lib.po | 19 +--
l10n/nn_NO/settings.po | 65 ++++----
l10n/nn_NO/user_ldap.po | 220 ++++++++++++++++++---------
l10n/oc/user_ldap.po | 220 ++++++++++++++++++---------
l10n/pl/user_ldap.po | 220 ++++++++++++++++++---------
l10n/pt_BR/files.po | 4 +-
l10n/pt_BR/user_ldap.po | 220 ++++++++++++++++++---------
l10n/pt_PT/user_ldap.po | 220 ++++++++++++++++++---------
l10n/ro/user_ldap.po | 220 ++++++++++++++++++---------
l10n/ru/user_ldap.po | 220 ++++++++++++++++++---------
l10n/si_LK/user_ldap.po | 220 ++++++++++++++++++---------
l10n/sk/user_ldap.po | 220 ++++++++++++++++++---------
l10n/sk_SK/user_ldap.po | 220 ++++++++++++++++++---------
l10n/sl/user_ldap.po | 220 ++++++++++++++++++---------
l10n/sq/user_ldap.po | 220 ++++++++++++++++++---------
l10n/sr/user_ldap.po | 220 ++++++++++++++++++---------
l10n/sr@latin/user_ldap.po | 220 ++++++++++++++++++---------
l10n/sv/user_ldap.po | 220 ++++++++++++++++++---------
l10n/sw_KE/user_ldap.po | 220 ++++++++++++++++++---------
l10n/ta_LK/user_ldap.po | 220 ++++++++++++++++++---------
l10n/te/user_ldap.po | 220 ++++++++++++++++++---------
l10n/templates/core.pot | 2 +-
l10n/templates/files.pot | 2 +-
l10n/templates/files_encryption.pot | 2 +-
l10n/templates/files_external.pot | 2 +-
l10n/templates/files_sharing.pot | 2 +-
l10n/templates/files_trashbin.pot | 2 +-
l10n/templates/files_versions.pot | 2 +-
l10n/templates/lib.pot | 2 +-
l10n/templates/settings.pot | 2 +-
l10n/templates/user_ldap.pot | 218 ++++++++++++++++++---------
l10n/templates/user_webdavauth.pot | 2 +-
l10n/th_TH/user_ldap.po | 220 ++++++++++++++++++---------
l10n/tr/user_ldap.po | 222 +++++++++++++++++++---------
l10n/ug/user_ldap.po | 222 +++++++++++++++++++---------
l10n/uk/user_ldap.po | 220 ++++++++++++++++++---------
l10n/ur_PK/user_ldap.po | 220 ++++++++++++++++++---------
l10n/vi/user_ldap.po | 220 ++++++++++++++++++---------
l10n/zh_CN.GB2312/user_ldap.po | 220 ++++++++++++++++++---------
l10n/zh_CN/files.po | 4 +-
l10n/zh_CN/user_ldap.po | 220 ++++++++++++++++++---------
l10n/zh_HK/user_ldap.po | 220 ++++++++++++++++++---------
l10n/zh_TW/user_ldap.po | 220 ++++++++++++++++++---------
lib/l10n/nn_NO.php | 2 +-
settings/l10n/nn_NO.php | 40 ++---
99 files changed, 11469 insertions(+), 5101 deletions(-)
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 6d5c4c5642..2b7c5cf89b 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -1,6 +1,6 @@
<?php $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Klarte ikkje å flytta %s – det finst allereie ei fil med dette namnet",
-"Could not move %s" => "Klarte ikkje å flytta %s",
+"Could not move %s - File with this name already exists" => "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet",
+"Could not move %s" => "Klarte ikkje flytta %s",
"No file was uploaded. Unknown error" => "Ingen filer lasta opp. Ukjend feil",
"There is no error, the file uploaded with success" => "Ingen feil, fila vart lasta opp",
"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: ",
@@ -8,7 +8,7 @@
"The uploaded file was only partially uploaded" => "Fila vart berre delvis lasta opp",
"No file was uploaded" => "Ingen filer vart lasta opp",
"Missing a temporary folder" => "Manglar ei mellombels mappe",
-"Failed to write to disk" => "Klarte ikkje å skriva til disk",
+"Failed to write to disk" => "Klarte ikkje skriva til disk",
"Not enough storage available" => "Ikkje nok lagringsplass tilgjengeleg",
"Invalid directory." => "Ugyldig mappe.",
"Files" => "Filer",
@@ -32,11 +32,11 @@
"Your storage is full, files can not be updated or synced anymore!" => "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
"Your storage is almost full ({usedSpacePercent}%)" => "Lagringa di er nesten full ({usedSpacePercent} %)",
"Your download is being prepared. This might take some time if the files are big." => "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje å lasta opp fila sidan ho er ei mappe eller er på 0 byte",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte",
"Not enough space available" => "Ikkje nok lagringsplass tilgjengeleg",
"Upload cancelled." => "Opplasting avbroten.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga bli avbroten.",
-"URL cannot be empty." => "URL-en kan ikkje vera tom.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
+"URL cannot be empty." => "Nettadressa kan ikkje vera tom.",
"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldig mappenamn. Mappa «Shared» er reservert av ownCloud",
"Error" => "Feil",
"Name" => "Namn",
@@ -46,13 +46,13 @@
"{count} folders" => "{count} mapper",
"1 file" => "1 fil",
"{count} files" => "{count} filer",
-"Unable to rename file" => "Klarte ikkje å endra filnamnet",
+"Unable to rename file" => "Klarte ikkje endra filnamnet",
"Upload" => "Last opp",
"File handling" => "Filhandtering",
"Maximum upload size" => "Maksimal opplastingsstorleik",
"max. possible: " => "maks. moglege:",
-"Needed for multi-file and folder downloads." => "Naudsynt for fleirfils- og mappenedlastingar.",
-"Enable ZIP-download" => "Skru på ZIP-nedlasting",
+"Needed for multi-file and folder downloads." => "Nødvendig for fleirfils- og mappenedlastingar.",
+"Enable ZIP-download" => "Slå på ZIP-nedlasting",
"0 is unlimited" => "0 er ubegrensa",
"Maximum input size for ZIP files" => "Maksimal storleik for ZIP-filer",
"Save" => "Lagre",
@@ -67,7 +67,7 @@
"Download" => "Last ned",
"Unshare" => "Udel",
"Upload too large" => "For stor opplasting",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren.",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.",
"Files are being scanned, please wait." => "Skannar filer, ver venleg og vent.",
"Current scanning" => "Køyrande skanning",
"Upgrading filesystem cache..." => "Oppgraderer mellomlageret av filsystemet …"
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 2055be1b9a..d11ff92fa8 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -8,9 +8,9 @@
"This category already exists: %s" => "Denne kategorien finst alt: %s",
"Object type not provided." => "Ingen objekttype.",
"%s ID not provided." => "Ingen %s-ID.",
-"Error adding %s to favorites." => "Klarte ikkje å leggja til %s i favorittar.",
+"Error adding %s to favorites." => "Klarte ikkje leggja til %s i favorittar.",
"No categories selected for deletion." => "Ingen kategoriar valt for sletting.",
-"Error removing %s from favorites." => "Klarte ikkje å fjerna %s frå favorittar.",
+"Error removing %s from favorites." => "Klarte ikkje fjerna %s frå favorittar.",
"Sunday" => "Søndag",
"Monday" => "MÃ¥ndag",
"Tuesday" => "Tysdag",
@@ -40,8 +40,8 @@
"yesterday" => "i går",
"{days} days ago" => "{days} dagar sidan",
"last month" => "førre månad",
-"{months} months ago" => "{months) månader sidan",
-"months ago" => "månader sidan",
+"{months} months ago" => "{months} månadar sidan",
+"months ago" => "månadar sidan",
"last year" => "i fjor",
"years ago" => "Ã¥r sidan",
"Ok" => "Greitt",
@@ -51,7 +51,7 @@
"No" => "Nei",
"The object type is not specified." => "Objekttypen er ikkje spesifisert.",
"Error" => "Feil",
-"The app name is not specified." => "App-namnet er ikkje spesifisert.",
+"The app name is not specified." => "Programnamnet er ikkje spesifisert.",
"The required file {file} is not installed!" => "Den kravde fila {file} er ikkje installert!",
"Shared" => "Delt",
"Share" => "Del",
@@ -66,8 +66,8 @@
"Password" => "Passord",
"Email link to person" => "Send lenkja over e-post",
"Send" => "Send",
-"Set expiration date" => "Set utlaupsdato",
-"Expiration date" => "Utlaupsdato",
+"Set expiration date" => "Set utløpsdato",
+"Expiration date" => "Utløpsdato",
"Share via email:" => "Del over e-post:",
"No people found" => "Fann ingen personar",
"Resharing is not allowed" => "Vidaredeling er ikkje tillate",
@@ -80,8 +80,8 @@
"delete" => "slett",
"share" => "del",
"Password protected" => "Passordverna",
-"Error unsetting expiration date" => "Klarte ikkje å fjerna utlaupsdato",
-"Error setting expiration date" => "Klarte ikkje å setja utlaupsdato",
+"Error unsetting expiration date" => "Klarte ikkje fjerna utløpsdato",
+"Error setting expiration date" => "Klarte ikkje setja utløpsdato",
"Sending ..." => "Sender …",
"Email sent" => "E-post sendt",
"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.",
@@ -99,7 +99,7 @@
"Reset password" => "Nullstill passord",
"Personal" => "Personleg",
"Users" => "Brukarar",
-"Apps" => "Applikasjonar",
+"Apps" => "Program",
"Admin" => "Admin",
"Help" => "Hjelp",
"Access forbidden" => "Tilgang forbudt",
@@ -116,8 +116,8 @@
"Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>",
"Advanced" => "Avansert",
"Data folder" => "Datamappe",
-"Configure the database" => "Konfigurer databasen",
-"will be used" => "vil bli nytta",
+"Configure the database" => "Set opp databasen",
+"will be used" => "vil verta nytta",
"Database user" => "Databasebrukar",
"Database password" => "Databasepassord",
"Database name" => "Databasenamn",
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index 21d7bba975..9c44d57d8f 100644
--- a/l10n/af_ZA/user_ldap.po
+++ b/l10n/af_ZA/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: af_ZA\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Wagwoord"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hulp"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index ede2881fa3..42658b5c8d 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"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"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "كلمة المرور"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "المساعدة"
diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po
index b6630ab6f2..b922f51102 100644
--- a/l10n/be/user_ldap.po
+++ b/l10n/be/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: be\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 0c18cd6603..834df076cc 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Парола"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Помощ"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 782011bb13..a868139a96 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: bn_BD\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "হোসà§à¦Ÿ"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "SSL আবশà§à¦¯à¦• না হলে আপনি à¦à¦‡ পà§à¦°à¦Ÿà§‹à¦•à¦²à¦Ÿà¦¿ মà§à¦›à§‡ ফেলতে পারেন । à¦à¦°à¦ªà¦° শà§à¦°à§ করà§à¦¨ à¦à¦Ÿà¦¾ দিয়ে ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "à¦à¦¿à¦¤à§à¦¤à¦¿ DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "সà§à¦šà¦¾à¦°à§ টà§à¦¯à¦…বে গিয়ে আপনি বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à¦¿ à¦à¦¬à¦‚ গোষà§à¦ ীসমূহের জনà§à¦¯ à¦à¦¿à¦¤à§à¦¤à¦¿ DN নিরà§à¦§à¦¾à¦°à¦£ করতে পারেন।"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à¦¿ DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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 "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. পরিচয় গোপন রেখে অধিগমনের জনà§à¦¯ DN à¦à¦¬à¦‚ কূটশবà§à¦¦à¦Ÿà¦¿ ফাà¦à¦•à¦¾ রাখà§à¦¨à¥¤"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "কূটশবà§à¦¦"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "অজà§à¦žà¦¾à¦¤à¦•à§à¦²à¦¶à§€à¦² অধিগমনের জনà§à¦¯ DN à¦à¦¬à¦‚ কূটশবà§à¦¦à¦Ÿà¦¿ ফাà¦à¦•à¦¾ রাখà§à¦¨à¥¤"
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à¦¿à¦° পà§à¦°à¦¬à§‡à¦¶ ছাà¦à¦•à¦¨à§€"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "%%uid সà§à¦¥à¦¾à¦¨à¦§à¦¾à¦°à¦• বà§à¦¯à¦¬à¦¹à¦¾à¦° করà§à¦¨, উদাহরণঃ \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ তালিকা ছাà¦à¦•à¦¨à§€"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ উদà§à¦§à¦¾à¦° করার সময় পà§à¦°à§Ÿà§‹à¦—ের জনà§à¦¯ ছাà¦à¦•à¦¨à§€ নিরà§à¦§à¦¾à¦°à¦£ করবে।"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "কোন সà§à¦¥à¦¾à¦¨à¦§à¦¾à¦°à¦• বà§à¦¯à¦¤à§€à¦¤, যেমনঃ \"objectClass=person\"।"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "গোষà§à¦ ী ছাà¦à¦•à¦¨à§€"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "গোষà§à¦ ীসমূহ উদà§à¦§à¦¾à¦° করার সময় পà§à¦°à§Ÿà§‹à¦—ের জনà§à¦¯ ছাà¦à¦•à¦¨à§€ নিরà§à¦§à¦¾à¦°à¦£ করবে।"
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "কোন সà§à¦¥à¦¾à¦¨ ধারক বà§à¦¯à¦¤à§€à¦¤, উদাহরণঃ\"objectClass=posixGroup\"।"
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "পোরà§à¦Ÿ"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "TLS বà§à¦¯à¦¬à¦¹à¦¾à¦° কর"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "বরà§à¦£ অসংবেদী LDAP সারà§à¦à¦¾à¦° (উইনà§à¦¡à§‹à¦œ)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "SSL সনদপতà§à¦° যাচাইকরণ বনà§à¦§ রাক।"
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "অনà§à¦®à§‹à¦¦à¦¿à¦¤ নয়, শà§à¦§à§à¦®à¦¾à¦¤à§à¦° পরীকà§à¦·à¦¾à¦®à§‚লক বà§à¦¯à¦¬à¦¹à¦¾à¦°à§‡à¦° জনà§à¦¯à¥¤"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "সেকেনà§à¦¡à§‡à¥¤ কোন পরিবরà§à¦¤à¦¨ কà§à¦¯à¦¾à¦¸à§‡ খালি করবে।"
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦° পà§à¦°à¦¦à¦°à§à¦¶à¦¿à¦¤à¦¬à§à¦¯ নামের কà§à¦·à§‡à¦¤à§à¦°"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦° ownCloud নাম তৈরি করার জনà§à¦¯ বà§à¦¯à¦à¦¹à§ƒà¦¤ LDAP বৈশিষà§à¦Ÿà§à¦¯à¥¤"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "à¦à¦¿à¦¤à§à¦¤à¦¿ বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à¦¿ বৃকà§à¦·à¦¾à¦•à¦¾à¦°à§‡"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "গোষà§à¦ ীর পà§à¦°à¦¦à¦°à§à¦¶à¦¿à¦¤à¦¬à§à¦¯ নামের কà§à¦·à§‡à¦¤à§à¦°"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "গোষà§à¦ ীর ownCloud নাম তৈরি করার জনà§à¦¯ বà§à¦¯à¦à¦¹à§ƒà¦¤ LDAP বৈশিষà§à¦Ÿà§à¦¯à¥¤"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "à¦à¦¿à¦¤à§à¦¤à¦¿ গোষà§à¦ ী বৃকà§à¦·à¦¾à¦•à¦¾à¦°à§‡"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "গোষà§à¦ ী-সদসà§à¦¯ সংসà§à¦¥à¦¾à¦ªà¦¨"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "বাইটে"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ নামের জনà§à¦¯ ফাà¦à¦•à¦¾ রাখà§à¦¨ (পূরà§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤)। অনà§à¦¯à¦¥à¦¾à§Ÿ, LDAP/AD বৈশিষà§à¦Ÿà§à¦¯ নিরà§à¦§à¦¾à¦°à¦£ করà§à¦¨à¥¤"
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "সহায়িকা"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 91d2f5617c..a817cb8212 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Ha fallat en eliminar la configuració del servidor"
@@ -53,281 +57,363 @@ msgstr "Voleu mantenir la configuració?"
msgid "Cannot add server configuration"
msgstr "No es pot afegir la configuració del servidor"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "La prova de connexió ha reeixit"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "La prova de connexió ha fallat"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Voleu eliminar la configuració actual del servidor?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Confirma l'eliminació"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>AvÃs:</b> Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments no desitjats. Demaneu a l'administrador del sistema que en desactivi una."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>AvÃs:</b> El mòdul PHP LDAP no està instal·lat, el dorsal no funcionarà . Demaneu a l'administrador del sistema que l'instal·li."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Configuració del servidor"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Afegeix la configuració del servidor"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Equip remot"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN Base"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Una DN Base per lÃnia"
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN Usuari"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Contrasenya"
-#: templates/settings.php:49
+#: templates/settings.php:50
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:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtre d'inici de sessió d'usuari"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, 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:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Llista de filtres d'usuari"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Defineix el filtre a aplicar quan es mostren usuaris"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sense cap parà metre de substitució, per exemple \"objectClass=persona\""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtre de grup"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Defineix el filtre a aplicar quan es mostren grups."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sense cap parà metre de substitució, per exemple \"objectClass=grupPosix\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Arranjaments de connexió"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configuració activa"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Si està desmarcat, aquesta configuració s'ometrà ."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Mà quina de còpia de serguretat (rèplica)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Afegiu una mà quina de còpia de seguretat opcional. Ha de ser una rèplica del servidor LDAP/AD principal."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Port de la còpia de seguretat (rèplica)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Desactiva el servidor principal"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Quan està connectat, ownCloud només es connecta al servidor de la rèplica."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Usa TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "No ho useu adicionalment per a conexions LDAPS, fallarà ."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Desactiva la validació de certificat SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "No recomanat, ús només per proves."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Memòria de cau Time-To-Live"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "en segons. Un canvi buidarà la memòria de cau."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Arranjaments de carpetes"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Camp per mostrar el nom d'usuari"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Arbre base d'usuaris"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Una DN Base d'Usuari per lÃnia"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Atributs de cerca d'usuari"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Opcional; Un atribut per lÃnia"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Camp per mostrar el nom del grup"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Arbre base de grups"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Una DN Base de Grup per lÃnia"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atributs de cerca de grup"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Associació membres-grup"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Atributs especials"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Camp de quota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Quota per defecte"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Camp de correu electrònic"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Norma per anomenar la carpeta arrel d'usuari"
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Comprovació de la configuració"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index ef1a936b3d..4cfd61fae8 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: cs_CZ\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Selhalo smazánà nastavenà serveru"
@@ -53,281 +57,363 @@ msgstr "Ponechat nastavenÃ?"
msgid "Cannot add server configuration"
msgstr "Nelze přidat nastavenà serveru"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Test spojenà byl úspěšný"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Test spojenà selhal"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Opravdu si pÅ™ejete smazat souÄasné nastavenà serveru?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Potvrdit smazánÃ"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>VarovánÃ:</b> Aplikace user_ldap a user_webdavauth nejsou kompatibilnÃ. Může nastávat neoÄekávané chovánÃ. Požádejte, prosÃm, správce systému aby jednu z nich zakázal."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>VarovánÃ:</b> nenà nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosÃm, správce systému aby jej nainstaloval."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Nastavenà serveru"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Přidat nastavenà serveru"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "PoÄÃtaÄ"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Základnà DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Jedna základnà DN na řádku"
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Uživatelské DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Heslo"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Pro anonymnà pÅ™Ãstup, ponechte údaje DN and heslo prázdné."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtr přihlášenà uživatelů"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "použijte zástupný vzor %%uid, např. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtr uživatelských seznamů"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "UrÄuje použitý filtr, pro zÃskávanà uživatelů."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "bez zástupných znaků, např. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtr skupin"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "UrÄuje použitý filtr, pro zÃskávanà skupin."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "bez zástupných znaků, např. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Nastavenà spojenÃ"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Nastavenà aktivnÃ"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Pokud nenà zaÅ¡krtnuto, bude nastavenà pÅ™eskoÄeno."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Záložnà (kopie) hostitel"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Zadejte volitelného záložnÃho hostitele. Musà to být kopie hlavnÃho serveru LDAP/AD."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Záložnà (kopie) port"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Zakázat hlavnà serveru"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "PÅ™i zapnutà se ownCloud pÅ™ipojà pouze k záložnÃmu serveru"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "PoužÃt TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "NepoužÃvejte pro spojenà LDAP, selže."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP server nerozliÅ¡ujÃcà velikost znaků (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Vypnout ověřovánà SSL certifikátu."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Nenà doporuÄeno, pouze pro testovacà úÄely."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "TTL vyrovnávacà paměti"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "ve vteřinách. Změna vyprázdnà vyrovnávacà paměť."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Nastavenà adresáře"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Pole pro zobrazované jméno uživatele"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Základnà uživatelský strom"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Jedna uživatelská základnà DN na řádku"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Atributy vyhledávánà uživatelů"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Volitelné, atribut na řádku"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Pole pro zobrazenà jména skupiny"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Základnà skupinový strom"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Jedna skupinová základnà DN na řádku"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atributy vyhledávánà skupin"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Asociace Älena skupiny"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Speciálnà atributy"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Pole pro kvótu"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Výchozà kvóta"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "v bajtech"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Pole e-mailu"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Pravidlo pojmenovánà domovské složky uživatele"
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "VyzkouÅ¡et nastavenÃ"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Nápověda"
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index 2c054ee189..06a1259571 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: cy_GB\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Cyfrinair"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Cymorth"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index ed3dbcd50a..39368c8e4a 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Host"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "You can specify Base DN for users and groups in the Advanced tab"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Bruger DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Kodeord"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "For anonym adgang, skal du lade DN og Adgangskode tomme."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Bruger Login Filter"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Brugerliste Filter"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definere filteret der bruges ved indlæsning af brugere."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Gruppe Filter"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definere filteret der bruges når der indlæses grupper."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Brug TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Deaktiver SSL certifikat validering"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Anbefales ikke, brug kun for at teste."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "User Display Name Field"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Base Bruger Træ"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Base Group Tree"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Group-Member association"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "i bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hjælp"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index ae5ea47d00..ed38865213 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/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: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-09 19:40+0000\n"
-"Last-Translator: Marcel Kühlhorn <susefan93@gmx.de>\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Löschen der Serverkonfiguration fehlgeschlagen"
@@ -54,281 +58,363 @@ msgstr "Einstellungen beibehalten?"
msgid "Cannot add server configuration"
msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Verbindungstest erfolgreich"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Verbindungstest fehlgeschlagen"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Möchtest Du die aktuelle Serverkonfiguration wirklich löschen?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Löschung bestätigen"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitte Deinen Systemadministator eine der beiden Anwendungen zu deaktivieren."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitte Deinen Systemadministrator das Modul zu installieren."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Serverkonfiguration"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Serverkonfiguration hinzufügen"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Host"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Basis-DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Ein Basis-DN pro Zeile"
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Benutzer-DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Passwort"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Lasse die Felder DN und Passwort für anonymen Zugang leer."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Benutzer-Login-Filter"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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 beim Anmeldeversuch."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Benutzer-Filter-Liste"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definiert den Filter für die Anfrage der Benutzer."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Gruppen-Filter"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definiert den Filter für die Anfrage der Gruppen."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Verbindungseinstellungen"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Konfiguration aktiv"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Konfiguration wird übersprungen wenn deaktiviert"
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Backup Host (Kopie)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Gib einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Backup Port"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Hauptserver deaktivieren"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Nutze TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Benutze es nicht zusammen mit LDAPS Verbindungen, es wird fehlschlagen."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Schalte die SSL-Zertifikatsprüfung aus."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Nicht empfohlen, nur zu Testzwecken."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Speichere Time-To-Live zwischen"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "in Sekunden. Eine Änderung leert den Cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Ordnereinstellungen"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Feld für den Anzeigenamen des Benutzers"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Basis-Benutzerbaum"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Ein Benutzer Basis-DN pro Zeile"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Benutzersucheigenschaften"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Optional; ein Attribut pro Zeile"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Feld für den Anzeigenamen der Gruppe"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Basis-Gruppenbaum"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Ein Gruppen Basis-DN pro Zeile"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Gruppensucheigenschaften"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Assoziation zwischen Gruppe und Benutzer"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Spezielle Eigenschaften"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Kontingent Feld"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Standard Kontingent"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "in Bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "E-Mail Feld"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Testkonfiguration"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hilfe"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 7a8a5a1826..8560a8f9a2 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 16:18+0000\n"
+"POT-Creation-Date: 2013-05-17 02:02+0200\n"
+"PO-Revision-Date: 2013-05-16 08:53+0000\n"
"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index d667c104a5..4fbd1dd320 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/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: 2013-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 16:15+0000\n"
-"Last-Translator: a.tangemann <a.tangemann@web.de>\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: German (Germany) <translations@owncloud.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Löschen der Serverkonfiguration fehlgeschlagen"
@@ -54,281 +58,363 @@ msgstr "Einstellungen beibehalten?"
msgid "Cannot add server configuration"
msgstr "Das Hinzufügen der Serverkonfiguration schlug fehl"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Verbindungstest erfolgreich"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Verbindungstest fehlgeschlagen"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Löschung bestätigen"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwartetem Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Serverkonfiguration"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Serverkonfiguration hinzufügen"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Host"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Basis-DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Ein Basis-DN pro Zeile"
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Benutzer-DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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 einen anonymen Zugriff lassen Sie DN und Passwort leer."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Passwort"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Benutzer-Login-Filter"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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 durchgeführt wird. %%uid ersetzt den Benutzernamen beim Anmeldeversuch."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "verwenden Sie %%uid Platzhalter, z. B. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Benutzer-Filter-Liste"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definiert den Filter für die Anfrage der Benutzer."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Gruppen-Filter"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definiert den Filter für die Anfrage der Gruppen."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Verbindungseinstellungen"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Konfiguration aktiv"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Wenn nicht angehakt, wird diese Konfiguration übersprungen."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Backup Host (Kopie)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Backup Port"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Hauptserver deaktivieren"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Wenn aktiviert, wird ownCloud ausschließlich den Backupserver verwenden."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Nutze TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Benutzen Sie es nicht in Verbindung mit LDAPS Verbindungen, es wird fehlschlagen."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Schalten Sie die SSL-Zertifikatsprüfung aus."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Nicht empfohlen, nur zu Testzwecken."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Speichere Time-To-Live zwischen"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "in Sekunden. Eine Änderung leert den Cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Ordnereinstellungen"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Feld für den Anzeigenamen des Benutzers"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Basis-Benutzerbaum"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Ein Benutzer Basis-DN pro Zeile"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Benutzersucheigenschaften"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Optional; ein Attribut pro Zeile"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Feld für den Anzeigenamen der Gruppe"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Basis-Gruppenbaum"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Ein Gruppen Basis-DN pro Zeile"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Gruppensucheigenschaften"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Assoziation zwischen Gruppe und Benutzer"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Spezielle Eigenschaften"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Kontingent-Feld"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Standard-Kontingent"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "in Bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "E-Mail-Feld"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Testkonfiguration"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hilfe"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 8b6e529e85..e333d516ca 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Αποτυχία διαγÏαφής Ïυθμίσεων διακομιστή"
@@ -53,281 +57,363 @@ msgstr "ΔιατήÏηση Ïυθμίσεων;"
msgid "Cannot add server configuration"
msgstr "Αδυναμία Ï€Ïοσθήκης Ïυθμίσεων διακομιστή"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "ΕπιτυχημÎνη δοκιμαστική σÏνδεση"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "ΑποτυχημÎνη δοκιμαστική σÏνδεσης."
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "ΘÎλετε να διαγÏάψετε τις Ï„ÏÎχουσες Ïυθμίσεις του διακομιστή;"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Επιβεβαίωση ΔιαγÏαφής"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Î Ïοσοχή:</b> Οι εφαÏμογÎÏ‚ user_ldap και user_webdavauth είναι ασÏμβατες. ΜποÏεί να αντιμετωπίσετε απÏόβλεπτη συμπεÏιφοÏά. ΠαÏακαλώ ζητήστε από τον διαχειÏιστή συστήματος να απενεÏγοποιήσει μία από αυτÎÏ‚."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Î Ïοσοχή:</b> Το άÏθÏωμα PHP LDAP δεν είναι εγκατεστημÎνο και το σÏστημα υποστήÏιξης δεν θα δουλÎψει. ΠαÏακαλώ ζητήστε από τον διαχειÏιστή συστήματος να το εγκαταστήσει."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Ρυθμίσεις Διακομιστή"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Î Ïοσθήκη Ρυθμίσεων Διακομιστή"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Διακομιστής"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "ΜποÏείτε να παÏαλείψετε το Ï€Ïωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την πεÏίπτωση ξεκινήστε με ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Ένα DN Βάσης ανά γÏαμμή "
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "ΜποÏείτε να καθοÏίσετε το Base DN για χÏήστες και ομάδες από την καÏÏ„Îλα Î ÏοηγμÎνες Ïυθμίσεις"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "User DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Συνθηματικό"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Για ανώνυμη Ï€Ïόσβαση, αφήστε κενά τα πεδία DN και Pasword."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "User Login Filter"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "χÏησιμοποιήστε τη μεταβλητή %%uid, Ï€.χ. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "User List Filter"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "ΚαθοÏίζει το φίλτÏο που θα ισχÏει κατά την ανάκτηση επαφών."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "χωÏίς κάποια μεταβλητή, Ï€.χ. \"objectClass=άτομο\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Group Filter"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "ΚαθοÏίζει το φίλτÏο που θα ισχÏει κατά την ανάκτηση ομάδων."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "χωÏίς κάποια μεταβλητή, Ï€.χ. \"objectClass=ΟμάδαPosix\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Ρυθμίσεις ΣÏνδεσης"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "ΕνεÏγοποιηση Ïυθμισεων"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Όταν δεν είναι επιλεγμÎνο, αυτή η ÏÏθμιση θα Ï€ÏÎπει να παÏαλειφθεί. "
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "ΘÏÏα"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "ΔημιουÏγία αντιγÏάφων ασφαλείας (Replica) Host "
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Δώστε μια Ï€ÏοαιÏετική εφεδÏική υποδοχή. Î ÏÎπει να είναι Îνα αντίγÏαφο του κÏÏιου LDAP / AD διακομιστη."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "ΔημιουÏγία αντιγÏάφων ασφαλείας (Replica) Υποδοχη"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "ΑπενεÏγοποιηση του κεντÏικου διακομιστη"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Όταν ενεÏγοποιηθεί, με το ownCloud θα συνδεθείτε με το διακομιστή Ïεπλίκα."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "ΧÏήση TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Μην το χÏησιμοποιήσετε επιπÏοσθÎτως, για LDAPS συνδÎσεις , θα αποτÏχει."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP server (Windows) με διάκÏιση πεζών-ΚΕΦΑΛΑΙΩÎ"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "ΑπενεÏγοποίηση επικÏÏωσης Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Εάν η σÏνδεση δουλεÏει μόνο με αυτή την επιλογή, εισάγετε το LDAP SSL πιστοποιητικό του διακομιστή στον ownCloud server σας."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Δεν Ï€Ïοτείνεται, χÏήση μόνο για δοκιμÎÏ‚."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Cache Time-To-Live"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "σε δευτεÏόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Ρυθμίσεις Καταλόγου"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Πεδίο Ονόματος ΧÏήστη"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Η ιδιότητα LDAP που θα χÏησιμοποιείται για τη δημιουÏγία του ονόματος χÏήστη του ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Base User Tree"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Ένα DN βάσης χÏηστών ανά γÏαμμή"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "ΧαÏακτηÏιστικά αναζήτησης των χÏηστών "
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Î ÏοαιÏετικά? Ένα χαÏακτηÏιστικό ανά γÏαμμή "
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Group Display Name Field"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Η ιδιότητα LDAP που θα χÏησιμοποιείται για τη δημιουÏγία του ονόματος ομάδας του ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Base Group Tree"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Μια ομαδικη Βάση DN ανά γÏαμμή"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Ομάδα ΧαÏακτηÏιστικων Αναζήτηση"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Group-Member association"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Ειδικά ΧαÏακτηÏιστικά "
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Ποσοσταση πεδιου"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Î Ïοκαθισμενο πεδιο"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "σε bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Email τυπος"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "ΧÏήστης Î Ïοσωπικόςφάκελος Ονομασία Κανόνας "
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Αφήστε το κενό για το όνομα χÏήστη (Ï€Ïοεπιλογή). ΔιαφοÏετικά, συμπληÏώστε μία ιδιότητα LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Δοκιμαστικες Ïυθμισεις"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Βοήθεια"
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
index 084c4ad5ed..9e9a16cb2c 100644
--- a/l10n/en@pirate/user_ldap.po
+++ b/l10n/en@pirate/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: 2013-05-02 02:14+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: en@pirate\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Passcode"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 6a84048239..02508217bc 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Gastigo"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Bazo-DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Uzanto-DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Pasvorto"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtrilo de uzantensaluto"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "uzu la referencilon %%uid, ekz.: \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtrilo de uzantolisto"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Äœi difinas la filtrilon aplikotan, kiam veniÄas uzantoj."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sen ajna referencilo, ekz.: \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtrilo de grupo"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Äœi difinas la filtrilon aplikotan, kiam veniÄas grupoj."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sen ajna referencilo, ekz.: \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Pordo"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Uzi TLS-on"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-servilo blinda je litergrandeco (Vindozo)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Malkapabligi validkontrolon de SSL-atestiloj."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Ne rekomendata, uzu Äin nur por testoj."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "sekunde. Ajna ÅanÄo malplenigas la kaÅmemoron."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Kampo de vidignomo de uzanto"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Baza uzantarbo"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Kampo de vidignomo de grupo"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Baza gruparbo"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Asocio de grupo kaj membro"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "duumoke"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Helpo"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 0d42001006..a5ff79e96b 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 23:45+0000\n"
+"POT-Creation-Date: 2013-05-17 02:02+0200\n"
+"PO-Revision-Date: 2013-05-16 08:53+0000\n"
"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 7c1c605a2a..2fec96620a 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "No se pudo borrar la configuración del servidor"
@@ -53,281 +57,363 @@ msgstr "Mantener la configuración?"
msgid "Cannot add server configuration"
msgstr "No se puede añadir la configuración del servidor"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "La prueba de conexión fue exitosa"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "La prueba de conexión falló"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "¿Realmente desea eliminar la configuración actual del servidor?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Confirmar eliminación"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Configuración del Servidor"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Agregar configuracion del servidor"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Servidor"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Un DN Base por lÃnea"
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN usuario"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Contraseña"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para acceso anónimo, deje DN y contraseña vacÃos."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtro de inicio de sesión de usuario"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "usar %%uid como placeholder, ej: \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Lista de filtros de usuario"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "Sin placeholder, ej: \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtro de grupo"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Define el filtro a aplicar, cuando se obtienen grupos."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "Con cualquier placeholder, ej: \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Configuracion de coneccion"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configuracion activa"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Cuando deseleccione, esta configuracion sera omitida."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Puerto"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Host para backup (Replica)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Dar un host de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Puerto para backup (Replica)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Deshabilitar servidor principal"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Cuando se inicie, ownCloud unicamente estara conectado al servidor replica"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "No usar adicionalmente para conecciones LDAPS, estas fallaran"
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Apagar la validación por certificado SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "No recomendado, sólo para pruebas."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Cache TTL"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "en segundos. Un cambio vacÃa la cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Configuracion de directorio"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Campo de nombre de usuario a mostrar"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Ãrbol base de usuario"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Un DN Base de Usuario por lÃnea"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Atributos de la busqueda de usuario"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Opcional; un atributo por linea"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Campo de nombre de grupo a mostrar"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Ãrbol base de grupo"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Un DN Base de Grupo por lÃnea"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atributos de busqueda de grupo"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Asociación Grupo-Miembro"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Atributos especiales"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Cuota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Cuota por defecto"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "E-mail"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Regla para la carpeta Home de usuario"
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Configuración de prueba"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ayuda"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index e5394097ae..2f2f7af291 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Fallo al borrar la configuración del servidor"
@@ -53,281 +57,363 @@ msgstr "¿Mantener preferencias?"
msgid "Cannot add server configuration"
msgstr "No se pudo añadir la configuración del servidor"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "El este de conexión ha sido completado satisfactoriamente"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Falló es test de conexión"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "¿Realmente desea borrar la configuración actual del servidor?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Confirmar borrado"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Atención:</b> El módulo PHP LDAP no está instalado, este elemento no va a funcionar. Por favor, pedile al administrador que lo instale."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Configuración del Servidor"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Añadir Configuración del Servidor"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Servidor"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Una DN base por lÃnea"
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN usuario"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Contraseña"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para acceso anónimo, dejá DN y contraseña vacÃos."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtro de inicio de sesión de usuario"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "usar %%uid como plantilla, p. ej.: \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Lista de filtros de usuario"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "Sin plantilla, p. ej.: \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtro de grupo"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Define el filtro a aplicar cuando se obtienen grupos."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Configuración de Conección"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configuración activa"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Si no está seleccionada, esta configuración será omitida."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Puerto"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Host para copia de seguridad (réplica)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP/AD."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Puerto para copia de seguridad (réplica)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Deshabilitar el Servidor Principal"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Al comenzar, ownCloud se conectará únicamente al servidor réplica"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "No usar adicionalmente para conexiones LDAPS, las mismas fallarán"
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Desactivar la validación por certificado SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "No recomendado, sólo para pruebas."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Tiempo de vida del caché"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "en segundos. Cambiarlo vacÃa la cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Configuración de Directorio"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Campo de nombre de usuario a mostrar"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Ãrbol base de usuario"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Una DN base de usuario por lÃnea"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Atributos de la búsqueda de usuario"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Opcional; un atributo por linea"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Campo de nombre de grupo a mostrar"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Ãrbol base de grupo"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Una DN base de grupo por lÃnea"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atributos de búsqueda de grupo"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Asociación Grupo-Miembro"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Atributos Especiales"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Campo de cuota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Cuota por defecto"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Campo de e-mail"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Regla de nombre de los directorios de usuario"
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Probar configuración"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ayuda"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 778551dc00..9cc73eb82e 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: 2013-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 08:51+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -18,6 +18,10 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Serveri seadistuse kustutamine ebaõnnestus"
@@ -54,281 +58,363 @@ msgstr "Säilitada seadistused?"
msgid "Cannot add server configuration"
msgstr "Ei suuda lisada serveri seadistust"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Ühenduse testimine õnnestus"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Ühenduse testimine ebaõnnestus"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Oled kindel, et tahad kustutada praegust serveri seadistust?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Kinnita kustutamine"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Hoiatus:</b>PHP LDAP moodul pole paigaldatud ning LDAP kasutamine ei ole võimalik. Palu oma süsteeihaldurit see paigaldada."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Serveri seadistus"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Lisa serveri seadistus"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Host"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Baas DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Ãœks baas-DN rea kohta"
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Kasutaja DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Parool"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Anonüümseks ligipääsuks jäta DN ja parool tühjaks."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Kasutajanime filter"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Kasutajate nimekirja filter"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Määrab kasutajaid hankides filtri, mida rakendatakse."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Grupi filter"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Määrab gruppe hankides filtri, mida rakendatakse."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Ãœhenduse seaded"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Seadistus aktiivne"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Kui märkimata, siis seadistust ei kasutata"
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Varuserver"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Lisa täiendav LDAP/AD server, mida replikeeritakse peaserveriga."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Varuserveri (replika) port"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Ära kasuta peaserverit"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Märgituna ownCloud ühendub ainult varuserverisse."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Kasuta TLS-i"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "LDAPS puhul ära kasuta. Ühendus ei toimi."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Mittetõstutundlik LDAP server (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Lülita SSL sertifikaadi kontrollimine välja."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Pole soovitatav, kasuta ainult testimiseks."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Puhvri iga"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "sekundites. Muudatus tühjendab vahemälu."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Kataloogi seaded"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Kasutaja näidatava nime väli"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Baaskasutaja puu"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Ãœks kasutajate baas-DN rea kohta"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Kasutaja otsingu atribuudid"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Valikuline; üks atribuut rea kohta"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Grupi näidatava nime väli"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Baasgrupi puu"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Ãœks grupi baas-DN rea kohta"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Grupi otsingu atribuudid"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Grupiliikme seotus"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Spetsiifilised atribuudid"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Mahupiirangu atribuut"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Vaikimisi mahupiirang"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "baitides"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Email atribuut"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Kasutaja kodukataloogi nimetamise reegel"
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Testi seadistust"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Abiinfo"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 396651c963..95bbdedaee 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Zerbitzariaren konfigurazioa ezabatzeak huts egin du"
@@ -53,281 +57,363 @@ msgstr "Mantendu ezarpenak?"
msgid "Cannot add server configuration"
msgstr "Ezin da zerbitzariaren konfigurazioa gehitu"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Konexio froga ongi burutu da"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Konexio frogak huts egin du"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Baieztatu Ezabatzea"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Zerbitzariaren konfigurazioa"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Gehitu Zerbitzariaren Konfigurazioa"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Hostalaria"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Oinarrizko DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "DN Oinarri bat lerroko"
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Erabiltzaile DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Pasahitza"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Erabiltzaileen saioa hasteko iragazkia"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "erabili %%uid txantiloia, adb. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Erabiltzaile zerrendaren Iragazkia"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "txantiloirik gabe, adb. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Taldeen iragazkia"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "txantiloirik gabe, adb. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Konexio Ezarpenak"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Konfigurazio Aktiboa"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Markatuta ez dagoenean, konfigurazio hau ez da kontutan hartuko."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Portua"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Babeskopia (Replica) Ostalaria"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Eman babeskopia ostalari gehigarri bat. LDAP/AD zerbitzari nagusiaren replica bat izan behar da."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Babeskopia (Replica) Ataka"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Desgaitu Zerbitzari Nagusia"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Markatuta dagoenean, ownCloud bakarrik replica zerbitzarira konektatuko da."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Erabili TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Ez erabili LDAPS konexioetarako, huts egingo du."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Ezgaitu SSL ziurtagirien egiaztapena."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Ez da aholkatzen, erabili bakarrik frogak egiteko."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Katxearen Bizi-Iraupena"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "segundutan. Aldaketak katxea husten du."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Karpetaren Ezarpenak"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Erabiltzaileen bistaratzeko izena duen eremua"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Oinarrizko Erabiltzaile Zuhaitza"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Erabiltzaile DN Oinarri bat lerroko"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Erabili Bilaketa Atributuak "
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Aukerakoa; atributu bat lerro bakoitzeko"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Taldeen bistaratzeko izena duen eremua"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Oinarrizko Talde Zuhaitza"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Talde DN Oinarri bat lerroko"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Taldekatu Bilaketa Atributuak "
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Talde-Kide elkarketak"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Atributu Bereziak"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Kuota Eremua"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Kuota Lehenetsia"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "bytetan"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Eposta eremua"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia"
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Egiaztatu Konfigurazioa"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Laguntza"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index a5b101124f..f4363d8fdc 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "عملیات Øذ٠پیکربندی سرور ناموÙÙ‚ ماند"
@@ -53,281 +57,363 @@ msgstr "آیا تنظیمات ذخیره شود ؟"
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "تست اتصال با موÙقیت انجام گردید"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "تست اتصال ناموÙÙ‚ بود"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "آیا واقعا Ù…ÛŒ خواهید پیکربندی کنونی سرور را Øذ٠کنید؟"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "تایید ØØ°Ù"
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "پیکربندی سرور"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "اÙزودن پیکربندی سرور"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "میزبانی"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "گذرواژه"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Ùیلتر گروه"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "درگاه"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "در بایت"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "راه‌نما"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 8cad6d46a1..e812025830 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: fi_FI\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr "Säilytetäänkö asetukset?"
msgid "Cannot add server configuration"
msgstr "Palvelinasetusten lisäys epäonnistui"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Yhteystesti onnistui"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Yhteystesti epäonnistui"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Vahvista poisto"
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Isäntä"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Oletus DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Käyttäjän DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Salasana"
-#: templates/settings.php:49
+#: templates/settings.php:50
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:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Login suodatus"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "käytä %%uid paikanvaraajaa, ts. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Käyttäjien suodatus"
-#: templates/settings.php:58
+#: templates/settings.php:59
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:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ilman paikanvaraustermiä, ts. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Ryhmien suodatus"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Määrittelee käytettävän suodattimen, kun ryhmiä haetaan. "
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ilman paikanvaraustermiä, ts. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Yhteysasetukset"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Portti"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Poista pääpalvelin käytöstä"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Käytä TLS:ää"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Kirjainkoosta piittamaton LDAP-palvelin (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Poista käytöstä SSL-varmenteen vahvistus"
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Ei suositella, käytä vain testausta varten."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "sekunneissa. Muutos tyhjentää välimuistin."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Hakemistoasetukset"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Käyttäjän näytettävän nimen kenttä"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Oletuskäyttäjäpuu"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Ryhmän \"näytettävä nimi\"-kenttä"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Ryhmien juuri"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Ryhmän ja jäsenen assosiaatio (yhteys)"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "tavuissa"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Sähköpostikenttä"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ohje"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 3c1b02c6ad..f32e533d5a 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 13:57+0000\n"
+"POT-Creation-Date: 2013-05-17 02:02+0200\n"
+"PO-Revision-Date: 2013-05-16 08:53+0000\n"
"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
"Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 26cf3a1a6d..7ff7eb9939 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Échec de la suppression de la configuration du serveur"
@@ -53,281 +57,363 @@ msgstr "Garder ces paramètres ?"
msgid "Cannot add server configuration"
msgstr "Impossible d'ajouter la configuration du serveur."
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Test de connexion réussi"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Le test de connexion a échoué"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Confirmer la suppression"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Avertissement:</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des disfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Attention :</b> Le module php LDAP n'est pas installé, par conséquent cette extension ne pourra fonctionner. Veuillez contacter votre administrateur système afin qu'il l'installe."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Configuration du serveur"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Ajouter une configuration du serveur"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Hôte"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN Racine"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Un DN racine par ligne"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN Utilisateur (Autorisé à consulter l'annuaire)"
-#: templates/settings.php:45
+#: templates/settings.php:46
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 de l'utilisateur client pour lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour un accès anonyme, laisser le DN et le mot de passe vides."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Mot de passe"
-#: templates/settings.php:49
+#: templates/settings.php:50
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:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Modèle d'authentification utilisateurs"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtre d'utilisateurs"
-#: templates/settings.php:58
+#: templates/settings.php:59
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:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sans élément de substitution, par exemple \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtre de groupes"
-#: templates/settings.php:63
+#: templates/settings.php:64
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:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Paramètres de connexion"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configuration active"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Lorsque non cochée, la configuration sera ignorée."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Serveur de backup (réplique)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Fournir un serveur de backup optionnel. Il doit s'agir d'une réplique du serveur LDAP/AD principal."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Port du serveur de backup (réplique)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Désactiver le serveur principal"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Lorsqu'activé, ownCloud ne se connectera qu'au serveur répliqué."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Utiliser TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "À ne pas utiliser pour les connexions LDAPS (cela échouera)."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Serveur LDAP insensible à la casse (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Désactiver la validation du certificat SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Non recommandé, utilisation pour tests uniquement."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Durée de vie du cache"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "en secondes. Tout changement vide le cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Paramètres du répertoire"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Champ \"nom d'affichage\" de l'utilisateur"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "DN racine de l'arbre utilisateurs"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Un DN racine utilisateur par ligne"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Recherche des attributs utilisateur"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Optionnel, un attribut par ligne"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Champ \"nom d'affichage\" du groupe"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "DN racine de l'arbre groupes"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Un DN racine groupe par ligne"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Recherche des attributs du groupe"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Association groupe-membre"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Attributs spéciaux"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Champ du quota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Quota par défaut"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "en octets"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Champ Email"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Convention de nommage du répertoire utilisateur"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Laisser vide "
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Tester la configuration"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Aide"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 37a1e107ae..ce0a5d57d5 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Non foi posÃbel eliminar a configuración do servidor"
@@ -53,281 +57,363 @@ msgstr "Manter os axustes?"
msgid "Cannot add server configuration"
msgstr "Non é posÃbel engadir a configuración do servidor"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "A proba de conexión foi satisfactoria"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "A proba de conexión fracasou"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Confirma que quere eliminar a configuración actual do servidor?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Confirmar a eliminación"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth son incompatÃbeis. Pode acontecer un comportamento estraño. Consulte co administrador do sistema para desactivar un deles."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Aviso:</b> O módulo PHP LDAP non está instalado, o servidor non funcionará. Consulte co administrador do sistema para instalalo."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Configuración do servidor"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Engadir a configuración do servidor"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Servidor"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Un DN base por liña"
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN do usuario"
-#: templates/settings.php:45
+#: templates/settings.php:46
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 anónimo deixe o DN e o contrasinal baleiros."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Contrasinal"
-#: templates/settings.php:49
+#: templates/settings.php:50
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:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtro de acceso de usuarios"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, 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:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtro da lista de usuarios"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Define o filtro a aplicar cando se recompilan os usuarios."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sen ningunha marca de posición, como p.ex «objectClass=persoa»."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtro de grupo"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Define o filtro a aplicar cando se recompilan os grupos."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix»."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Axustes da conexión"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configuración activa"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Se está sen marcar, omÃtese esta configuración."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Porto"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Servidor da copia de seguranza (Réplica)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Indicar un servidor de copia de seguranza opcional. Debe ser unha réplica do servidor principal LDAP/AD."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Porto da copia de seguranza (Réplica)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Desactivar o servidor principal"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Cando está activado, ownCloud só se conectará ao servidor de réplica."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Non utilizalo ademais para conexións LDAPS xa que fallará."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Desactiva a validación do certificado SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
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 importe o certificado SSL do servidor LDAP no seu servidor ownCloud."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Non se recomenda. Só para probas."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Tempo de persistencia da caché"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "en segundos. Calquera cambio baleira a caché."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Axustes do directorio"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Campo de mostra do nome de usuario"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Base da árbore de usuarios"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Un DN base de usuario por liña"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Atributos de busca do usuario"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Opcional; un atributo por liña"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Campo de mostra do nome de grupo"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Base da árbore de grupo"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Un DN base de grupo por liña"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atributos de busca do grupo"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Asociación de grupos e membros"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Atributos especiais"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Campo de cota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Cota predeterminada"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "en bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Campo do correo"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Regra de nomeado do cartafol do usuario"
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Probar a configuración"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Axuda"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index dea5250c45..de33f13ec1 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/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: 2013-05-03 02:02+0200\n"
-"PO-Revision-Date: 2013-05-02 13:50+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -18,6 +18,10 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -54,281 +58,363 @@ msgstr "×”×× ×œ×©×ž×•×¨ ×ת ההגדרות?"
msgid "Cannot add server configuration"
msgstr "×œ× × ×™×ª×Ÿ להוסיף ×ת הגדרות השרת"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "בדיקת החיבור עברה בהצלחה"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "בדיקת החיבור × ×›×©×œ×”"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "×”×× ×כן למחוק ×ת הגדרות השרת ×”× ×•×›×—×™×•×ª?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "×ישור המחיקה"
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "הגדרות השרת"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "הוספת הגדרות השרת"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "מ×רח"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN משתמש"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "סיסמ×"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "לגישה ×× ×•× ×™×ž×™×ª, הש×ר ×ת ×”DM ×•×”×¡×™×¡×ž× ×¨×™×§×™×."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "×¡× ×Ÿ ×›× ×™×¡×ª משתמש"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "×¡× ×Ÿ רשימת משתמשי×"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "×¡× ×Ÿ קבוצה"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "פורט"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "×‘×©× ×™×•×ª. ×©×™× ×•×™ מרוקן ×ת המטמון."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "בבתי×"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "עזרה"
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 68d753a4e2..9b539eea4a 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "पासवरà¥à¤¡"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "सहयोग"
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 7cec467c48..127083fe20 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"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"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Lozinka"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Pomoć"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 55f3c26873..ff151467be 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Nem sikerült törölni a kiszolgáló konfigurációját"
@@ -53,281 +57,363 @@ msgstr "Tartsuk meg a beállÃtásokat?"
msgid "Cannot add server configuration"
msgstr "Az új kiszolgáló konfigurációja nem hozható létre"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "A kapcsolatellenőrzés eredménye: sikerült"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "A kapcsolatellenőrzés eredménye: nem sikerült"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Tényleg törölni szeretné a kiszolgáló beállÃtásait?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "A törlés megerÅ‘sÃtése"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Figyelem:</b> a user_ldap és user_webdavauth alkalmazások nem kompatibilisek. Együttes használatuk váratlan eredményekhez vezethet. Kérje meg a rendszergazdát, hogy a kettő közül kapcsolja ki az egyiket."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Figyelmeztetés:</b> Az LDAP PHP modul nincs telepÃtve, ezért ez az alrendszer nem fog működni. Kérje meg a rendszergazdát, hogy telepÃtse!"
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "A kiszolgálók beállÃtásai"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Új kiszolgáló beállÃtásának hozzáadása"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Kiszolgáló"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "A protokoll elÅ‘tag elhagyható, kivéve, ha SSL-t kÃván használni. Ebben az esetben kezdje Ãgy: ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN-gyökér"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Soronként egy DN-gyökér"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "A Haladó fülre kattintva külön DN-gyökér állÃtható be a felhasználók és a csoportok számára"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "A kapcsolódó felhasználó DN-je"
-#: templates/settings.php:45
+#: templates/settings.php:46
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 "Annak a felhasználónak a DN-je, akinek a nevében bejelentkezve kapcsolódunk a kiszolgálóhoz, pl. uid=agent,dc=example,dc=com. Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!"
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Jelszó"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!"
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Szűrő a bejelentkezéshez"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Ez a szűrÅ‘ érvényes a bejelentkezés megkÃsérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "használja az %%uid változót, pl. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "A felhasználók szűrője"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Ez a szűrő érvényes a felhasználók listázásakor."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "itt ne használjon változót, pl. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "A csoportok szűrője"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Ez a szűrő érvényes a csoportok listázásakor."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "itt ne használjunk változót, pl. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Kapcsolati beállÃtások"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "A beállÃtás aktÃv"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Ha nincs kipipálva, ez a beállÃtás kihagyódik."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Másodkiszolgáló (replika)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Adjon meg egy opcionális másodkiszolgálót. Ez a fő LDAP/AD kiszolgáló szinkron másolata (replikája) kell legyen."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "A másodkiszolgáló (replika) portszáma"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "A fő szerver kihagyása"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Ha ezt bekapcsoljuk, akkor az ownCloud csak a másodszerverekhez kapcsolódik."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Használjunk TLS-t"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "LDAPS kapcsolatok esetén ne kapcsoljuk be, mert nem fog működni."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Ne ellenÅ‘rizzük az SSL-tanúsÃtvány érvényességét"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Ha a kapcsolat csak ezzel a beállÃtással működik, akkor importálja az LDAP-kiszolgáló SSL tanúsÃtványát az ownCloud kiszolgálóra!"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Nem javasolt, csak tesztelésre érdemes használni."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "A gyorsÃtótár tárolási idÅ‘tartama"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "másodpercben. A változtatás törli a cache tartalmát."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "CÃmtár beállÃtások"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "A felhasználónév mezője"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Ebből az LDAP attribútumból képződik a felhasználó elnevezése, ami megjelenik az ownCloudban."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "A felhasználói fa gyökere"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Soronként egy felhasználói fa gyökerét adhatjuk meg"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "A felhasználók lekérdezett attribútumai"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Nem kötelező megadni, soronként egy attribútum"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "A csoport nevének mezője"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Ebből az LDAP attribútumból képződik a csoport elnevezése, ami megjelenik az ownCloudban."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "A csoportfa gyökere"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Soronként egy csoportfa gyökerét adhatjuk meg"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "A csoportok lekérdezett attribútumai"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "A csoporttagság attribútuma"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Különleges attribútumok"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Kvóta mező"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Alapértelmezett kvóta"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "bájtban"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Email mező"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "A home könyvtár elérési útvonala"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Hagyja üresen, ha a felhasználónevet kÃvánja használni. EllenkezÅ‘ esetben adjon meg egy LDAP/AD attribútumot!"
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "A beállÃtások tesztelése"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Súgó"
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index f0a118496f..ba65dd7eac 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Contrasigno"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Adjuta"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 4a2648e5ce..560387e305 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Gagal menghapus konfigurasi server"
@@ -53,281 +57,363 @@ msgstr "Biarkan pengaturan?"
msgid "Cannot add server configuration"
msgstr "Gagal menambah konfigurasi server"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Tes koneksi sukses"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Tes koneksi gagal"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Anda ingin menghapus Konfigurasi Server saat ini?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Konfirmasi Penghapusan"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Peringatan:/b> Aplikasi user_ldap dan user_webdavauth tidak kompatibel. Anda mungkin akan mengalami kejadian yang tidak diharapkan. Silakan minta administrator sistem untuk menonaktifkan salah satunya."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Konfigurasi server"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Tambah Konfigurasi Server"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Host"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Satu Base DN per baris"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "User DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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 dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Sandi"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Untuk akses anonim, biarkan DN dan Kata sandi kosong."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "gunakan saringan login"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Definisikan filter untuk diterapkan, saat login dilakukan. %%uid menggantikan username saat login."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "gunakan pengganti %%uid, mis. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Daftar Filter Pengguna"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definisikan filter untuk diterapkan saat menerima pengguna."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "tanpa pengganti apapun, mis. \"objectClass=seseorang\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "saringan grup"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definisikan filter untuk diterapkan saat menerima grup."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "tanpa pengganti apapaun, mis. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Pengaturan Koneksi"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Konfigurasi Aktif"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Jika tidak dicentang, konfigurasi ini dilewati."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Host Cadangan (Replika)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Port Cadangan (Replika)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Nonaktifkan Server Utama"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Saat diaktifkan, ownCloud hanya akan terhubung ke server replika."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "gunakan TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Jangan gunakan utamanya untuk koneksi LDAPS, koneksi akan gagal."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Server LDAP dengan kapitalisasi tidak sensitif (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "matikan validasi sertivikat SSL"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Jika koneksi hanya bekerja dengan opsi ini, impor sertifikat SSL server LDAP dari server ownCloud anda."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "tidak disarankan, gunakan hanya untuk pengujian."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Gunakan Tembolok untuk Time-To-Live"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "dalam detik. perubahan mengosongkan cache"
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Pengaturan Direktori"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Bidang Tampilan Nama Pengguna"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama pengguna ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Pohon Pengguna Dasar"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Satu Pengguna Base DN per baris"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Atribut Pencarian Pengguna"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Pilihan; satu atribut per baris"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Bidang Tampilan Nama Grup"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Atribut LDAP yang digunakan untuk menghasilkan nama grup ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Pohon Grup Dasar"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Satu Grup Base DN per baris"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atribut Pencarian Grup"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "asosiasi Anggota-Grup"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Atribut Khusus"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Bidang Kuota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Kuota Baku"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "dalam bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Bidang Email"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Aturan Penamaan Folder Home Pengguna"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Uji Konfigurasi"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Bantuan"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 707f5e9775..52c13fc9bf 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Netþjónn"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Lykilorð"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hjálp"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 5bc636cdbf..ecfe7df22a 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 10:32+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-16 08:53+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"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 55a4663df9..37733cea55 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Eliminazione della configurazione del server non riuscita"
@@ -53,281 +57,363 @@ msgstr "Vuoi mantenere le impostazioni?"
msgid "Cannot add server configuration"
msgstr "Impossibile aggiungere la configurazione del server"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Prova di connessione riuscita"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Prova di connessione non riuscita"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Vuoi davvero eliminare la configurazione attuale del server?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Conferma l'eliminazione"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne uno."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Avviso:</b> il modulo PHP LDAP non è installato, il motore non funzionerà . Chiedi al tuo amministratore di sistema di installarlo."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Configurazione del server"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Aggiungi configurazione del server"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Host"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Un DN base per riga"
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN utente"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Password"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtro per l'accesso utente"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "utilizza il segnaposto %%uid, ad esempio \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtro per l'elenco utenti"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Specifica quale filtro utilizzare durante il recupero degli utenti."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "senza nessun segnaposto, per esempio \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtro per il gruppo"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Specifica quale filtro utilizzare durante il recupero dei gruppi."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "senza nessun segnaposto, per esempio \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Impostazioni di connessione"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configurazione attiva"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Se deselezionata, questa configurazione sarà saltata."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Porta"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Host di backup (Replica)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Fornisci un host di backup opzionale. Deve essere una replica del server AD/LDAP principale."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Porta di backup (Replica)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Disabilita server principale"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Se abilitata, ownCloud si collegherà solo al server di replica."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Usa TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Da non utilizzare per le connessioni LDAPS, non funzionerà ."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Case insensitve LDAP server (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Disattiva il controllo del certificato SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Non consigliato, utilizzare solo per test."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Tempo di vita della cache"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "in secondi. Il cambio svuota la cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Impostazioni delle cartelle"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Campo per la visualizzazione del nome utente"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Struttura base dell'utente"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Un DN base utente per riga"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Attributi di ricerca utente"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Opzionale; un attributo per riga"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Campo per la visualizzazione del nome del gruppo"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Struttura base del gruppo"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Un DN base gruppo per riga"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Attributi di ricerca gruppo"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Associazione gruppo-utente "
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Attributi speciali"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Campo Quota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Quota predefinita"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "in byte"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Campo Email"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Regola di assegnazione del nome della cartella utente"
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Prova configurazione"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Aiuto"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index 7e169d97e4..d3bf595a9b 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/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: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-08 13:50+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -18,6 +18,10 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "サーãƒè¨å®šã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ"
@@ -54,281 +58,363 @@ msgstr "è¨å®šã‚’ä¿æŒã—ã¾ã™ã‹ï¼Ÿ"
msgid "Cannot add server configuration"
msgstr "サーãƒè¨å®šã‚’è¿½åŠ ã§ãã¾ã›ã‚“"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "接続テストã«æˆåŠŸã—ã¾ã—ãŸ"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "接続テストã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "ç¾åœ¨ã®ã‚µãƒ¼ãƒè¨å®šã‚’本当ã«å‰Šé™¤ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹ï¼Ÿ"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "削除ã®ç¢ºèª"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>è¦å‘Š:</b> user_ldap 㨠user_webdavauth ã®ã‚¢ãƒ—リã«ã¯äº’æ›æ€§ãŒã‚ã‚Šã¾ã›ã‚“。予期ã›ã¬å‹•ä½œã‚’ã™ã‚‹å¯èƒ½å§“ãŒã‚ã‚Šã¾ã™ã€‚システム管ç†è€…ã«ã©ã¡ã‚‰ã‹ã‚’無効ã«ã™ã‚‹ã‚ˆã†å•ã„åˆã‚ã›ã¦ãã ã•ã„。"
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>è¦å‘Š:</b> PHP LDAP モジュールãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“。ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãŒæ£ã—ã動作ã—ã¾ã›ã‚“。システム管ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã‚ˆã†å•ã„åˆã‚ã›ã¦ãã ã•ã„。"
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "サーãƒè¨å®š"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "サーãƒè¨å®šã‚’è¿½åŠ "
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "ホスト"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "SSL通信ã—ãªã„å ´åˆã«ã¯ã€ãƒ—ãƒãƒˆã‚³ãƒ«åã‚’çœç•¥ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ãã†ã§ãªã„å ´åˆã«ã¯ã€ldaps:// ã‹ã‚‰å§‹ã‚ã¦ãã ã•ã„。"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "ベースDN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "1è¡Œã«1ã¤ã®ãƒ™ãƒ¼ã‚¹DN"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "拡張タブã§ãƒ¦ãƒ¼ã‚¶ã¨ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ™ãƒ¼ã‚¹DNを指定ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "ユーザDN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "パスワード"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "匿åアクセスã®å ´åˆã¯ã€DNã¨ãƒ‘スワードを空ã«ã—ã¦ãã ã•ã„。"
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "ユーザãƒã‚°ã‚¤ãƒ³ãƒ•ã‚£ãƒ«ã‚¿"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "%%uid プレースホルダーを利用ã—ã¦ãã ã•ã„。例 \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "ユーザリストフィルタ"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "ユーザーをå–å¾—ã™ã‚‹ã¨ãã«é©ç”¨ã™ã‚‹ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’定義ã™ã‚‹ã€‚"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "プレースホルダーを利用ã—ãªã„ã§ãã ã•ã„。例 \"objectClass=person\""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "グループフィルタ"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "グループをå–å¾—ã™ã‚‹ã¨ãã«é©ç”¨ã™ã‚‹ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’定義ã™ã‚‹ã€‚"
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "プレースホルダーを利用ã—ãªã„ã§ãã ã•ã„。例 \"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "接続è¨å®š"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "è¨å®šã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã§ã™"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "ãƒã‚§ãƒƒã‚¯ã‚’外ã™ã¨ã€ã“ã®è¨å®šã¯ã‚¹ã‚ップã•ã‚Œã¾ã™ã€‚"
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "ãƒãƒ¼ãƒˆ"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—（レプリカ）ホスト"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ホストをオプションã§æŒ‡å®šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚メインã®LDAP/ADサーãƒã®ãƒ¬ãƒ—リカã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—（レプリカ）ãƒãƒ¼ãƒˆ"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "メインサーãƒã‚’無効ã«ã™ã‚‹"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "有効ã«ã™ã‚‹ã¨ã€ownCloudã¯ãƒ¬ãƒ—リカサーãƒã«ã®ã¿æŽ¥ç¶šã—ã¾ã™ã€‚"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "TLSを利用"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "LDAPS接続ã®ãŸã‚ã«è¿½åŠ ã§ãれを利用ã—ãªã„ã§ä¸‹ã•ã„。失敗ã—ã¾ã™ã€‚"
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "大文å—ï¼å°æ–‡å—を区別ã—ãªã„LDAPサーãƒï¼ˆWindows）"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "SSL証明書ã®ç¢ºèªã‚’無効ã«ã™ã‚‹ã€‚"
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "推奨ã—ã¾ã›ã‚“ã€ãƒ†ã‚¹ãƒˆç›®çš„ã§ã®ã¿åˆ©ç”¨ã—ã¦ãã ã•ã„。"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "ã‚ャッシュã®TTL"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "秒。変更後ã«ã‚ャッシュãŒã‚¯ãƒªã‚¢ã•ã‚Œã¾ã™ã€‚"
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "ディレクトリè¨å®š"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "ユーザ表示åã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "ユーザã®ownCloudåã®ç”Ÿæˆã«åˆ©ç”¨ã™ã‚‹LDAP属性。"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "ベースユーザツリー"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "1è¡Œã«1ã¤ã®ãƒ¦ãƒ¼ã‚¶ãƒ™ãƒ¼ã‚¹DN"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "ユーザ検索属性"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "オプション：1è¡Œã«1属性"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "グループ表示åã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "グループã®ownCloudåã®ç”Ÿæˆã«åˆ©ç”¨ã™ã‚‹LDAP属性。"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "ベースグループツリー"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "1è¡Œã«1ã¤ã®ã‚°ãƒ«ãƒ¼ãƒ—ベースDN"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "グループ検索属性"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "グループã¨ãƒ¡ãƒ³ãƒãƒ¼ã®é–¢é€£ä»˜ã‘"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "特殊属性"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "クォータフィールド"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "クォータã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆ"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "ãƒã‚¤ãƒˆ"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "メールフィールド"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "ユーザã®ãƒ›ãƒ¼ãƒ フォルダ命åè¦å‰‡"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "ユーザåを空ã®ã¾ã¾ã«ã—ã¦ãã ã•ã„（デフォルト）。ãã†ã§ãªã„å ´åˆã¯ã€LDAPã‚‚ã—ãã¯ADã®å±žæ€§ã‚’指定ã—ã¦ãã ã•ã„。"
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "è¨å®šã‚’テスト"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "ヘルプ"
diff --git a/l10n/ka/user_ldap.po b/l10n/ka/user_ldap.po
index a6e12c17b8..597ca22517 100644
--- a/l10n/ka/user_ldap.po
+++ b/l10n/ka/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/owncloud/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ka\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "პáƒáƒ áƒáƒšáƒ˜"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "შველáƒ"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index cdc9f72873..f083401586 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: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 09:04+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ka_GE\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "შეცდáƒáƒ›áƒ სერვერის კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ˜áƒ¡ წáƒáƒ¨áƒšáƒ˜áƒ¡áƒáƒ¡"
@@ -53,281 +57,363 @@ msgstr "დáƒáƒ•áƒ¢áƒáƒ•áƒáƒ— პáƒáƒ áƒáƒ›áƒ”ტრები?"
msgid "Cannot add server configuration"
msgstr "სერვერის პáƒáƒ áƒáƒ›áƒ”ტრების დáƒáƒ›áƒáƒ¢áƒ”ბრვერმáƒáƒ®áƒ”რხდáƒ"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "კáƒáƒ•áƒ¨áƒ˜áƒ ის ტესტირებრმáƒáƒ®áƒ”რხდáƒ"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "კáƒáƒ•áƒ¨áƒ˜áƒ ის ტესტირებრვერმáƒáƒ®áƒ”რხდáƒ"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "ნáƒáƒ›áƒ“ვილáƒáƒ“ გინდáƒáƒ— წáƒáƒ¨áƒáƒšáƒáƒ— სერვერის მიმდინáƒáƒ ე პáƒáƒ áƒáƒ›áƒ”ტრები?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "წáƒáƒ¨áƒšáƒ˜áƒ¡ დáƒáƒ“áƒáƒ¡áƒ¢áƒ£áƒ ებáƒ"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>გáƒáƒ¤áƒ თხილებáƒ:</b> áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ user_ldap დრuser_webdavauth áƒáƒ áƒáƒ—áƒáƒ•áƒ¡áƒ”ბáƒáƒ“იáƒ. თქვენ შეიძლებრშეეჩეხáƒáƒ— მáƒáƒ£áƒšáƒáƒ“ნელ შშედეგებს. თხáƒáƒ•áƒ”თ თქვენს áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ს ჩáƒáƒ—იშáƒáƒ¡ ერთერთი."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>გáƒáƒ¤áƒ თხილებáƒ:</b> PHP LDAP მáƒáƒ“ული áƒáƒ áƒáƒ ის ინსტáƒáƒšáƒ˜áƒ ებული, ბექენდი áƒáƒ იმუშáƒáƒ•áƒ”ბს. თხáƒáƒ•áƒ”თ თქვენს áƒáƒ“მინისტრáƒáƒ¢áƒáƒ ს დáƒáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒáƒ¡ ის."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "სერვერის პáƒáƒ áƒáƒ›áƒ”ტრები"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "სერვერის პáƒáƒ áƒáƒ›áƒ”ტრების დáƒáƒ›áƒáƒ¢áƒ”ბáƒ"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "ჰáƒáƒ¡áƒ¢áƒ˜"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "თქვენ შეგიძლიáƒáƒ— გáƒáƒ›áƒáƒ¢áƒáƒ•áƒáƒ— პრáƒáƒ¢áƒáƒ™áƒáƒšáƒ˜. გáƒáƒ დრáƒáƒ›áƒ˜áƒ¡áƒ გáƒáƒ˜áƒ დებáƒáƒ— SSL. შემდეგ დáƒáƒ˜áƒ¬áƒ§áƒ”თ ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "სáƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "ერთი სáƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ DN ერთ ხáƒáƒ–ზე"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "თქვენ შეგიძლიáƒáƒ— მიუთითáƒáƒ— სáƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ DN მáƒáƒ›áƒ®áƒ›áƒáƒ ებლებისთვის დრჯგუფებისთვის Advanced ტáƒáƒ‘ში"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "პáƒáƒ áƒáƒšáƒ˜"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "áƒáƒœáƒáƒœáƒ˜áƒ›áƒ£áƒ ი დáƒáƒ¨áƒ•áƒ”ბისთვის, დáƒáƒ¢áƒáƒ•áƒ”თ DN–ის დრპáƒáƒ áƒáƒšáƒ˜áƒ¡ ველები ცáƒáƒ იელი."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის ფილტრი"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნეთ %%uid დáƒáƒ›áƒáƒ¡áƒ ულებელი მáƒáƒ’: \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლებიის სიის ფილტრი"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "გáƒáƒ¤áƒ˜áƒšáƒ¢áƒ•áƒ რგáƒáƒœáƒ®áƒáƒ ციელდებáƒ, რáƒáƒªáƒ მáƒáƒ›áƒ®áƒ›áƒáƒ ებლების სირჩáƒáƒ›áƒáƒ˜áƒ¢áƒ•áƒ˜áƒ თებáƒ."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ყáƒáƒ•áƒ”ლგვáƒáƒ ი დáƒáƒ›áƒáƒ¡áƒ ულებელის გáƒáƒ ეშე, მáƒáƒ’: \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "ჯგუფის ფილტრი"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "გáƒáƒ¤áƒ˜áƒšáƒ¢áƒ•áƒ რგáƒáƒœáƒ®áƒáƒ ციელდებáƒ, რáƒáƒªáƒ ჯგუფის სირჩáƒáƒ›áƒáƒ˜áƒ¢áƒ•áƒ˜áƒ თებáƒ."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ყáƒáƒ•áƒ”ლგვáƒáƒ ი დáƒáƒ›áƒáƒ¡áƒ ულებელის გáƒáƒ ეშე, მáƒáƒ’: \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "კáƒáƒ•áƒ¨áƒ˜áƒ ის პáƒáƒ áƒáƒ›áƒ”ტრები"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ áƒáƒ¥áƒ¢áƒ˜áƒ£áƒ იáƒ"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "რáƒáƒªáƒ გáƒáƒ“áƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜áƒ, ეს კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ გáƒáƒ›áƒáƒ¢áƒáƒ•áƒ”ბული იქნებáƒ."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "პáƒáƒ ტი"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "ბექáƒáƒ¤ (რეპლიკáƒ) ჰáƒáƒ¡áƒ¢áƒ˜"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "მიუთითეთ რáƒáƒ˜áƒ›áƒ” ბექáƒáƒ¤ ჰáƒáƒ¡áƒ¢áƒ˜. ის უნდრიყáƒáƒ¡ ძირითáƒáƒ“ი LDAP/AD სერვერის რეპლიკáƒ."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "ბექáƒáƒ¤ (რეპლიკáƒ) პáƒáƒ ტი"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "გáƒáƒ›áƒáƒ თეთ ძირითáƒáƒ“ი სერვერი"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "რáƒáƒªáƒ მáƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜áƒ, ownCloud დáƒáƒ£áƒ™áƒáƒ•áƒ¨áƒ˜áƒ დებრმხáƒáƒšáƒáƒ“ რეპლიკრსერვერს."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნეთ TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "áƒáƒ გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნáƒáƒ— დáƒáƒ›áƒáƒ¢áƒ”ბით LDAPS კáƒáƒ•áƒ¨áƒ˜áƒ ი. ის წáƒáƒ უმáƒáƒ¢áƒ”ბლáƒáƒ“ დáƒáƒ¡áƒ ულდებáƒ."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP server (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "გáƒáƒ›áƒáƒ თეთ SSL სერთიფიკáƒáƒ¢áƒ˜áƒ¡ ვáƒáƒšáƒ˜áƒ“áƒáƒªáƒ˜áƒ."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "áƒáƒ áƒáƒ ის რეკáƒáƒ›áƒ”ნდირებული, გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნეთ მხáƒáƒšáƒáƒ“ სáƒáƒ¢áƒ”სტáƒáƒ“."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "ქეშის სიცáƒáƒªáƒ®áƒšáƒ˜áƒ¡ ხáƒáƒœáƒ’რძლივáƒáƒ‘áƒ"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "წáƒáƒ›áƒ”ბში. ცვლილებრáƒáƒ¡áƒ£áƒ¤áƒ—áƒáƒ•áƒ”ბს ქეშს."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "დირექტáƒáƒ იის პáƒáƒ áƒáƒ›áƒ”ტრები"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის დისფლეის სáƒáƒ®áƒ”ლის ფილდი"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP áƒáƒ¢áƒ იბუტი მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის ownCloud სáƒáƒ®áƒ”ლის გენერáƒáƒªáƒ˜áƒ˜áƒ¡áƒ—ვის."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "ძირითáƒáƒ“ მáƒáƒ›áƒ®áƒ›áƒáƒ ებელთრსიáƒ"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "ერთი მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის სáƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ DN ერთ ხáƒáƒ–ზე"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის ძებნის áƒáƒ¢áƒ იბუტი"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "áƒáƒ¤áƒªáƒ˜áƒáƒœáƒáƒšáƒ£áƒ ი; თითრáƒáƒ¢áƒ იბუტი თითრხáƒáƒ–ზე"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "ჯგუფის დისფლეის სáƒáƒ®áƒ”ლის ფილდი"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP áƒáƒ¢áƒ იბუტი ჯგუფის ownCloud სáƒáƒ®áƒ”ლის გენერáƒáƒªáƒ˜áƒ˜áƒ¡áƒ—ვის."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "ძირითáƒáƒ“ ჯგუფთრსიáƒ"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "ერთი ჯგუფის სáƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ DN ერთ ხáƒáƒ–ზე"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "ჯგუფური ძებნის áƒáƒ¢áƒ იბუტი"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "ჯგუფის წევრáƒáƒ‘ის áƒáƒ¡áƒáƒªáƒ˜áƒáƒªáƒ˜áƒ"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "სპეციáƒáƒšáƒ£áƒ ი áƒáƒ¢áƒ იბუტები"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "ქვáƒáƒ¢áƒáƒ¡ ველი"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "სáƒáƒ¬áƒ§áƒ˜áƒ¡áƒ˜ ქვáƒáƒ¢áƒ"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "ბáƒáƒ˜áƒ¢áƒ”ბში"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "იმეილის ველი"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის Home დირექტáƒáƒ იის სáƒáƒ®áƒ”ლების დáƒáƒ ქმევის წესი"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "დáƒáƒ¢áƒáƒ•áƒ”თ ცáƒáƒ იელი მáƒáƒ›áƒ®áƒ›áƒáƒ ებლის სáƒáƒ®áƒ”ლი (default). სხვრდáƒáƒœáƒáƒ ჩენში მიუთითეთ LDAP/AD áƒáƒ¢áƒ იბუტი."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "კáƒáƒ•áƒ¨áƒ˜áƒ ის ტესტირებáƒ"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "დáƒáƒ®áƒ›áƒáƒ ებáƒ"
diff --git a/l10n/kn/user_ldap.po b/l10n/kn/user_ldap.po
index 3b3ac191a8..f6390750e1 100644
--- a/l10n/kn/user_ldap.po
+++ b/l10n/kn/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: kn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index e08a48a9b5..de1ccbfd4a 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr "ì„¤ì •ì„ ìœ ì§€í•©ë‹ˆê¹Œ?"
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "연결 시험 성공"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "연결 시험 실패"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>ê²½ê³ :</b> user_ldap 앱과 user_webdavauth ì•±ì€ í˜¸í™˜ë˜ì§€ 않습니다. 오ë™ìž‘ì„ ì¼ìœ¼í‚¬ 수 있으므로, 시스템 관리ìžì—게 ìš”ì²í•˜ì—¬ 둘 중 하나만 사용하ë„ë¡ í•˜ì‹ì‹œì˜¤."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>ê²½ê³ :</b> PHP LDAP ëª¨ë“ˆì´ ë¹„í™œì„±í™”ë˜ì–´ 있거나 설치ë˜ì–´ 있지 않습니다. 백엔드를 ì‚¬ìš©í• ìˆ˜ 없습니다. 시스템 관리ìžì—게 설치를 ìš”ì²í•˜ì‹ì‹œì˜¤."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "호스트"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "SSLì„ ì‚¬ìš©í•˜ëŠ” 경우가 아니ë¼ë©´ í”„ë¡œí† ì½œì„ ìž…ë ¥í•˜ì§€ ì•Šì•„ë„ ë©ë‹ˆë‹¤. SSLì„ ì‚¬ìš©í•˜ë ¤ë©´ ldaps://를 ìž…ë ¥í•˜ì‹ì‹œì˜¤."
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "기본 DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "기본 DNì„ í•œ ì¤„ì— í•˜ë‚˜ì”© ìž…ë ¥í•˜ì‹ì‹œì˜¤"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "ê³ ê¸‰ íƒì—ì„œ ì‚¬ìš©ìž ë° ê·¸ë£¹ì— ëŒ€í•œ 기본 DNì„ ì§€ì •í• ìˆ˜ 있습니다."
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "ì‚¬ìš©ìž DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "암호"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "ìµëª… ì ‘ê·¼ì„ í—ˆìš©í•˜ë ¤ë©´ DNê³¼ 암호를 비워 ë‘ì‹ì‹œì˜¤."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "ì‚¬ìš©ìž ë¡œê·¸ì¸ í•„í„°"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "%%uid ìžë¦¬ 비움ìžë¥¼ 사용하ì‹ì‹œì˜¤. ì˜ˆì œ: \"uid=%%uid\"\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "ì‚¬ìš©ìž ëª©ë¡ í•„í„°"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "사용ìžë¥¼ ê²€ìƒ‰í• ë•Œ ì ìš©í• í•„í„°ë¥¼ ì •ì˜í•©ë‹ˆë‹¤."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ìžë¦¬ 비움ìžë¥¼ ì‚¬ìš©í• ìˆ˜ 없습니다. ì˜ˆì œ: \"objectClass=person\""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "그룹 필터"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "ê·¸ë£¹ì„ ê²€ìƒ‰í• ë•Œ ì ìš©í• í•„í„°ë¥¼ ì •ì˜í•©ë‹ˆë‹¤."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ìžë¦¬ 비움ìžë¥¼ ì‚¬ìš©í• ìˆ˜ 없습니다. ì˜ˆì œ: \"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "ì—°ê²° ì„¤ì •"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "구성 활성화"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "í¬íŠ¸"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "백업 (ë³µì œ) í¬íŠ¸"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "백업 (ë³µì œ) í¬íŠ¸"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "주 서버 비활성화"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "TLS 사용"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "서버ì—ì„œ 대소문ìžë¥¼ 구분하지 ì•ŠìŒ (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "SSL ì¸ì¦ì„œ ìœ íš¨ì„± 검사를 í•´ì œí•©ë‹ˆë‹¤."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "추천하지 ì•ŠìŒ, 테스트로만 사용하ì‹ì‹œì˜¤."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "ì´ˆ. í•ëª© 변경 ì‹œ ìºì‹œê°€ ê°±ì‹ ë©ë‹ˆë‹¤."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "ë””ë ‰í† ë¦¬ ì„¤ì •"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "사용ìžì˜ 표시 ì´ë¦„ í•„ë“œ"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP ì†ì„±ì€ 사용ìžì˜ ownCloud ì´ë¦„ì„ ìƒì„±í•˜ê¸° 위해 사용합니다."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "기본 ì‚¬ìš©ìž íŠ¸ë¦¬"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "ì‚¬ìš©ìž DNì„ í•œ ì¤„ì— í•˜ë‚˜ì”© ìž…ë ¥í•˜ì‹ì‹œì˜¤"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "ì‚¬ìš©ìž ê²€ìƒ‰ ì†ì„±"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "ê·¸ë£¹ì˜ í‘œì‹œ ì´ë¦„ í•„ë“œ"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP ì†ì„±ì€ ê·¸ë£¹ì˜ ownCloud ì´ë¦„ì„ ìƒì„±í•˜ê¸° 위해 사용합니다."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "기본 그룹 트리"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "그룹 기본 DNì„ í•œ ì¤„ì— í•˜ë‚˜ì”© ìž…ë ¥í•˜ì‹ì‹œì˜¤"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "그룹 검색 ì†ì„±"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "그룹-íšŒì› ì—°ê²°"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "ë°”ì´íŠ¸"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "ì‚¬ìš©ìž ì´ë¦„ì„ ì‚¬ìš©í•˜ë ¤ë©´ 비워 ë‘ì‹ì‹œì˜¤(기본값). 기타 경우 LDAP/AD ì†ì„±ì„ ì§€ì •í•˜ì‹ì‹œì˜¤."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "ë„움ë§"
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 4830e9d27a..47af30023b 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ku_IQ\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "وشەی تێپەربو"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "یارمەتی"
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index f6e6bd009a..659bda9a14 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Passwuert"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hëllef"
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 26af0dbe27..8df6aa7279 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"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"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Slaptažodis"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "GrupÄ—s filtras"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Prievadas"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Naudoti TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "IÅ¡jungti SSL sertifikato tikrinimÄ…."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Nerekomenduojama, naudokite tik testavimui."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Pagalba"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 100f2ca501..4eb1ccaa67 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "NeizdevÄs izdzÄ“st servera konfigurÄciju"
@@ -53,281 +57,363 @@ msgstr "Paturēt iestatījumus?"
msgid "Cannot add server configuration"
msgstr "Nevar pievienot servera konfigurÄciju"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Savienojuma tests ir veiksmīgs"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Savienojuma tests cieta neveiksmi"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Vai tieÅ¡Äm vÄ“laties dzÄ“st paÅ¡reizÄ“jo servera konfigurÄciju?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "ApstiprinÄt dzÄ“Å¡anu"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>BrÄ«dinÄjums:</b> lietotnes user_ldap un user_webdavauth ir nesavietojamas. TÄs var izraisÄ«t negaidÄ«tu uzvedÄ«bu. LÅ«dzu, prasiet savam sistÄ“mas administratoram kÄdu no tÄm deaktivÄ“t."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>BrÄ«dinÄjums:</b> PHP LDAP modulis nav uzinstalÄ“ts, aizmugure nedarbosies. LÅ«dzu, prasiet savam sistÄ“mas administratoram kÄdu no tÄm deaktivÄ“t."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Servera konfigurÄcija"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Pievienot servera konfigurÄciju"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Resursdators"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Var neiekļaut protokolu, izņemot, ja vajag SSL. Tad sÄkums ir ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "BÄzes DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Viena bÄzes DN rindÄ"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "LietotÄjiem un grupÄm bÄzes DN var norÄdÄ«t cilnÄ“ “PaplaÅ¡inÄtiâ€"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "LietotÄja DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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 "Klienta lietotÄja DN, ar ko veiks sasaisti, piemÄ“ram, uid=agent,dc=example,dc=com. Lai piekļūtu anonÄ«mi, atstÄjiet DN un paroli tukÅ¡u."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Parole"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Lai piekļūtu anonÄ«mi, atstÄjiet DN un paroli tukÅ¡u."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "LietotÄja ierakstÄ«Å¡anÄs filtrs"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "DefinÄ“ filtru, ko izmantot, kad mÄ“Ä£ina ierakstÄ«ties. %%uid ierakstÄ«Å¡anÄs darbÄ«bÄ aizstÄj lietotÄjvÄrdu."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "lieto %%uid vietturi, piemēram, \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "LietotÄju saraksta filtrs"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "DefinÄ“ filtru, ko izmantot, kad saņem lietotÄju sarakstu."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "bez jebkÄdiem vietturiem, piemÄ“ram, \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Grupu filtrs"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definē filtru, ko izmantot, kad saņem grupu sarakstu."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "bez jebkÄdiem vietturiem, piemÄ“ram, \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Savienojuma iestatījumi"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "KonfigurÄcija ir aktÄ«va"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Ja nav atzÄ«mÄ“ts, Å¡Ä« konfigurÄcija tiks izlaista."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Ports"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Rezerves (kopija) serveris"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "NorÄdi rezerves serveri (nav obligÄti). Tam ir jÄbÅ«t galvenÄ LDAP/AD servera kopijai."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Rezerves (kopijas) ports"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Deaktivēt galveno serveri"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Kad ieslēgts, ownCloud savienosies tikai ar kopijas serveri."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Lietot TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Neizmanto papildu LDAPS savienojumus! Tas nestrÄdÄs."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Reģistrnejutīgs LDAP serveris (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "IzslÄ“gt SSL sertifikÄtu validÄ“Å¡anu."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Ja savienojums darbojas ar Å¡o opciju, importÄ“ LDAP serveru SSL sertifikÄtu savÄ ownCloud serverÄ«."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Nav ieteicams, izmanto tikai testēšanai!"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Kešatmiņas dzīvlaiks"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "sekundēs. Izmaiņas iztukšos kešatmiņu."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Direktorijas iestatījumi"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "LietotÄja redzamÄ vÄrda lauks"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP atribÅ«ts, ko izmantot lietotÄja ownCloud vÄrda veidoÅ¡anai."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "BÄzes lietotÄju koks"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Viena lietotÄju bÄzes DN rindÄ"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "LietotÄju meklÄ“Å¡anas atribÅ«ts"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "NeobligÄti; viens atribÅ«ts rindÄ"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Grupas redzamÄ nosaukuma lauks"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP atribūts, ko izmantot grupas ownCloud nosaukuma veidošanai."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "BÄzes grupu koks"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Viena grupu bÄzes DN rindÄ"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Grupu meklēšanas atribūts"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Grupu piederÄ«bas asociÄcija"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Īpašie atribūti"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Kvotu lauks"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Kvotas noklusējums"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "baitos"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "E-pasta lauks"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "LietotÄja mÄjas mapes nosaukÅ¡anas kÄrtula"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "AtstÄt tukÅ¡u lietotÄja vÄrdam (noklusÄ“juma). CitÄdi, norÄdi LDAP/AD atribÅ«tu."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Testa konfigurÄcija"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Palīdzība"
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 92d9c35763..e41cfb4117 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Домаќин"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Може да го Ñкокнете протколот оÑвен ако не ви треба SSL. Тогаш Ñтавете ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Лозинка"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Помош"
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index f8d3c3c7fb..530eb8780c 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Kata laluan"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Bantuan"
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index 67429168c1..edf738755a 100644
--- a/l10n/my_MM/user_ldap.po
+++ b/l10n/my_MM/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: my_MM\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "စကားá€á€¾á€€á€º"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "အကူအညီ"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 643c1a84bf..90dc3040a4 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: nb_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Klarte ikke å slette tjener-konfigurasjonen."
@@ -53,281 +57,363 @@ msgstr "Behold innstillinger?"
msgid "Cannot add server configuration"
msgstr "Kan ikke legge til tjener-konfigurasjon"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Tilkoblingstest lyktes"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Tilkoblingstest mislyktes"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Bekreft sletting"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Advarsel:</b>Apps user_ldap og user_webdavauth er ikke kompatible. Du kan oppleve uventet atferd fra systemet. Vennligst spør din system-administrator om å deaktivere en av dem."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Warning:</b> PHP LDAP modulen er ikke installert, hjelperen vil ikke virke. Vennligst be din system-administrator om å installere den."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Tjener-konfigurasjon"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Legg til tjener-konfigurasjon"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Tjener"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Du kan utelate protokollen, men du er påkrevd å bruke SSL. Deretter starte med ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "En hoved DN pr. linje"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Du kan spesifisere Base DN for brukere og grupper under Avansert fanen"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Bruker DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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 nummeret til klienten som skal bindes til, f.eks. uid=agent,dc=example,dc=com. For anonym tilgang, la DN- og passord-feltet stå tomt."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Passord"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "For anonym tilgang, la DN- og passord-feltet stå tomt."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Brukerpålogging filter"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Definerer filteret som skal brukes når et påloggingsforsøk blir utført. %%uid erstatter brukernavnet i innloggingshandlingen."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "bruk %%uid plassholder, f.eks. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Brukerliste filter"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definerer filteret som skal brukes, når systemet innhenter brukere."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "uten noe plassholder, f.eks. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Gruppefilter"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definerer filteret som skal brukes, når systemet innhenter grupper."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "uten noe plassholder, f.eks. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Konfigurasjon aktiv"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Når ikke huket av så vil denne konfigurasjonen bli hoppet over."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Sikkerhetskopierings (Replica) vert"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Bruk TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Case-insensitiv LDAP tjener (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Slå av SSL-sertifikat validering"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Hvis tilgang kun fungerer med dette alternativet, importer LDAP-tjenerens SSL-sertifikat til din egen ownCloud tjener."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Ikke anbefalt, bruk kun for testing"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "i sekunder. En endring tømmer bufferen."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Vis brukerens navnfelt"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP-attributen å bruke for å generere brukers ownCloud navn."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Hovedbruker tre"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "En Bruker Base DN pr. linje"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Vis gruppens navnfelt"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP-attributen å bruke for å generere gruppens ownCloud navn."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Hovedgruppe tre"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "En gruppe hoved-DN pr. linje"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "gruppe-medlem assosiasjon"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "i bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "La stå tom for brukernavn (standard). Ellers, spesifiser en LDAP/AD attributt."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hjelp"
diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po
index 871723423d..8bc9905662 100644
--- a/l10n/ne/user_ldap.po
+++ b/l10n/ne/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ne\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 4f6f89f81f..d50df3b23f 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 19:21+0000\n"
+"POT-Creation-Date: 2013-05-17 02:02+0200\n"
+"PO-Revision-Date: 2013-05-16 08:53+0000\n"
"Last-Translator: André Koot <meneer@tken.net>\n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index e7ea182314..3015b805fd 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Verwijderen serverconfiguratie mislukt"
@@ -53,281 +57,363 @@ msgstr "Instellingen bewaren?"
msgid "Cannot add server configuration"
msgstr "Kon de serverconfiguratie niet toevoegen"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Verbindingstest geslaagd"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Verbindingstest mislukt"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Bevestig verwijderen"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Waarschuwing:</b> De PHP LDAP module is niet geïnstalleerd, het backend zal niet werken. Vraag uw systeembeheerder om de module te installeren."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Serverconfiguratie"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Toevoegen serverconfiguratie"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Host"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Een Base DN per regel"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Je kunt het Base DN voor gebruikers en groepen specificeren in het tab Geavanceerd."
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "User DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Wachtwoord"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Voor anonieme toegang, laat de DN en het wachtwoord leeg."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Gebruikers Login Filter"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "gebruik %%uid placeholder, bijv. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Gebruikers Lijst Filter"
-#: templates/settings.php:58
+#: templates/settings.php:59
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:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "zonder een placeholder, bijv. \"objectClass=person\""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Groep Filter"
-#: templates/settings.php:63
+#: templates/settings.php:64
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:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "zonder een placeholder, bijv. \"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Verbindingsinstellingen"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configuratie actief"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Als dit niet is ingeschakeld wordt deze configuratie overgeslagen."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Poort"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Backup (Replica) Host"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Opgeven optionele backup host. Het moet een replica van de hoofd LDAP/AD server."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Backup (Replica) Poort"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Deactiveren hoofdserver"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Wanneer ingeschakeld, zal ownCloud allen verbinden met de replicaserver."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Gebruik TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Gebruik het niet voor LDAPS verbindingen, dat gaat niet lukken."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Niet-hoofdlettergevoelige LDAP server (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Schakel SSL certificaat validatie uit."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Niet aangeraden, gebruik alleen voor test doeleinden."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Cache time-to-live"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "in seconden. Een verandering maakt de cache leeg."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Mapinstellingen"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Gebruikers Schermnaam Veld"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Basis Gebruikers Structuur"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Een User Base DN per regel"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Attributen voor gebruikerszoekopdrachten"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Optioneel; één attribuut per regel"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Groep Schermnaam Veld"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Basis Groupen Structuur"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Een Group Base DN per regel"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Attributen voor groepszoekopdrachten"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Groepslid associatie"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Speciale attributen"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Quota veld"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Quota standaard"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "in bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "E-mailveld"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Gebruikers Home map naamgevingsregel"
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Test configuratie"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Help"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 6ffc783624..e4d45cd682 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -4,12 +4,13 @@
#
# Translators:
# unhammer <unhammer+dill@mm.st>, 2013
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-07 18:40+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-16 09:30+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -70,7 +71,7 @@ msgstr "Ingen %s-ID."
#: ajax/vcategories/addToFavorites.php:35
#, php-format
msgid "Error adding %s to favorites."
-msgstr "Klarte ikkje å leggja til %s i favorittar."
+msgstr "Klarte ikkje leggja til %s i favorittar."
#: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
msgid "No categories selected for deletion."
@@ -79,7 +80,7 @@ msgstr "Ingen kategoriar valt for sletting."
#: ajax/vcategories/removeFromFavorites.php:35
#, php-format
msgid "Error removing %s from favorites."
-msgstr "Klarte ikkje å fjerna %s frå favorittar."
+msgstr "Klarte ikkje fjerna %s frå favorittar."
#: js/config.php:34
msgid "Sunday"
@@ -199,11 +200,11 @@ msgstr "førre månad"
#: js/js.js:727
msgid "{months} months ago"
-msgstr "{months) månader sidan"
+msgstr "{months} månadar sidan"
#: js/js.js:728
msgid "months ago"
-msgstr "månader sidan"
+msgstr "månadar sidan"
#: js/js.js:729
msgid "last year"
@@ -248,7 +249,7 @@ msgstr "Feil"
#: js/oc-vcategories.js:179
msgid "The app name is not specified."
-msgstr "App-namnet er ikkje spesifisert."
+msgstr "Programnamnet er ikkje spesifisert."
#: js/oc-vcategories.js:194
msgid "The required file {file} is not installed!"
@@ -308,11 +309,11 @@ msgstr "Send"
#: js/share.js:178
msgid "Set expiration date"
-msgstr "Set utlaupsdato"
+msgstr "Set utløpsdato"
#: js/share.js:179
msgid "Expiration date"
-msgstr "Utlaupsdato"
+msgstr "Utløpsdato"
#: js/share.js:211
msgid "Share via email:"
@@ -364,11 +365,11 @@ msgstr "Passordverna"
#: js/share.js:577
msgid "Error unsetting expiration date"
-msgstr "Klarte ikkje å fjerna utlaupsdato"
+msgstr "Klarte ikkje fjerna utløpsdato"
#: js/share.js:589
msgid "Error setting expiration date"
-msgstr "Klarte ikkje å setja utlaupsdato"
+msgstr "Klarte ikkje setja utløpsdato"
#: js/share.js:604
msgid "Sending ..."
@@ -447,7 +448,7 @@ msgstr "Brukarar"
#: strings.php:7
msgid "Apps"
-msgstr "Applikasjonar"
+msgstr "Program"
#: strings.php:8
msgid "Admin"
@@ -525,13 +526,13 @@ msgstr "Datamappe"
#: templates/installation.php:74
msgid "Configure the database"
-msgstr "Konfigurer databasen"
+msgstr "Set opp databasen"
#: templates/installation.php:79 templates/installation.php:91
#: templates/installation.php:102 templates/installation.php:113
#: templates/installation.php:125
msgid "will be used"
-msgstr "vil bli nytta"
+msgstr "vil verta nytta"
#: templates/installation.php:137
msgid "Database user"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index e817942480..c5a3a400a6 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -4,13 +4,14 @@
#
# Translators:
# unhammer <unhammer+dill@mm.st>, 2013
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-15 01:59+0200\n"
-"PO-Revision-Date: 2013-05-15 00:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-05-17 02:02+0200\n"
+"PO-Revision-Date: 2013-05-16 09:40+0000\n"
+"Last-Translator: unhammer <unhammer+dill@mm.st>\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"
@@ -21,12 +22,12 @@ msgstr ""
#: ajax/move.php:17
#, php-format
msgid "Could not move %s - File with this name already exists"
-msgstr "Klarte ikkje å flytta %s – det finst allereie ei fil med dette namnet"
+msgstr "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet"
#: ajax/move.php:27 ajax/move.php:30
#, php-format
msgid "Could not move %s"
-msgstr "Klarte ikkje å flytta %s"
+msgstr "Klarte ikkje flytta %s"
#: ajax/upload.php:19
msgid "No file was uploaded. Unknown error"
@@ -61,7 +62,7 @@ msgstr "Manglar ei mellombels mappe"
#: ajax/upload.php:33
msgid "Failed to write to disk"
-msgstr "Klarte ikkje å skriva til disk"
+msgstr "Klarte ikkje skriva til disk"
#: ajax/upload.php:51
msgid "Not enough storage available"
@@ -161,7 +162,7 @@ msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store."
#: js/files.js:264
msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr "Klarte ikkje å lasta opp fila sidan ho er ei mappe eller er på 0 byte"
+msgstr "Klarte ikkje lasta opp fila sidan ho er ei mappe eller er på 0 byte"
#: js/files.js:277
msgid "Not enough space available"
@@ -174,11 +175,11 @@ msgstr "Opplasting avbroten."
#: js/files.js:413
msgid ""
"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga bli avbroten."
+msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten."
#: js/files.js:486
msgid "URL cannot be empty."
-msgstr "URL-en kan ikkje vera tom."
+msgstr "Nettadressa kan ikkje vera tom."
#: js/files.js:491
msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
@@ -222,7 +223,7 @@ msgstr ""
#: lib/app.php:73
msgid "Unable to rename file"
-msgstr "Klarte ikkje å endra filnamnet"
+msgstr "Klarte ikkje endra filnamnet"
#: lib/helper.php:11 templates/index.php:18
msgid "Upload"
@@ -242,11 +243,11 @@ msgstr "maks. moglege:"
#: templates/admin.php:15
msgid "Needed for multi-file and folder downloads."
-msgstr "Naudsynt for fleirfils- og mappenedlastingar."
+msgstr "Nødvendig for fleirfils- og mappenedlastingar."
#: templates/admin.php:17
msgid "Enable ZIP-download"
-msgstr "Skru på ZIP-nedlasting"
+msgstr "Slå på ZIP-nedlasting"
#: templates/admin.php:20
msgid "0 is unlimited"
@@ -308,7 +309,7 @@ msgstr "For stor opplasting"
msgid ""
"The files you are trying to upload exceed the maximum size for file uploads "
"on this server."
-msgstr "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren."
+msgstr "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren."
#: templates/index.php:114
msgid "Files are being scanned, please wait."
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index 9521606544..0fced10d32 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -3,12 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 17:40+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-16 09:30+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -35,25 +36,25 @@ msgstr "Brukarar"
#: app.php:398
msgid "Apps"
-msgstr "Applikasjonar"
+msgstr "Program"
#: app.php:406
msgid "Admin"
msgstr "Administrer"
-#: files.php:209
+#: files.php:207
msgid "ZIP download is turned off."
msgstr ""
-#: files.php:210
+#: files.php:208
msgid "Files need to be downloaded one by one."
msgstr ""
-#: files.php:211 files.php:244
+#: files.php:209 files.php:242
msgid "Back to Files"
msgstr ""
-#: files.php:241
+#: files.php:239
msgid "Selected files too large to generate zip file."
msgstr ""
@@ -172,13 +173,13 @@ msgstr ""
msgid "MS SQL username and/or password not valid: %s"
msgstr ""
-#: setup.php:858
+#: setup.php:859
msgid ""
"Your web server is not yet properly setup to allow files synchronization "
"because the WebDAV interface seems to be broken."
msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
-#: setup.php:859
+#: setup.php:860
#, php-format
msgid "Please double check the <a href='%s'>installation guides</a>."
msgstr "Ver vennleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index ac35cb7aed..8392d63c38 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -4,12 +4,13 @@
#
# Translators:
# unhammer <unhammer+dill@mm.st>, 2013
+# unhammer <unhammer+dill@mm.st>, 2013
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-30 01:57+0200\n"
-"PO-Revision-Date: 2013-04-29 17:40+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-16 09:40+0000\n"
"Last-Translator: unhammer <unhammer+dill@mm.st>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
@@ -29,11 +30,11 @@ msgstr "Autentiseringsfeil"
#: ajax/changedisplayname.php:31
msgid "Your display name has been changed."
-msgstr "Visningsnamnet ditt er endra."
+msgstr "Visingsnamnet ditt er endra."
#: ajax/changedisplayname.php:34
msgid "Unable to change display name"
-msgstr "Klarte ikkje å endra visningsnamnet"
+msgstr "Klarte ikkje endra visingsnamnet"
#: ajax/creategroup.php:10
msgid "Group already exists"
@@ -41,11 +42,11 @@ msgstr "Gruppa finst allereie"
#: ajax/creategroup.php:19
msgid "Unable to add group"
-msgstr "Klarte ikkje å leggja til gruppa"
+msgstr "Klarte ikkje leggja til gruppa"
#: ajax/enableapp.php:11
msgid "Could not enable app. "
-msgstr "Klarte ikkje å aktivera app-en."
+msgstr "Klarte ikkje slå på programmet."
#: ajax/lostpassword.php:12
msgid "Email saved"
@@ -61,7 +62,7 @@ msgstr "Klarte ikkje å sletta gruppa"
#: ajax/removeuser.php:24
msgid "Unable to delete user"
-msgstr "Klarte ikkje å sletta brukaren"
+msgstr "Klarte ikkje sletta brukaren"
#: ajax/setlanguage.php:15
msgid "Language changed"
@@ -78,16 +79,16 @@ msgstr "Administratorar kan ikkje fjerna seg sjølve frå admin-gruppa"
#: ajax/togglegroups.php:30
#, php-format
msgid "Unable to add user to group %s"
-msgstr "Klarte ikkje å leggja til brukaren til gruppa %s"
+msgstr "Klarte ikkje leggja til brukaren til gruppa %s"
#: ajax/togglegroups.php:36
#, php-format
msgid "Unable to remove user from group %s"
-msgstr "Klarte ikkje å fjerna brukaren frå gruppa %s"
+msgstr "Klarte ikkje fjerna brukaren frå gruppa %s"
#: ajax/updateapp.php:14
msgid "Couldn't update app."
-msgstr "Klarte ikkje å oppdatera app-en."
+msgstr "Klarte ikkje oppdatera programmet."
#: js/apps.js:30
msgid "Update to {appversion}"
@@ -125,44 +126,44 @@ msgstr "Oppdatert"
msgid "Saving..."
msgstr "Lagrar …"
-#: js/users.js:43
+#: js/users.js:47
msgid "deleted"
msgstr "sletta"
-#: js/users.js:43
+#: js/users.js:47
msgid "undo"
msgstr "angra"
-#: js/users.js:75
+#: js/users.js:79
msgid "Unable to remove user"
-msgstr "Klarte ikkje å fjerna brukaren"
+msgstr "Klarte ikkje fjerna brukaren"
-#: js/users.js:88 templates/users.php:26 templates/users.php:78
+#: js/users.js:92 templates/users.php:26 templates/users.php:78
#: templates/users.php:103
msgid "Groups"
msgstr "Grupper"
-#: js/users.js:91 templates/users.php:80 templates/users.php:115
+#: js/users.js:95 templates/users.php:80 templates/users.php:115
msgid "Group Admin"
msgstr "Gruppestyrar"
-#: js/users.js:111 templates/users.php:155
+#: js/users.js:115 templates/users.php:155
msgid "Delete"
msgstr "Slett"
-#: js/users.js:262
+#: js/users.js:269
msgid "add group"
msgstr "legg til gruppe"
-#: js/users.js:414
+#: js/users.js:420
msgid "A valid username must be provided"
msgstr "Du må oppgje eit gyldig brukarnamn"
-#: js/users.js:415 js/users.js:421 js/users.js:436
+#: js/users.js:421 js/users.js:427 js/users.js:442
msgid "Error creating user"
msgstr "Feil ved oppretting av brukar"
-#: js/users.js:420
+#: js/users.js:426
msgid "A valid password must be provided"
msgstr "Du må oppgje eit gyldig passord"
@@ -206,7 +207,7 @@ msgstr "Modulen «fileinfo» manglar"
msgid ""
"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
"module to get best results with mime-type detection."
-msgstr "PHP-modulen «fileinfo» manglar. Me rår sterkt til å skru på denne modulen for å best mogleg oppdaga MIME-typar."
+msgstr "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar."
#: templates/admin.php:58
msgid "Locale not working"
@@ -218,7 +219,7 @@ msgid ""
"This ownCloud server can't set system locale to %s. This means that there "
"might be problems with certain characters in file names. We strongly suggest"
" to install the required packages on your system to support %s."
-msgstr "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som krevst for å støtta %s."
+msgstr "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som trengst for å støtta %s."
#: templates/admin.php:75
msgid "Internet connection not working"
@@ -232,7 +233,7 @@ msgid ""
"remote and sending of notification emails might also not work. We suggest to"
" enable internet connection for this server if you want to have all features"
" of ownCloud."
-msgstr "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsapplikasjonar ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du skrur på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud."
+msgstr "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsprogram ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du slå på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud."
#: templates/admin.php:92
msgid "Cron"
@@ -260,7 +261,7 @@ msgstr "Deling"
#: templates/admin.php:134
msgid "Enable Share API"
-msgstr "Skru på API-et for deling"
+msgstr "Slå på API-et for deling"
#: templates/admin.php:135
msgid "Allow apps to use the Share API"
@@ -307,7 +308,7 @@ msgstr "Krev at klientar koplar til ownCloud med ei kryptert tilkopling."
msgid ""
"Please connect to this ownCloud instance via HTTPS to enable or disable the "
"SSL enforcement."
-msgstr "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å skru av/på SSL-handhevinga."
+msgstr "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å slå av/på SSL-handhevinga."
#: templates/admin.php:195
msgid "Log"
@@ -349,11 +350,11 @@ msgstr "Fleire app-ar"
#: templates/apps.php:28
msgid "Select an App"
-msgstr "Vel ein applikasjon"
+msgstr "Vel eit program"
#: templates/apps.php:34
msgid "See application page at apps.owncloud.com"
-msgstr "Sjå applikasjonssida på apps.owncloud.com"
+msgstr "Sjå programsida på apps.owncloud.com"
#: templates/apps.php:36
msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
@@ -410,7 +411,7 @@ msgstr "Passordet ditt er endra"
#: templates/personal.php:39
msgid "Unable to change your password"
-msgstr "Klarte ikkje å endra passordet"
+msgstr "Klarte ikkje endra passordet"
#: templates/personal.php:40
msgid "Current password"
@@ -426,7 +427,7 @@ msgstr "Endra passord"
#: templates/personal.php:56 templates/users.php:76
msgid "Display Name"
-msgstr "Visningsnamn"
+msgstr "Visingsnamn"
#: templates/personal.php:68
msgid "Email"
@@ -438,7 +439,7 @@ msgstr "Di epost-adresse"
#: templates/personal.php:71
msgid "Fill in an email address to enable password recovery"
-msgstr "Fyll inn e-postadressa di for å aktivera passordgjenoppretting"
+msgstr "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg"
#: templates/personal.php:77 templates/personal.php:78
msgid "Language"
@@ -482,7 +483,7 @@ msgstr "Lagring"
#: templates/users.php:93
msgid "change display name"
-msgstr "endra visningsnamn"
+msgstr "endra visingsnamn"
#: templates/users.php:97
msgid "set new password"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 8e326e3829..97d542ba33 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-01 01:59+0200\n"
-"PO-Revision-Date: 2013-04-30 07:40+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Passord"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hjelp"
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index 4da5e8266b..c863a67f1f 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Senhal"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index c1425a6570..8966061fb9 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"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"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Nie można usunąć konfiguracji serwera"
@@ -53,281 +57,363 @@ msgstr "Zachować ustawienia?"
msgid "Cannot add server configuration"
msgstr "Nie można dodać konfiguracji serwera"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Test połączenia udany"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Test połączenia nie udany"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Czy chcesz usunąć bieżącą konfigurację serwera?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Potwierdź usunięcie"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Ostrzeżenie:</b> Moduł PHP LDAP nie jest zainstalowany i nie będzie działał. Poproś administratora o włączenie go."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Konfiguracja servera"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Dodaj konfiguracjÄ™ servera"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Host"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Baza DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Jedna baza DN na liniÄ™"
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Użytkownik DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Hasło"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Dla dostępu anonimowego pozostawić DN i hasło puste."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtr logowania użytkownika"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "Użyj %%uid zastępczy, np. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Lista filtrów użytkownika"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definiuje filtry do zastosowania, podczas pobierania użytkowników."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "bez żadnych symboli zastępczych np. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Grupa filtrów"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definiuje filtry do zastosowania, podczas pobierania grup."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "bez żadnych symboli zastępczych np. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Konfiguracja połączeń"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Konfiguracja archiwum"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Gdy niezaznaczone, ta konfiguracja zostanie pominięta."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Kopia zapasowa (repliki) host"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Dać opcjonalnie hosta kopii zapasowej . To musi być repliką głównego serwera LDAP/AD."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Kopia zapasowa (repliki) Port"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Wyłącz serwer główny"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Po włączeniu, ownCloud tylko połączy się z serwerem repliki."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Użyj TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Nie używaj go dodatkowo dla połączeń protokołu LDAPS, zakończy się niepowodzeniem."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Wielkość liter serwera LDAP (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Wyłączyć sprawdzanie poprawności certyfikatu SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Niezalecane, użyj tylko testowo."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Przechowuj czas życia"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "w sekundach. Zmiana opróżnia pamięć podręczną."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Ustawienia katalogów"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Pole wyświetlanej nazwy użytkownika"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Drzewo bazy użytkowników"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Jeden użytkownik Bazy DN na linię"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Szukaj atrybutów"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Opcjonalnie; jeden atrybut w wierszu"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Pole wyświetlanej nazwy grupy"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Drzewo bazy grup"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Jedna grupa bazy DN na liniÄ™"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Grupa atrybutów wyszukaj"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Członek grupy stowarzyszenia"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Specjalne atrybuty"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Pole przydziału"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Przydział domyślny"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "w bajtach"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Pole email"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Reguły nazewnictwa folderu domowego użytkownika"
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Konfiguracja testowa"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Pomoc"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 8696f9e914..158e6f0286 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 11:21+0000\n"
+"POT-Creation-Date: 2013-05-17 02:02+0200\n"
+"PO-Revision-Date: 2013-05-16 08:53+0000\n"
"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 04273762bd..e841f4f0a0 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Falha ao deletar a configuração do servidor"
@@ -53,281 +57,363 @@ msgstr "Manter ajustes?"
msgid "Cannot add server configuration"
msgstr "ImpossÃvel adicionar a configuração do servidor"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Teste de conexão bem sucedida"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Teste de conexão falhou"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Você quer realmente deletar as atuais Configurações de Servidor?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Confirmar Exclusão"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth são incompatÃveis. Você deverá experienciar comportamento inesperado. Por favor, peça ao seu administrador do sistema para desabilitar um deles."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Aviso:</b> O módulo PHP LDAP não está instalado, o backend não funcionará. Por favor, peça ao seu administrador do sistema para instalá-lo."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Configuração de servidor"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Adicionar Configuração de Servidor"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Servidor"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN Base"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Uma base DN por linha"
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN Usuário"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Senha"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para acesso anônimo, deixe DN e Senha vazios."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtro de Login de Usuário"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "use %%uid placeholder, ex. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtro de Lista de Usuário"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Define filtro a ser aplicado ao obter usuários."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "sem nenhum espaço reservado, ex. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtro de Grupo"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Define o filtro a aplicar ao obter grupos."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "sem nenhum espaço reservado, ex. \"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Configurações de Conexão"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configuração ativa"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Quando não marcada, esta configuração será ignorada."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Porta"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Servidor de Backup (Réplica)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Defina um servidor de backup opcional. Ele deverá ser uma réplica do servidor LDAP/AD principal."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Porta do Backup (Réplica)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Desativar Servidor Principal"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Quando ativado, ownCloud somente se conectará ao servidor de réplica."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Não use adicionalmente para conexões LDAPS, pois falhará."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP sensÃvel à caixa alta (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Desligar validação de certificado SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Não recomendado, use somente para testes."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Cache Time-To-Live"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "em segundos. Uma mudança esvaziará o cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Configurações de Diretório"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Campo Nome de Exibição de Usuário"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Ãrvore de Usuário Base"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Um usuário-base DN por linha"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Atributos de Busca de Usuário"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Opcional; um atributo por linha"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Campo Nome de Exibição de Grupo"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Ãrvore de Grupo Base"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Um grupo-base DN por linha"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atributos de Busca de Grupo"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Associação Grupo-Membro"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Atributos Especiais"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Campo de Cota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Cota Padrão"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "em bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Campo de Email"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Regra para Nome da Pasta Pessoal do Usuário"
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Teste de Configuração"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index d5ad8a47f5..c544632981 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Erro ao eliminar as configurações do servidor"
@@ -53,281 +57,363 @@ msgstr "Manter as definições?"
msgid "Cannot add server configuration"
msgstr "Não foi possÃvel adicionar as configurações do servidor."
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Teste de conecção passado com sucesso."
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Erro no teste de conecção."
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Deseja realmente apagar as configurações de servidor actuais?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Confirmar a operação de apagar"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Aviso:</b> O módulo PHP LDAP não está instalado, logo não irá funcionar. Por favor peça ao administrador para o instalar."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Configurações do servidor"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Adicionar configurações do servidor"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Anfitrião"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN base"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Uma base DN por linho"
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN do utilizador"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Password"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Para acesso anónimo, deixe DN e a Palavra-passe vazios."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtro de login de utilizador"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "Use a variável %%uid , exemplo: \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Utilizar filtro"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Defina o filtro a aplicar, ao recuperar utilizadores."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "Sem variável. Exemplo: \"objectClass=pessoa\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filtrar por grupo"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Defina o filtro a aplicar, ao recuperar grupos."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "Sem nenhuma variável. Exemplo: \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Definições de ligação"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Configuração activa"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Se não estiver marcada, esta definição não será tida em conta."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Porto"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Servidor de Backup (Réplica)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Forneça um servidor (anfitrião) de backup. Deve ser uma réplica do servidor principal de LDAP/AD "
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Porta do servidor de backup (Replica)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Desactivar servidor principal"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Se estiver ligado, o ownCloud vai somente ligar-se a este servidor de réplicas."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Usar TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Não utilize para adicionar ligações LDAP, irá falhar!"
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Servidor LDAP (Windows) não sensÃvel a maiúsculas."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Desligar a validação de certificado SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Não recomendado, utilizado apenas para testes!"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Cache do tempo de vida dos objetos no servidor"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "em segundos. Uma alteração esvazia a cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Definições de directorias"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Mostrador do nome de utilizador."
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Base da árvore de utilizadores."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Uma base de utilizador DN por linha"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Utilizar atributos de pesquisa"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Opcional; Um atributo por linha"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Mostrador do nome do grupo."
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Base da árvore de grupos."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Uma base de grupo DN por linha"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atributos de pesquisa de grupo"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Associar utilizador ao grupo."
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Atributos especiais"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Quota"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Quota padrão"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "em bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Campo de email"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Regra da pasta inicial do utilizador"
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Testar a configuração"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ajuda"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 9dab61a2a4..2f84b02286 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Atentie:</b> Apps user_ldap si user_webdavauth sunt incompatibile. Este posibil sa experimentati un comportament neasteptat. Vă rugăm să întrebați administratorul de sistem pentru a dezactiva una dintre ele."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Atenție</b> Modulul PHP LDAP nu este instalat, infrastructura nu va funcționa. Contactează administratorul sistemului pentru al instala."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Gazdă"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN de bază"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Un Base DN pe linie"
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN al utilizatorului"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Parolă"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Pentru acces anonim, lăsați DN și Parolă libere."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filtrare după Nume Utilizator"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "folosiți substituentul %%uid , d.e. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filtrarea după lista utilizatorilor"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definește filtrele care trebui aplicate, când se peiau utilzatorii."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "fără substituenți, d.e. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Fitrare Grup"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definește filtrele care se aplică, când se preiau grupurile."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "fără substituenți, d.e. \"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Portul"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Utilizează TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Server LDAP insensibil la majuscule (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Oprește validarea certificatelor SSL "
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Nu este recomandat, a se utiliza doar pentru testare."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "în secunde. O schimbare curăță memoria tampon."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Câmpul cu numele vizibil al utilizatorului"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Arborele de bază al Utilizatorilor"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Un User Base DN pe linie"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Câmpul cu numele grupului"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Arborele de bază al Grupurilor"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Un Group Base DN pe linie"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Asocierea Grup-Membru"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "în octeți"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ajutor"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index cd1cb84f03..7afc858efe 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"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"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Ðе удалоÑÑŒ удалить конфигурацию Ñервера"
@@ -53,281 +57,363 @@ msgstr "Сохранить наÑтройки?"
msgid "Cannot add server configuration"
msgstr "Ðе получилоÑÑŒ добавить конфигурацию Ñервера"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Проверка ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ ÑƒÐ´Ð°Ð»Ð°ÑÑŒ"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Проверка ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ðµ удалаÑÑŒ"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Ð’Ñ‹ дейÑтвительно хотите удалить ÑущеÑтвующую конфигурацию Ñервера?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Подтверждение удалениÑ"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Внимание:</b>ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ user_ldap и user_webdavauth неÑовмеÑтимы. Ð’Ñ‹ можете ÑтолкнутьÑÑ Ñ Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ñ‹Ð¼ поведением. ПожалуйÑта, обратитеÑÑŒ к ÑиÑтемному админиÑтратору, чтобы отключить одно из них."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Внимание:</b> Модуль LDAP Ð´Ð»Ñ PHP не уÑтановлен, бÑкенд не будет работать. ПожалуйÑта, попроÑите вашего ÑиÑтемного админиÑтратора его уÑтановить. "
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ñервера"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Добавить конфигурацию Ñервера"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Сервер"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Можно опуÑтить протокол, за иÑключением того, когда вам требуетÑÑ SSL. Тогда начните Ñ ldaps :/ /"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Базовый DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "По одному базовому DN в Ñтроке."
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Ð’Ñ‹ можете задать Base DN Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ и групп на вкладке \"РаÑширенное\""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN пользователÑ"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Пароль"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Ð”Ð»Ñ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ð³Ð¾ доÑтупа оÑтавьте DN и пароль пуÑтыми."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Фильтр входа пользователей"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "иÑпользуйте заполнитель %%uid, например: \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Фильтр ÑпиÑка пользователей"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "ОпределÑет фильтр Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ получении пользователей."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "без заполнителÑ, например: \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Фильтр группы"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "ОпределÑет фильтр Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸ получении группы."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "без заполнениÑ, например \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "ÐаÑтройки подключениÑ"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð°ÐºÑ‚Ð¸Ð²Ð½Ð°"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Когда галочка ÑнÑта, Ñта ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð±ÑƒÐ´ÐµÑ‚ пропущена."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Порт"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "ÐÐ´Ñ€ÐµÑ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¾Ð³Ð¾ Ñервера"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Укажите дополнительный резервный Ñервер. Он должен быть репликой главного LDAP/AD Ñервера."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Порт резервного Ñервера"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Отключение главного Ñервера"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Когда включено, ownCloud будет ÑоединÑÑ‚ÑŒÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ñ‹Ð¼ Ñервером."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "ИÑпользовать TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Ðе иÑпользуйте ÑовмеÑтно Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°Ñными подключениÑми (LDAPS), Ñто не Ñработает."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "ÐечувÑтвительный к региÑтру Ñервер LDAP (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Отключить проверку Ñертификата SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Ðе рекомендуетÑÑ, иÑпользуйте только Ð´Ð»Ñ Ñ‚ÐµÑтированиÑ."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "КÑш времени жизни"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "в Ñекундах. Изменение очиÑтит кÑш."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "ÐаÑтройки каталога"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Поле отображаемого имени пользователÑ"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Ðтрибут LDAP Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ имени Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "База пользовательÑкого дерева"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "По одной базовому DN пользователей в Ñтроке."
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "ПоиÑковые атрибуты пользователÑ"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Опционально; один атрибут на линию"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Поле отображаемого имени группы"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Ðтрибут LDAP Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ имени группы ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "База группового дерева"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "По одной базовому DN групп в Ñтроке."
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Ðтрибуты поиÑка Ð´Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "ÐÑÑÐ¾Ñ†Ð¸Ð°Ñ†Ð¸Ñ Ð“Ñ€ÑƒÐ¿Ð¿Ð°-УчаÑтник"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Специальные атрибуты"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Поле квота"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Квота по умолчанию"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "в байтах"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Поле адреÑÑа Ñллектронной почты"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Правило Ð¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ñ Ð”Ð¾Ð¼Ð°ÑˆÐ½ÐµÐ¹ Папки ПользователÑ"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "ОÑтавьте Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿ÑƒÑтым (по умолчанию). Иначе укажите атрибут LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "ТеÑÑ‚Ð¾Ð²Ð°Ñ ÐºÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Помощь"
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index b535f61782..a5be1936d7 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "à·ƒà¶à·Šà¶šà·à¶»à¶šà¶º"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "SSL අවà·à·Šâ€à¶ºà¶º වන විට පමණක් à·„à·à¶», අන් අවස්ථà·à·€à¶±à·Šà·„ිදී ප්â€à¶»à·œà¶§à·œà¶šà·à¶½à¶º අà¶à·Š à·„à·à¶»à·’ය à·„à·à¶š. භà·à·€à·’à¶à· කරන විට ldaps:// ලෙස ආරම්භ කරන්න"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "මුර පදය"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "පරිà·à·“ලක පිවිසුම් පෙරහන"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "පරිà·à·“ලක ලà·à¶ºà·’ස්à¶à·” පෙරහන"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "කණ්ඩà·à¶ºà¶¸à·Š පෙරහන"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "කණ්ඩà·à¶ºà¶¸à·Š සොය෠ලබà·à¶œà¶±à·Šà¶±à· විට, යොදන පෙරහන නියම කරයි"
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "à¶à·œà¶§"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "TLS භà·à·€à·’à¶à· කරන්න"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "නිර්දේ෠කළ නොහà·à¶š. පරීක්ෂණ සඳහ෠පමණක් භà·à·€à·’චකරන්න"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "උදව්"
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index 289b258772..7e555cc8df 100644
--- a/l10n/sk/user_ldap.po
+++ b/l10n/sk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 5cbcb94242..c5d0a3787b 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Zlyhalo zmazanie nastavenia servera."
@@ -53,281 +57,363 @@ msgstr "Ponechať nastavenia?"
msgid "Cannot add server configuration"
msgstr "Nemožno pridať nastavenie servera"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Test pripojenia bol úspešný"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Test pripojenia zlyhal"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Naozaj chcete zmazaÅ¥ súÄasné nastavenie servera?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Potvrdiť vymazanie"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth nie sú kompatibilné. Môže nastávaÅ¥ neoÄakávané správanie. Požiadajte administrátora systému aby jednu z nich zakázal."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Upozornenie:</b> nie je nainštalovaný LDAP modul pre PHP, backend vrstva nebude fungovať. Požádejte administrátora systému aby ho nainštaloval."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Nastavenia servera"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Pridať nastavenia servera."
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Hostiteľ"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Základné DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Jedno základné DN na riadok"
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "PoužÃvateľské DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Heslo"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Pre anonymný prÃstup ponechajte údaje DN a Heslo prázdne."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filter prihlásenia použÃvateľov"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "použite zástupný vzor %%uid, napr. \\\"uid=%%uid\\\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filter zoznamov použÃvateľov"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definuje použitý filter, pre zÃskanie použÃvateľov."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "bez zástupných znakov, napr. \"objectClass=person\""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filter skupiny"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definuje použitý filter, pre zÃskanie skupÃn."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "bez zástupných znakov, napr. \"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Nastavenie pripojenia"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Nastavenia sú aktÃvne "
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Ak nie je zaÅ¡krtnuté, nastavenie bude preskoÄené."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Záložný server (kópia) hosť"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Zadajte záložný LDAP/AD. Musà to byť kópia hlavného LDAP/AD servera."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Záložný server (kópia) port"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Zakázať hlavný server"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Pri zapnutà sa ownCloud pripojà len k záložnému serveru."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Použi TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "NepoužÃvajte pre pripojenie LDAPS, zlyhá."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP server nerozlišuje veľkosť znakov (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Vypnúť overovanie SSL certifikátu."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Nie je doporuÄované, len pre testovacie úÄely."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Životnosť objektov v cache"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Nastavenie prieÄinka"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Pole pre zobrazenia mena použÃvateľa"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Základný použÃvateľský strom"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Jedna použÃvateľská základná DN na riadok"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Atribúty vyhľadávania použÃvateľov"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Voliteľné, jeden atribút na jeden riadok"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Pole pre zobrazenie mena skupiny"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Základný skupinový strom"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Jedna skupinová základná DN na riadok"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atribúty vyhľadávania skupÃn"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Priradenie Älena skupiny"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Špeciálne atribúty"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Pole kvóty"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Predvolená kvóta"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "v bajtoch"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Pole email"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Pravidlo pre nastavenie mena použÃvateľského prieÄinka dát"
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Test nastavenia"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Pomoc"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index e5fd3aba3e..eb88eab348 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Brisanje nastavitev strežnika je spodletelo."
@@ -53,281 +57,363 @@ msgstr "Ali nas se nastavitve ohranijo?"
msgid "Cannot add server configuration"
msgstr "Ni mogoÄe dodati nastavitev strežnika"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Preizkus povezave je uspeÅ¡no konÄan."
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Preizkus povezave je spodletel."
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Ali res želite izbrisati trenutne nastavitve strežnika?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Potrdi brisanje"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Opozorilo:</b> možnosti user_ldap in user_webdavauth nista združljivi. Pri uporabi je mogoÄe nepriÄakovano obnaÅ¡anje sistema. Eno izmed možnosti je priporoÄeno onemgoÄiti."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Opozorilo:</b> modul PHP LDAP mora biti nameÅ¡Äen, sicer vmesnik ne bo deloval. Paket je treba namestiti."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Nastavitev strežnika"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Dodaj nastavitve strežnika"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Gostitelj"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Osnovni DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "En osnovni DN na vrstico"
-#: templates/settings.php:41
+#: templates/settings.php:42
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 naprednih možnosti."
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Uporabnik DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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 brezimni dostop sta polji DN in geslo prazni."
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Geslo"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Za brezimni dostop sta polji DN in geslo prazni."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filter prijav uporabnikov"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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 v postopku prijave."
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "Uporabite vsebnik %%uid, npr. \"uid=%%uid\"."
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filter seznama uporabnikov"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "DoloÄi filter za uporabo med pridobivanjem uporabnikov."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "Brez kateregakoli vsebnika, npr. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Filter skupin"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "DoloÄi filter za uporabo med pridobivanjem skupin."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Nastavitve povezave"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Dejavna nastavitev"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Neizbrana možnost preskoÄi nastavitev."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Vrata"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Varnostna kopija (replika) podatkov gostitelja"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Podati je treba izbirno varnostno kopijo gostitelja. Ta mora biti natanÄna replika strežnika LDAP/AD."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Varnostna kopija (replika) podatka vrat"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "OnemogoÄi glavni strežnik"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Ob priklopu bo strežnik ownCloud povezan le s kopijo (repliko) strežnika."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Uporabi TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Strežnika ni priporoÄljivo uporabljati za povezave LDAPS. Povezava bo spodletela."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Strežnik LDAP ne upoÅ¡teva velikosti Ärk (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "OnemogoÄi doloÄanje veljavnosti potrdila SSL."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Kadar deluje povezava le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Dejanje ni priporoÄeno; uporabljeno naj bo le za preizkuÅ¡anje delovanja."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Predpomni podatke TTL"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "v sekundah. Sprememba izprazni predpomnilnik."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Nastavitve mape"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Polje za uporabnikovo prikazano ime"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Osnovno uporabniško drevo"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Eno osnovno uporabniško ime DN na vrstico"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Uporabi atribute iskanja"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Izbirno; en atribut na vrstico"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Polje za prikazano ime skupine"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Osnovno drevo skupine"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Eno osnovno ime skupine DN na vrstico"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Atributi iskanja skupine"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Povezava Älan-skupina"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Posebni atributi"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Polje koliÄinske omejitve"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Privzeta koliÄinska omejitev"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "v bajtih"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Polje elektronske pošte"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Pravila poimenovanja uporabniške osebne mape"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Pustite prazno za uporabniško ime (privzeto), sicer navedite atribut LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Preizkusne nastavitve"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "PomoÄ"
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index d743361000..299948e7c4 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Kodi"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Ndihmë"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index a87033c8c5..7ce4478ba2 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"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"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Домаћин"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Можете да изоÑтавите протокол, оÑим ако захтевате SSL. У том Ñлучају почните Ñа ldaps://."
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "База DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "КориÑник DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Лозинка"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "За анониман приÑтуп, оÑтавите поља DN и лозинка празним."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Филтер за пријаву кориÑника"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "кориÑтите чувар меÑта %%uid, нпр. „uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Филтер за ÑпиÑак кориÑника"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Одређује филтер за примењивање при прибављању кориÑника."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "без икаквог чувара меÑта, нпр. „objectClass=person“."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Филтер групе"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Одређује филтер за примењивање при прибављању група."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "без икаквог чувара меÑта, нпр. „objectClass=posixGroup“."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Порт"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "КориÑти TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP Ñервер оÑетљив на велика и мала Ñлова (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "ИÑкључите потврду SSL Ñертификата."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Ðе препоручује Ñе; кориÑтите Ñамо за теÑтирање."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "у Ñекундама. Промена иÑпражњава кеш меморију."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Име приказа кориÑника"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP атрибут за Ñтварање имена ownCloud-а кориÑника."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "ОÑновно Ñтабло кориÑника"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Име приказа групе"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP атрибут за Ñтварање имена ownCloud-а групе."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "ОÑновна Ñтабло група"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Придруживање чланова у групу"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "у бајтовима"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Помоћ"
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 39eaebf0ac..f3a97db15e 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"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"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Lozinka"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Pomoć"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 3d51619fa0..1ad17b0412 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Misslyckades med att radera serverinställningen"
@@ -53,281 +57,363 @@ msgstr "Behåll inställningarna?"
msgid "Cannot add server configuration"
msgstr "Kunde inte lägga till serverinställning"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Anslutningstestet lyckades"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Anslutningstestet misslyckades"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Vill du verkligen radera den nuvarande serverinställningen?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Bekräfta radering"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Varning:</b> PHP LDAP - modulen är inte installerad, serversidan kommer inte att fungera. Kontakta din systemadministratör för installation."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Serverinställning"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Lägg till serverinställning"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Server"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Start DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Ett Start DN per rad"
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Användare DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Lösenord"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "För anonym åtkomst, lämna DN och lösenord tomt."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Filter logga in användare"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "använd platshållare %%uid, t ex \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Filter lista användare"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Definierar filter att tillämpa vid listning av användare."
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "utan platshållare, t.ex. \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Gruppfilter"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Definierar filter att tillämpa vid listning av grupper."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "utan platshållare, t.ex. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Uppkopplingsinställningar"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "Konfiguration aktiv"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Ifall denna är avbockad så kommer konfigurationen att skippas."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Säkerhetskopierings-värd (Replika)"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Ange en valfri värd för säkerhetskopiering. Den måste vara en replika av den huvudsakliga LDAP/AD-servern"
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Säkerhetskopierins-port (Replika)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Inaktivera huvudserver"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "När denna är påkopplad kommer ownCloud att koppla upp till replika-servern, endast."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "Använd TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Använd inte för LDAPS-anslutningar, det kommer inte att fungera."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "LDAP-servern är okänslig för gemener och versaler (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Stäng av verifiering av SSL-certifikat."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Rekommenderas inte, använd bara för test. "
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Cache Time-To-Live"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "i sekunder. En förändring tömmer cache."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Mappinställningar"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Attribut för användarnamn"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Bas för användare i katalogtjänst"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "En Användare start DN per rad"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Användarsökningsattribut"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Valfritt; ett attribut per rad"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Attribut för gruppnamn"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Bas för grupper i katalogtjänst"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "En Grupp start DN per rad"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Gruppsökningsattribut"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Attribut för gruppmedlemmar"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Specialattribut"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Kvotfält"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Datakvot standard"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "i bytes"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "E-postfält"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Namnregel för hemkatalog"
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "Testa konfigurationen"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Hjälp"
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
index b16b2afdf5..61cca7831d 100644
--- a/l10n/sw_KE/user_ldap.po
+++ b/l10n/sw_KE/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-26 10:00+0200\n"
-"PO-Revision-Date: 2013-04-26 08:02+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: sw_KE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index a82d11f9a1..7a74191cc6 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ta_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "ஓமà¯à®ªà¯à®©à®°à¯"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "நீஙà¯à®•à®³à¯ SSL சேவையை தவிர உடனà¯à®ªà®Ÿà¯ வரைமà¯à®±à¯ˆà®¯à¯ˆ தவிரà¯à®•à¯à®• à®®à¯à®Ÿà®¿à®¯à¯à®®à¯. பிறக௠ldaps:.// உடன௠ஆரமà¯à®ªà®¿à®•à¯à®•à®µà¯à®®à¯"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "தள DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "நீஙà¯à®•à®³à¯ பயனாளரà¯à®•à®³à¯à®•à¯à®•à¯à®®à¯ மேனà¯à®®à¯ˆ ததà¯à®¤à®²à®¿à®²à¯ உளà¯à®³ கà¯à®´à¯à®µà®¿à®±à¯à®•à¯à®®à¯ தள DN ஠கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®²à®¾à®®à¯ "
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "பயனாளர௠DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "கடவà¯à®šà¯à®šà¯Šà®²à¯"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "எநà¯à®¤ ஒதà¯à®•à¯à®•à¯€à®Ÿà¯à®®à¯ இலà¯à®²à®¾à®®à®²à¯, உதாரணமà¯. \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "தà¯à®±à¯ˆ "
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "TLS ஠பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "உணரà¯à®šà¯à®šà®¿à®¯à®¾à®© LDAP சேவையகம௠(சாளரஙà¯à®•à®³à¯)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "SSL சானà¯à®±à®¿à®¤à®´à®¿à®©à¯ செலà¯à®²à¯à®ªà®Ÿà®¿à®¯à¯ˆ நிறà¯à®¤à¯à®¤à®¿à®µà®¿à®Ÿà®µà¯à®®à¯"
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "பரிநà¯à®¤à¯à®°à¯ˆà®•à¯à®•à®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ, சோதனைகà¯à®•à®¾à®• மடà¯à®Ÿà¯à®®à¯ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "செகà¯à®•à®©à¯à®•à®³à®¿à®²à¯. ஒர௠மாறà¯à®±à®®à¯ இடைமாறà¯à®±à¯à®¨à®¿à®©à¯ˆà®µà®•à®¤à¯à®¤à¯ˆ வெறà¯à®±à®¿à®Ÿà®®à®¾à®•à¯à®•à¯à®®à¯."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "பயனாளர௠காடà¯à®šà®¿à®ªà¯à®ªà¯†à®¯à®°à¯ பà¯à®²à®®à¯"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "பயனாளரின௠ownCloud பெயரை உரà¯à®µà®¾à®•à¯à®• LDAP பணà¯à®ªà¯à®•à¯à®•à¯‚றை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "தள பயனாளர௠மரமà¯"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "கà¯à®´à¯à®µà®¿à®©à¯ காடà¯à®šà®¿ பெயர௠பà¯à®²à®®à¯ "
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "ownCloud கà¯à®´à¯à®•à¯à®•à®³à®¿à®©à¯ பெயரà¯à®•à®³à¯ˆ உரà¯à®µà®¾à®•à¯à®• LDAP பணà¯à®ªà¯à®•à¯à®•à¯‚றை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à®µà¯à®®à¯."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "தள கà¯à®´à¯ மரமà¯"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "கà¯à®´à¯ உறà¯à®ªà¯à®ªà®¿à®©à®°à¯ சஙà¯à®•à®®à¯"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "bytes களில௠"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "பயனாளர௠பெயரிறà¯à®•à¯ வெறà¯à®±à®¿à®Ÿà®®à®¾à®• விடவà¯à®®à¯ (பொத௠இரà¯à®ªà¯à®ªà¯). இலà¯à®²à®¾à®µà®¿à®Ÿà®¿à®©à¯ LDAP/AD பணà¯à®ªà¯à®•à¯à®•à¯‚றை கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®µà¯à®®à¯."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "உதவி"
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index 0166659309..b417aa098f 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "సంకేతపదం"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "సహాయం"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index a4d0a795df..7092183e74 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\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.pot b/l10n/templates/files.pot
index bc16218f67..ae93cc2d70 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
+"POT-Creation-Date: 2013-05-17 02:02+0200\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 6d80b9510d..b186f4e3ed 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
+"POT-Creation-Date: 2013-05-17 02:02+0200\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 4473c70a78..25b7fff06e 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
+"POT-Creation-Date: 2013-05-17 02:02+0200\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 55693b9597..ab83c1a7ea 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
+"POT-Creation-Date: 2013-05-17 02:02+0200\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_trashbin.pot b/l10n/templates/files_trashbin.pot
index 5f462c0498..0ff5838f85 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
+"POT-Creation-Date: 2013-05-17 02:02+0200\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 d0973c00bc..0fb80731b0 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
+"POT-Creation-Date: 2013-05-17 02:02+0200\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 5269cee5d4..0eedfd01c4 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\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 7946a1355c..99f0d75936 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\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 6a1a0ad238..e8decb69c8 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\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"
@@ -17,6 +17,10 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,279 +57,361 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr ""
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It "
+"makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name "
+"attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both "
+"users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN "
+"is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 223158a71f..d0289509e2 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud Core 5.0.0\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\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 a085e8c732..e2cf3668ac 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: th_TH\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "à¸à¸²à¸£à¸¥à¸šà¸à¸²à¸£à¸à¸³à¸«à¸™à¸”ค่าเซิร์ฟเวà¸à¸£à¹Œà¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§"
@@ -53,281 +57,363 @@ msgstr "รัà¸à¸©à¸²à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าไว้?"
msgid "Cannot add server configuration"
msgstr "ไม่สามารถเพิ่มค่าà¸à¸³à¸«à¸™à¸”เซิร์ฟเวà¸à¸£à¹Œà¹„ด้"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "ทดสà¸à¸šà¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸ªà¸³à¹€à¸£à¹‡à¸ˆ"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "ทดสà¸à¸šà¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "คุณà¹à¸™à¹ˆà¹ƒà¸ˆà¹à¸¥à¹‰à¸§à¸«à¸£à¸·à¸à¸§à¹ˆà¸²à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¸¥à¸šà¸à¸²à¸£à¸à¸³à¸«à¸™à¸”ค่าเซิร์ฟเวà¸à¸£à¹Œà¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™à¸—ิ้งไป?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "ยืนยันà¸à¸²à¸£à¸¥à¸šà¸—ิ้ง"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>คำเตืà¸à¸™:</b> à¹à¸à¸›à¸¯ user_ldap à¹à¸¥à¸° user_webdavauth ไม่สามารถใช้งานร่วมà¸à¸±à¸™à¹„ด้. คุณà¸à¸²à¸ˆà¸›à¸£à¸°à¸ªà¸žà¸›à¸±à¸à¸«à¸²à¸—ี่ไม่คาดคิดจาà¸à¹€à¸«à¸•à¸¸à¸à¸²à¸£à¸“์ดังà¸à¸¥à¹ˆà¸²à¸§ à¸à¸£à¸¸à¸“าติดต่à¸à¸œà¸¹à¹‰à¸”ูà¹à¸¥à¸£à¸°à¸šà¸šà¸‚à¸à¸‡à¸„ุณเพื่à¸à¸£à¸°à¸‡à¸±à¸šà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸à¸›à¸¯ ตัวใดตัวหนึ่งข้างต้น"
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>คำเตืà¸à¸™:</b> โมดูล PHP LDAP ยังไม่ได้ถูà¸à¸•à¸´à¸”ตั้ง, ระบบด้านหลังจะไม่สามารถทำงานได้ à¸à¸£à¸¸à¸“าติดต่à¸à¸œà¸¹à¹‰à¸”ูà¹à¸¥à¸£à¸°à¸šà¸šà¸‚à¸à¸‡à¸„ุณเพื่à¸à¸—ำà¸à¸²à¸£à¸•à¸´à¸”ตั้งโมดูลดังà¸à¸¥à¹ˆà¸²à¸§"
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "à¸à¸²à¸£à¸à¸³à¸«à¸™à¸”ค่าเซิร์ฟเวà¸à¸£à¹Œ"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "เพิ่มà¸à¸²à¸£à¸à¸³à¸«à¸™à¸”ค่าเซิร์ฟเวà¸à¸£à¹Œ"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "โฮสต์"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "คุณสามารถปล่à¸à¸¢à¸Šà¹ˆà¸à¸‡à¹‚ปรโตคà¸à¸¥à¹€à¸§à¹‰à¸™à¹„ว้ได้, ยà¸à¹€à¸§à¹‰à¸™à¸à¸£à¸“ีที่คุณต้à¸à¸‡à¸à¸²à¸£à¹ƒà¸Šà¹‰ SSL จาà¸à¸™à¸±à¹‰à¸™à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™à¸”้วย ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN à¸à¸²à¸™"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "หนึ่ง Base DN ต่à¸à¸šà¸£à¸£à¸—ัด"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "คุณสามารถระบุ DN หลัà¸à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸¥à¸°à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¹ˆà¸²à¸‡à¹†à¹ƒà¸™à¹à¸—็บขั้นสูงได้"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN ขà¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "รหัสผ่าน"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "สำหรับà¸à¸²à¸£à¹€à¸‚้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN à¹à¸¥à¸°à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹„ว้"
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "ตัวà¸à¸£à¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¹€à¸‚้าสู่ระบบขà¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "ใช้ตัวยึด %%uid, เช่น \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "ตัวà¸à¸£à¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸£à¸²à¸¢à¸Šà¸·à¹ˆà¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "ระบุตัวà¸à¸£à¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸—ี่ต้à¸à¸‡à¸à¸²à¸£à¸™à¸³à¹„ปใช้งาน, เมื่à¸à¸”ึงข้à¸à¸¡à¸¹à¸¥à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "โดยไม่ต้à¸à¸‡à¸¡à¸µà¸•à¸±à¸§à¸¢à¸¶à¸”ใดๆ, เช่น \"objectClass=person\","
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "ตัวà¸à¸£à¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸à¸¥à¸¸à¹ˆà¸¡"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "ระบุตัวà¸à¸£à¸à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¸—ี่ต้à¸à¸‡à¸à¸²à¸£à¸™à¸³à¹„ปใช้งาน, เมื่à¸à¸”ึงข้à¸à¸¡à¸¹à¸¥à¸à¸¥à¸¸à¹ˆà¸¡"
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "โดยไม่ต้à¸à¸‡à¸¡à¸µà¸•à¸±à¸§à¸¢à¸¶à¸”ใดๆ, เช่น \"objectClass=posixGroup\","
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "ตั้งค่าà¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "พà¸à¸£à¹Œà¸•"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "ปิดใช้งานเซิร์ฟเวà¸à¸£à¹Œà¸«à¸¥à¸±à¸"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "ใช้ TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "เซิร์ฟเวà¸à¸£à¹Œ LDAP ประเภท Case insensitive (วินโดวส์)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "ปิดใช้งานà¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸„วามถูà¸à¸•à¹‰à¸à¸‡à¸‚à¸à¸‡à¹ƒà¸šà¸£à¸±à¸šà¸£à¸à¸‡à¸„วามปลà¸à¸”ภัย SSL"
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "ไม่à¹à¸™à¸°à¸™à¸³à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™, ใช้สำหรับà¸à¸²à¸£à¸—ดสà¸à¸šà¹€à¸—่านั้น"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "ในà¸à¸µà¸à¹„ม่à¸à¸µà¹ˆà¸§à¸´à¸™à¸²à¸—ี ระบบจะเปลี่ยนà¹à¸›à¸¥à¸‡à¸‚้à¸à¸¡à¸¹à¸¥à¹ƒà¸™à¹à¸„ชให้ว่างเปล่า"
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "ตั้งค่าไดเร็à¸à¸—à¸à¸£à¸µà¹ˆ"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "ช่à¸à¸‡à¹à¸ªà¸”งชื่à¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—ี่ต้à¸à¸‡à¸à¸²à¸£"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "คุณลัà¸à¸©à¸“ะ LDAP ที่ต้à¸à¸‡à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸ªà¸³à¸«à¸£à¸±à¸šà¸ªà¸£à¹‰à¸²à¸‡à¸Šà¸·à¹ˆà¸à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ ownCloud"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "รายà¸à¸²à¸£à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸«à¸¥à¸±à¸à¹à¸šà¸š Tree"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "หนึ่ง User Base DN ต่à¸à¸šà¸£à¸£à¸—ัด"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "คุณลัà¸à¸©à¸“ะà¸à¸²à¸£à¸„้นหาชื่à¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "ตัวเลืà¸à¸à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡; หนึ่งคุณลัà¸à¸©à¸“ะต่à¸à¸šà¸£à¸£à¸—ัด"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "ช่à¸à¸‡à¹à¸ªà¸”งชื่à¸à¸à¸¥à¸¸à¹ˆà¸¡à¸—ี่ต้à¸à¸‡à¸à¸²à¸£"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "คุณลัà¸à¸©à¸“ะ LDAP ที่ต้à¸à¸‡à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸ªà¸£à¹‰à¸²à¸‡à¸Šà¸·à¹ˆà¸à¸à¸¥à¸¸à¹ˆà¸¡à¸‚à¸à¸‡ ownCloud"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "รายà¸à¸²à¸£à¸à¸¥à¸¸à¹ˆà¸¡à¸«à¸¥à¸±à¸à¹à¸šà¸š Tree"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "หนึ่ง Group Base DN ต่à¸à¸šà¸£à¸£à¸—ัด"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "คุณลัà¸à¸©à¸“ะà¸à¸²à¸£à¸„้นหาà¹à¸šà¸šà¸à¸¥à¸¸à¹ˆà¸¡"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "ความสัมพันธ์ขà¸à¸‡à¸ªà¸¡à¸²à¸Šà¸´à¸à¹ƒà¸™à¸à¸¥à¸¸à¹ˆà¸¡"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "คุณลัà¸à¸©à¸“ะพิเศษ"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "ในหน่วยไบต์"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "เว้นว่างไว้สำหรับ ชื่à¸à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰ (ค่าเริ่มต้น) หรืà¸à¹„ม่à¸à¸£à¸¸à¸“าระบุคุณลัà¸à¸©à¸“ะขà¸à¸‡ LDAP/AD"
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "ช่วยเหลืà¸"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index d4a0ced72c..e7ee60833c 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/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: 2013-05-13 02:04+0200\n"
-"PO-Revision-Date: 2013-05-12 16:20+0000\n"
-"Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -18,6 +18,10 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Sunucu uyunlama basarmadi "
@@ -54,281 +58,363 @@ msgstr "Ayarları kalsınmı?"
msgid "Cannot add server configuration"
msgstr "Sunucu uyunlama birlemek edemen. "
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Bağlantı testi başarılı oldu"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Bağlantı testi başarısız oldu"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Hakikatten, Sonuncu Funksyon durmak istiyor mi?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Silmeyi onayla"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Uyari </b> Apps kullanici_Idap ve user_webdavauth uyunmayan. Bu belki sik degil. Lutfen sistem yonetici sormak on aktif yapmaya. "
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Ihbar <b> Modulu PHP LDAP yuklemdi degil, backend calismacak. Lutfen sistem yonetici sormak yuklemek icin."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "Sunucu uyunlama "
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Sunucu Uyunlama birlemek "
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Sunucu"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Protokol atlamak edesin, sadece SSL istiyorsaniz. O zaman, idapsile baslamak. "
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Ana DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Bir Tabani DN herbir dizi. "
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Base DN kullanicileri ve kaynaklari icin tablosu Advanced tayin etmek ederiz. "
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "Kullanıcı DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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 musterinin, kimle baglamaya yapacagiz,meselâ uid=agent.dc mesela, dc=com Gecinme adisiz ici, DN ve Parola bos birakmak. "
-#: templates/settings.php:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Parola"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Anonim erişim için DN ve Parola alanlarını boş bırakın."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Kullanıcı Oturum Filtresi"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr "Filter uyunlamak icin tayin ediyor, ne zaman giriÅŸmek isteminiz. % % uid adi kullanici girismeye karsi koymacak. "
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "%%uid yer tutucusunu kullanın, örneğin \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Kullanıcı Liste Filtresi"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Filter uyunmak icin tayin ediyor, ne zaman adi kullanici geri aliyor. "
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "bir yer tutucusu olmadan, örneğin \"objectClass=person\""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Grup Süzgeci"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Filter uyunmak icin tayin ediyor, ne zaman grubalari tekrar aliyor. "
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "siz bir yer tutucu, mes. 'objectClass=posixGroup ('posixGrubu''. "
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Bağlantı ayarları"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Ne zaman iptal, bu uynnlama isletici "
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Port"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Sigorta Kopya Cephe "
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Bir kopya cevre vermek, kopya sunucu onemli olmali. "
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Kopya Port "
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Ana sunucuyu devredışı birak"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Ne zaman acik, ownCloud sadece sunuce replikayin baglamis."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "TLS kullan"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Bu LDAPS baglama icin kullamaminiz, basamacak. "
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Dusme sunucu LDAP zor degil. (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "SSL sertifika doğrulamasını kapat."
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr "Bagladiginda, bunla secene sadece calisiyor, sunucu LDAP SSL sunucun ithal etemek, dneyme sizine sunucu ownClouden. "
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Önerilmez, sadece test için kullanın."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Cache Time-To-Live "
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Parametrar Listesin Adresinin "
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Ekran Adi Kullanici, (Alan Adi Kullanici Ekrane)"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "LDAP kategori kullanmaya adi ownCloud kullanicin uremek icin. "
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Temel Kullanıcı Ağacı"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Bir Temel Kullanici DN her dizgi "
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Kategorii Arama Kullanici "
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Grub Ekrane Alani Adi"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "LDAP kullamayin grub adi ownCloud uremek icin. "
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Temel Grup Ağacı"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Bir Grubu Tabani DN her dizgi. "
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Kategorii Arama Grubu"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Grup-Ãœye iÅŸbirliÄŸi"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "byte cinsinden"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Kullanıcı adı bölümünü boş bırakın (varsayılan). "
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Yardım"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index f6fcf46d4e..a883642bab 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/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: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-04 11:50+0000\n"
-"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Uighur <uqkun@outlook.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ug\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "باش ئاپپارات"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "ئىم"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "ئىشلەتكۈچى تىزىمغا كىرىش سۈزگۈچى"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "ئىشلەتكۈچى تىزىم سۈزگۈچى"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "گۇرۇپپا سۈزگۈچ"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "باغلىنىش تەÚشىكى"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "سەپلىمە ئاكتىپ"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "ئÛغىز"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "TLS ئىشلەت"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "ياردەم"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 89484b09ee..984aca1e80 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: uk\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"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ конфігурацію Ñервера"
@@ -53,281 +57,363 @@ msgstr "Зберегти Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ?"
msgid "Cannot add server configuration"
msgstr "Ðеможливо додати конфігурацію Ñервера"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "Перевірка з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¾Ð¹ÑˆÐ»Ð° уÑпішно"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "Перевірка з'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑŒ неуÑпішно"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "Ви дійÑно бажаєте видалити поточну конфігурацію Ñервера ?"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "Підтвердіть ВидаленнÑ"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>Увага:</b> ЗаÑтоÑунки user_ldap та user_webdavauth не ÑуміÑні. Ви можете зіткнутиÑÑ Ð· неÑподіваною поведінкою. Будь лаÑка, звернітьÑÑ Ð´Ð¾ ÑиÑтемного адмініÑтратора, щоб відключити одну з них."
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>Увага:</ b> Потрібний модуль PHP LDAP не вÑтановлено, базова програма працювати не буде. Будь лаÑка, звернітьÑÑ Ð´Ð¾ ÑиÑтемного адмініÑтратора, щоб вÑтановити його."
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¡ÐµÑ€Ð²ÐµÑ€Ð°"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "Додати Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¡ÐµÑ€Ð²ÐµÑ€Ð°"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "ХоÑÑ‚"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "Можна не вказувати протокол, Ñкщо вам не потрібен SSL. Тоді почніть з ldaps://"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Базовий DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "Один Base DN на одній Ñтрочці"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "Ви можете задати Базовий DN Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸Ñтувачів Ñ– груп на вкладинці Додатково"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "DN КориÑтувача"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Пароль"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "Ð”Ð»Ñ Ð°Ð½Ð¾Ð½Ñ–Ð¼Ð½Ð¾Ð³Ð¾ доÑтупу, залиште DN Ñ– Пароль порожніми."
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Фільтр КориÑтувачів, що під'єднуютьÑÑ"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "викориÑтовуйте %%uid заповнювач, наприклад: \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Фільтр СпиÑку КориÑтувачів"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "Визначає фільтр, Ñкий заÑтоÑовуєтьÑÑ Ð¿Ñ€Ð¸ отриманні кориÑтувачів"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "без будь-Ñкого заповнювача, наприклад: \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Фільтр Груп"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "Визначає фільтр, Ñкий заÑтоÑовуєтьÑÑ Ð¿Ñ€Ð¸ отриманні груп."
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "без будь-Ñкого заповнювача, наприклад: \"objectClass=posixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð—'єднаннÑ"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ðктивне"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "Якщо \"галочка\" знÑта, Ñ†Ñ ÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð±ÑƒÐ´Ðµ пропущена."
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Порт"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "Сервер Ð´Ð»Ñ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¸Ñ… копій"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "Вкажіть додатковий резервний Ñервер. Він повинен бути копією головного LDAP/AD Ñервера."
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Порт Ñервера Ð´Ð»Ñ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¸Ñ… копій"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Вимкнути Головний Сервер"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "Коли увімкнуто, ownCloud буде приєднуватиÑÑŒ лише до Ñервера з резервними копіÑми."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "ВикориÑтовуйте TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Ðе викориÑтовуйте це додатково Ð´Ð»Ñ Ð¿Ñ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð¾ LDAP, бо виконано не буде."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "Ðечутливий до регіÑтру LDAP Ñервер (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Вимкнути перевірку SSL Ñертифіката."
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Ðе рекомендуєтьÑÑ, викориÑтовуйте лише Ð´Ð»Ñ Ñ‚ÐµÑтів."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "Ð§Ð°Ñ Ð°ÐºÑ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾ÑÑ‚Ñ– Кеша"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "в Ñекундах. Зміна очищує кеш."
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÐšÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð°"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Поле, Ñке відображає Ім'Ñ ÐšÐ¾Ñ€Ð¸Ñтувача"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "Ðтрибут LDAP, Ñкий викориÑтовуєтьÑÑ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ñ–Ñ— імен кориÑтувачів ownCloud."
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "ОÑновне Дерево КориÑтувачів"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "Один КориÑтувач Base DN на одній Ñтрочці"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "Пошукові Ðтрибути КориÑтувача"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Додатково; один атрибут на Ñтрочку"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Поле, Ñке відображає Ім'Ñ Ð“Ñ€ÑƒÐ¿Ð¸"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "Ðтрибут LDAP, Ñкий викориÑтовуєтьÑÑ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ñ–Ñ— імен груп ownCloud."
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "ОÑновне Дерево Груп"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "Одна Група Base DN на одній Ñтрочці"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Пошукові Ðтрибути Групи"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "ÐÑÐ¾Ñ†Ñ–Ð°Ñ†Ñ–Ñ Ð“Ñ€ÑƒÐ¿Ð°-Член"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Спеціальні Ðтрибути"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "Поле Квоти"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "Квота за замовчаннÑм"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "в байтах"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "Поле Ел. пошти"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "Правило Ñ–Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð¾Ð¼Ð°ÑˆÐ½ÑŒÐ¾Ñ— теки кориÑтувача"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "Залиште порожнім Ð´Ð»Ñ Ñ–Ð¼ÐµÐ½Ñ– кориÑтувача (за замовчаннÑм). Інакше, вкажіть атрибут LDAP/AD."
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "ТеÑтове налаштуваннÑ"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Допомога"
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index 88926609e2..59f98edec4 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+0000\n"
"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
"Language: ur_PK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "پاسورڈ"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "مدد"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 09d7c04c67..b0451d74ca 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "Máy chủ"
-#: templates/settings.php:38
+#: templates/settings.php:39
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:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "DN cơ bản"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
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:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "NgÆ°á»i dùng DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "Máºt khẩu"
-#: templates/settings.php:49
+#: templates/settings.php:50
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:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "Lá»c ngÆ°á»i dùng đăng nháºp"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "use %%uid placeholder, e.g. \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "Lá»c danh sách thà nh viên"
-#: templates/settings.php:58
+#: templates/settings.php:59
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:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "mà không giữ chỗ nà o, và dụ như \"objectClass = person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "Bá»™ lá»c nhóm"
-#: templates/settings.php:63
+#: templates/settings.php:64
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:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "mà không giữ chỗ nà o, và dụ như \"objectClass = osixGroup\"."
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "Connection Settings"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "Cổng"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "Cổng sao lưu (Replica)"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "Tắt máy chủ chÃnh"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "When switched on, ownCloud will only connect to the replica server."
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "SỠdụng TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "Do not use it additionally for LDAPS connections, it will fail."
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "TrÆ°á»ng hợp insensitve LDAP máy chủ (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "Tắt xác thá»±c chứng nháºn SSL"
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "Không khuyến khÃch, Chỉ sá» dụng để thá» nghiệm."
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
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:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "Directory Settings"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "Hiển thị tên ngÆ°á»i sá» dụng"
-#: templates/settings.php:82
+#: templates/settings.php:83
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:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "Cây ngÆ°á»i dùng cÆ¡ bản"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "User Search Attributes"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "Optional; one attribute per line"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "Hiển thị tên nhóm"
-#: templates/settings.php:85
+#: templates/settings.php:86
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:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "Cây nhóm cơ bản"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "Group Search Attributes"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "Nhóm thà nh viên Cộng đồng"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "Special Attributes"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "Theo Byte"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
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:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "Giúp đỡ"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 0836d8955e..e1d62e209c 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: zh_CN.GB2312\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "主机"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "您å¯ä»¥å¿½ç•¥å议，除éžæ‚¨éœ€è¦ SSL。然åŽç”¨ ldaps:// 开头"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "基本判别å"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "您å¯ä»¥åœ¨é«˜çº§é€‰é¡¹å¡ä¸ä¸ºç”¨æˆ·å’Œç¾¤ç»„指定基本判别å"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "用户判别å"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "密ç "
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "匿å访问请留空判别å和密ç 。"
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "用户登录过滤器"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "使用 %%uid å ä½ç¬¦ï¼Œä¾‹å¦‚ \"uid=%%uid\""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "用户列表过滤器"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "定义撷å–用户时è¦åº”用的过滤器。"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "ä¸èƒ½ä½¿ç”¨å ä½ç¬¦ï¼Œä¾‹å¦‚ \"objectClass=person\"。"
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "群组过滤器"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "定义撷å–群组时è¦åº”用的过滤器"
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "ä¸èƒ½ä½¿ç”¨å ä½ç¬¦ï¼Œä¾‹å¦‚ \"objectClass=posixGroup\"。"
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "端å£"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "使用 TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "大å°å†™ä¸æ•æ„Ÿçš„ LDAP æœåŠ¡å™¨ (Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "å…³é— SSL è¯ä¹¦æ ¡éªŒã€‚"
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "ä¸æŽ¨è，仅供测试"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "以秒计。修改会清空缓å˜ã€‚"
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "用户显示å称å—段"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "用于生æˆç”¨æˆ·çš„ ownCloud å称的 LDAP 属性。"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "åŸºæœ¬ç”¨æˆ·æ ‘"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "群组显示å称å—段"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "用于生æˆç¾¤ç»„çš„ ownCloud å称的 LDAP 属性。"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "åŸºæœ¬ç¾¤ç»„æ ‘"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "群组-æˆå‘˜ç»„åˆ"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "以å—节计"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "用户å请留空 (默认)。å¦åˆ™ï¼Œè¯·æŒ‡å®šä¸€ä¸ª LDAP/AD 属性。"
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "帮助"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index b799c7c163..e28f93b751 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-16 01:58+0200\n"
-"PO-Revision-Date: 2013-05-15 12:15+0000\n"
+"POT-Creation-Date: 2013-05-17 02:02+0200\n"
+"PO-Revision-Date: 2013-05-16 08:53+0000\n"
"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 763966dd29..2d4086d25e 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr "æœªèƒ½åˆ é™¤æœåŠ¡å™¨é…ç½®"
@@ -53,281 +57,363 @@ msgstr "ä¿ç•™è®¾ç½®å—？"
msgid "Cannot add server configuration"
msgstr "æ— æ³•æ·»åŠ æœåŠ¡å™¨é…ç½®"
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr "连接测试æˆåŠŸ"
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr "连接测试失败"
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr "您真的想è¦åˆ 除当å‰æœåŠ¡å™¨é…ç½®å—？"
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr "ç¡®è®¤åˆ é™¤"
-#: templates/settings.php:8
+#: templates/settings.php:9
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 "<b>è¦å‘Šï¼š</b>应用 user_ldap å’Œ user_webdavauth ä¸å…¼å®¹ã€‚您å¯èƒ½éé‡æœªé¢„料的行为。请垂询您的系统管ç†å‘˜ç¦ç”¨å…¶ä¸ä¸€ä¸ªã€‚"
-#: templates/settings.php:11
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr "<b>è¦å‘Šï¼š</b> PHP LDAP 模å—未安装，åŽç«¯å°†æ— 法工作。请请求您的系统管ç†å‘˜å®‰è£…该模å—。"
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr "æœåŠ¡å™¨é…ç½®"
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr "æ·»åŠ æœåŠ¡å™¨é…ç½®"
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "主机"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr "å¯ä»¥å¿½ç•¥å议，但如è¦ä½¿ç”¨SSL，则需以ldaps://开头"
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr "Base DN"
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr "æ¯è¡Œä¸€ä¸ªåŸºæœ¬åˆ¤åˆ«å"
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr "您å¯ä»¥åœ¨é«˜çº§é€‰é¡¹å¡é‡Œä¸ºç”¨æˆ·å’Œç»„指定Base DN"
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr "User DN"
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "密ç "
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr "å¯ç”¨åŒ¿å访问，将DN和密ç ä¿ç•™ä¸ºç©º"
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr "用户登录过滤"
-#: templates/settings.php:53
+#: templates/settings.php:54
#, 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:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr "使用 %%uid作为å ä½ç¬¦ï¼Œä¾‹å¦‚“uid=%%uidâ€"
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr "用户列表过滤"
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr "定义拉å–用户时的过滤器"
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr "没有任何å ä½ç¬¦,如 \"objectClass=person\"."
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr "组过滤"
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr "定义拉å–组信æ¯æ—¶çš„过滤器"
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr "æ— éœ€å ä½ç¬¦ï¼Œä¾‹å¦‚\"objectClass=posixGroup\""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr "连接设置"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr "现行é…ç½®"
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr "当å选åŽï¼Œæ¤é…置将被忽略。"
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "端å£"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr "备份 (é•œåƒ) 主机"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr "给出一个å¯é€‰çš„备份主机。它必须为主 LDAP/AD æœåŠ¡å™¨çš„一个镜åƒã€‚"
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr "备份 (é•œåƒ) 端å£"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr "ç¦ç”¨ä¸»æœåŠ¡å™¨"
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr "当开å¯åŽï¼ŒownCloud 将仅连接到镜åƒæœåŠ¡å™¨ã€‚"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "使用TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr "对于 LDAPS 连接ä¸è¦é¢å¤–å¯ç”¨å®ƒï¼Œè¿žæŽ¥å¿…然失败。"
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr "大å°å†™æ•æ„ŸLDAPæœåŠ¡å™¨(Windows)"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "å…³é—SSLè¯ä¹¦éªŒè¯"
-#: templates/settings.php:77
+#: templates/settings.php:78
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:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr "æš‚ä¸æŽ¨è，仅供测试"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr "缓å˜å˜æ´»æ—¶é—´"
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr "以秒计。修改将清空缓å˜ã€‚"
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr "目录设置"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr "用户显示å称å—段"
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr "用æ¥ç”Ÿæˆç”¨æˆ·çš„ownCloudå称的 LDAP属性"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr "åŸºç¡€ç”¨æˆ·æ ‘"
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr "æ¯è¡Œä¸€ä¸ªç”¨æˆ·åŸºå‡†åˆ¤åˆ«å"
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr "用户æœç´¢å±žæ€§"
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr "å¯é€‰;æ¯è¡Œä¸€ä¸ªå±žæ€§"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr "组显示å称å—段"
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr "用æ¥ç”Ÿæˆç»„çš„ownCloudå称的LDAP属性"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr "åŸºç¡€ç»„æ ‘"
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr "æ¯è¡Œä¸€ä¸ªç¾¤ç»„基准判别å"
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr "群组æœç´¢å±žæ€§"
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr "组æˆå‘˜å…³è”"
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr "特殊属性"
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr "é…é¢å—段"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr "默认é…é¢"
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr "å—节数"
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr "电邮å—段"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr "用户主目录命å规则"
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr "将用户å称留空(默认)。å¦åˆ™æŒ‡å®šä¸€ä¸ªLDAP/AD属性"
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr "测试é…ç½®"
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "帮助"
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 1ca7282410..40fcbd80f3 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-04-27 02:16+0200\n"
-"PO-Revision-Date: 2013-04-26 08:31+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr ""
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "密碼"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "é€£æŽ¥åŸ "
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "幫助"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 29607494a3..6b33c425aa 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-12 02:01+0200\n"
-"PO-Revision-Date: 2013-05-06 07:20+0000\n"
+"POT-Creation-Date: 2013-05-17 02:03+0200\n"
+"PO-Revision-Date: 2013-05-17 00:04+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"
@@ -17,6 +17,10 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
#: ajax/deleteConfiguration.php:34
msgid "Failed to delete the server configuration"
msgstr ""
@@ -53,281 +57,363 @@ msgstr ""
msgid "Cannot add server configuration"
msgstr ""
-#: js/settings.js:121
+#: js/settings.js:111
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:112
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:117
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:141
msgid "Connection test succeeded"
msgstr ""
-#: js/settings.js:126
+#: js/settings.js:146
msgid "Connection test failed"
msgstr ""
-#: js/settings.js:136
+#: js/settings.js:156
msgid "Do you really want to delete the current Server Configuration?"
msgstr ""
-#: js/settings.js:137
+#: js/settings.js:157
msgid "Confirm Deletion"
msgstr ""
-#: templates/settings.php:8
+#: templates/settings.php:9
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
+#: templates/settings.php:12
msgid ""
"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
"work. Please ask your system administrator to install it."
msgstr ""
-#: templates/settings.php:15
+#: templates/settings.php:16
msgid "Server configuration"
msgstr ""
-#: templates/settings.php:31
+#: templates/settings.php:32
msgid "Add Server Configuration"
msgstr ""
-#: templates/settings.php:36
+#: templates/settings.php:37
msgid "Host"
msgstr "主機"
-#: templates/settings.php:38
+#: templates/settings.php:39
msgid ""
"You can omit the protocol, except you require SSL. Then start with ldaps://"
msgstr ""
-#: templates/settings.php:39
+#: templates/settings.php:40
msgid "Base DN"
msgstr ""
-#: templates/settings.php:40
+#: templates/settings.php:41
msgid "One Base DN per line"
msgstr ""
-#: templates/settings.php:41
+#: templates/settings.php:42
msgid "You can specify Base DN for users and groups in the Advanced tab"
msgstr ""
-#: templates/settings.php:43
+#: templates/settings.php:44
msgid "User DN"
msgstr ""
-#: templates/settings.php:45
+#: templates/settings.php:46
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:46
+#: templates/settings.php:47
msgid "Password"
msgstr "密碼"
-#: templates/settings.php:49
+#: templates/settings.php:50
msgid "For anonymous access, leave DN and Password empty."
msgstr ""
-#: templates/settings.php:50
+#: templates/settings.php:51
msgid "User Login Filter"
msgstr ""
-#: templates/settings.php:53
+#: templates/settings.php:54
#, php-format
msgid ""
"Defines the filter to apply, when login is attempted. %%uid replaces the "
"username in the login action."
msgstr ""
-#: templates/settings.php:54
+#: templates/settings.php:55
#, php-format
msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
msgstr ""
-#: templates/settings.php:55
+#: templates/settings.php:56
msgid "User List Filter"
msgstr ""
-#: templates/settings.php:58
+#: templates/settings.php:59
msgid "Defines the filter to apply, when retrieving users."
msgstr ""
-#: templates/settings.php:59
+#: templates/settings.php:60
msgid "without any placeholder, e.g. \"objectClass=person\"."
msgstr ""
-#: templates/settings.php:60
+#: templates/settings.php:61
msgid "Group Filter"
msgstr ""
-#: templates/settings.php:63
+#: templates/settings.php:64
msgid "Defines the filter to apply, when retrieving groups."
msgstr ""
-#: templates/settings.php:64
+#: templates/settings.php:65
msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
msgstr ""
-#: templates/settings.php:68
+#: templates/settings.php:69
msgid "Connection Settings"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "Configuration Active"
msgstr ""
-#: templates/settings.php:70
+#: templates/settings.php:71
msgid "When unchecked, this configuration will be skipped."
msgstr ""
-#: templates/settings.php:71
+#: templates/settings.php:72
msgid "Port"
msgstr "連接阜"
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid "Backup (Replica) Host"
msgstr ""
-#: templates/settings.php:72
+#: templates/settings.php:73
msgid ""
"Give an optional backup host. It must be a replica of the main LDAP/AD "
"server."
msgstr ""
-#: templates/settings.php:73
+#: templates/settings.php:74
msgid "Backup (Replica) Port"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "Disable Main Server"
msgstr ""
-#: templates/settings.php:74
+#: templates/settings.php:75
msgid "When switched on, ownCloud will only connect to the replica server."
msgstr ""
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Use TLS"
msgstr "使用TLS"
-#: templates/settings.php:75
+#: templates/settings.php:76
msgid "Do not use it additionally for LDAPS connections, it will fail."
msgstr ""
-#: templates/settings.php:76
+#: templates/settings.php:77
msgid "Case insensitve LDAP server (Windows)"
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Turn off SSL certificate validation."
msgstr "關閉 SSL 憑è‰é©—è‰"
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid ""
"If connection only works with this option, import the LDAP server's SSL "
"certificate in your ownCloud server."
msgstr ""
-#: templates/settings.php:77
+#: templates/settings.php:78
msgid "Not recommended, use for testing only."
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "Cache Time-To-Live"
msgstr ""
-#: templates/settings.php:78
+#: templates/settings.php:79
msgid "in seconds. A change empties the cache."
msgstr ""
-#: templates/settings.php:80
+#: templates/settings.php:81
msgid "Directory Settings"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "User Display Name Field"
msgstr ""
-#: templates/settings.php:82
+#: templates/settings.php:83
msgid "The LDAP attribute to use to generate the user`s ownCloud name."
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "Base User Tree"
msgstr ""
-#: templates/settings.php:83
+#: templates/settings.php:84
msgid "One User Base DN per line"
msgstr ""
-#: templates/settings.php:84
+#: templates/settings.php:85
msgid "User Search Attributes"
msgstr ""
-#: templates/settings.php:84 templates/settings.php:87
+#: templates/settings.php:85 templates/settings.php:88
msgid "Optional; one attribute per line"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "Group Display Name Field"
msgstr ""
-#: templates/settings.php:85
+#: templates/settings.php:86
msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "Base Group Tree"
msgstr ""
-#: templates/settings.php:86
+#: templates/settings.php:87
msgid "One Group Base DN per line"
msgstr ""
-#: templates/settings.php:87
+#: templates/settings.php:88
msgid "Group Search Attributes"
msgstr ""
-#: templates/settings.php:88
+#: templates/settings.php:89
msgid "Group-Member association"
msgstr ""
-#: templates/settings.php:90
+#: templates/settings.php:91
msgid "Special Attributes"
msgstr ""
-#: templates/settings.php:92
+#: templates/settings.php:93
msgid "Quota Field"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "Quota Default"
msgstr ""
-#: templates/settings.php:93
+#: templates/settings.php:94
msgid "in bytes"
msgstr ""
-#: templates/settings.php:94
+#: templates/settings.php:95
msgid "Email Field"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid "User Home Folder Naming Rule"
msgstr ""
-#: templates/settings.php:95
+#: templates/settings.php:96
msgid ""
"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
"attribute."
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:101
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:102
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder in "
+"ownCloud. It is also a port of remote URLs, for instance for all *DAV "
+"services. With this setting, the default behaviour can be overriden. To "
+"achieve a similar behaviour as before ownCloud 5 enter the user display name"
+" attribute in the following field. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:103
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:104
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:105
+msgid ""
+"By default, ownCloud autodetects the UUID attribute. The UUID attribute is "
+"used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behaviour. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:106
+msgid "UUID Attribute:"
+msgstr ""
+
+#: templates/settings.php:107
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:108
+msgid ""
+"ownCloud uses usernames to store and assign (meta) data. In order to "
+"precisely identify and recognize users, each LDAP user will have a internal "
+"username. This requires a mapping from ownCloud username to LDAP user. The "
+"created username is mapped to the UUID of the LDAP user. Additionally the DN"
+" is cached as well to reduce LDAP interaction, but it is not used for "
+"identification. If the DN changes, the changes will be found by ownCloud. "
+"The internal ownCloud name is used all over in ownCloud. Clearing the "
+"Mappings will have leftovers everywhere. Clearing the Mappings is not "
+"configuration sensitive, it affects all LDAP configurations! Do never clear "
+"the mappings in a production environment. Only clear mappings in a testing "
+"or experimental stage."
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:109
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
+
+#: templates/settings.php:111
msgid "Test Configuration"
msgstr ""
-#: templates/settings.php:99
+#: templates/settings.php:111
msgid "Help"
msgstr "說明"
diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php
index f8f15c9fba..8241573f9a 100644
--- a/lib/l10n/nn_NO.php
+++ b/lib/l10n/nn_NO.php
@@ -3,7 +3,7 @@
"Personal" => "Personleg",
"Settings" => "Innstillingar",
"Users" => "Brukarar",
-"Apps" => "Applikasjonar",
+"Apps" => "Program",
"Admin" => "Administrer",
"Authentication error" => "Feil i autentisering",
"Files" => "Filer",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 0e4d0a66a1..3008873c86 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,21 +1,21 @@
<?php $TRANSLATIONS = array(
"Unable to load list from App Store" => "Klarer ikkje å lasta inn liste fra app-butikken",
"Authentication error" => "Autentiseringsfeil",
-"Your display name has been changed." => "Visningsnamnet ditt er endra.",
-"Unable to change display name" => "Klarte ikkje å endra visningsnamnet",
+"Your display name has been changed." => "Visingsnamnet ditt er endra.",
+"Unable to change display name" => "Klarte ikkje endra visingsnamnet",
"Group already exists" => "Gruppa finst allereie",
-"Unable to add group" => "Klarte ikkje å leggja til gruppa",
-"Could not enable app. " => "Klarte ikkje å aktivera app-en.",
+"Unable to add group" => "Klarte ikkje leggja til gruppa",
+"Could not enable app. " => "Klarte ikkje slå på programmet.",
"Email saved" => "E-postadresse lagra",
"Invalid email" => "Ugyldig e-postadresse",
"Unable to delete group" => "Klarte ikkje å sletta gruppa",
-"Unable to delete user" => "Klarte ikkje å sletta brukaren",
+"Unable to delete user" => "Klarte ikkje sletta brukaren",
"Language changed" => "Språk endra",
"Invalid request" => "Ugyldig førespurnad",
"Admins can't remove themself from the admin group" => "Administratorar kan ikkje fjerna seg sjølve frå admin-gruppa",
-"Unable to add user to group %s" => "Klarte ikkje å leggja til brukaren til gruppa %s",
-"Unable to remove user from group %s" => "Klarte ikkje å fjerna brukaren frå gruppa %s",
-"Couldn't update app." => "Klarte ikkje å oppdatera app-en.",
+"Unable to add user to group %s" => "Klarte ikkje leggja til brukaren til gruppa %s",
+"Unable to remove user from group %s" => "Klarte ikkje fjerna brukaren frå gruppa %s",
+"Couldn't update app." => "Klarte ikkje oppdatera programmet.",
"Update to {appversion}" => "Oppdater til {appversion}",
"Disable" => "Slå av",
"Enable" => "Slå på",
@@ -27,7 +27,7 @@
"Saving..." => "Lagrar …",
"deleted" => "sletta",
"undo" => "angra",
-"Unable to remove user" => "Klarte ikkje å fjerna brukaren",
+"Unable to remove user" => "Klarte ikkje fjerna brukaren",
"Groups" => "Grupper",
"Group Admin" => "Gruppestyrar",
"Delete" => "Slett",
@@ -42,17 +42,17 @@
"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
"Please double check the <a href='%s'>installation guides</a>." => "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
"Module 'fileinfo' missing" => "Modulen «fileinfo» manglar",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen «fileinfo» manglar. Me rår sterkt til å skru på denne modulen for å best mogleg oppdaga MIME-typar.",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
"Locale not working" => "Regionaldata fungerer ikkje",
-"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som krevst for å støtta %s.",
+"This ownCloud server can't set system locale to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Denne ownCloud-tenaren kan ikkje stilla regionen til %s. Dette tyder at det kan vera problem med visse teikn i filnamn. Me rår sterkt til å installera systempakkane som trengst for å støtta %s.",
"Internet connection not working" => "Nettilkoplinga fungerer ikkje",
-"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsapplikasjonar ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du skrur på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud.",
+"This ownCloud server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features of ownCloud." => "Denne ownCloud-tenaren har ikkje nokon fungerande nettilkopling. Difor vil visse funksjonar, t.d. montering av ekstern lagring, varsling om oppdatering, eller installering av tredjepartsprogram ikkje fungera. Varslingsepostar og ekstern tilgang til filer vil kanskje heller ikkje fungera. Me foreslår at du slå på nettilkoplinga til denne tenaren viss du vil nytta alle funksjonane til ownCloud.",
"Cron" => "Cron",
"Execute one task with each page loaded" => "Utfør éi oppgåve for kvar sidelasting",
"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php er registrert ved ei webcron-teneste. Last sida cron.php i ownCloud-rota ein gong i minuttet over http.",
"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Bruk cron-tenesta til systemet. Køyr fila cron.php i ownCloud-mappa frå ein cron-jobb på systemet ein gong i minuttet.",
"Sharing" => "Deling",
-"Enable Share API" => "Skru på API-et for deling",
+"Enable Share API" => "Slå på API-et for deling",
"Allow apps to use the Share API" => "La app-ar bruka API-et til deling",
"Allow links" => "Tillat lenkjer",
"Allow users to share items to the public with links" => "La brukarar dela ting offentleg med lenkjer",
@@ -63,7 +63,7 @@
"Security" => "Tryggleik",
"Enforce HTTPS" => "Krev HTTPS",
"Enforces the clients to connect to ownCloud via an encrypted connection." => "Krev at klientar koplar til ownCloud med ei kryptert tilkopling.",
-"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å skru av/på SSL-handhevinga.",
+"Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement." => "Ver venleg og kopla denne ownCloud-instansen til via HTTPS for å slå av/på SSL-handhevinga.",
"Log" => "Logg",
"Log level" => "Log nivå",
"More" => "Meir",
@@ -72,8 +72,8 @@
"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"https://github.com/owncloud\" target=\"_blank\">Kjeldekoden</a>, utvikla av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>, er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
"Add your App" => "Legg til din app",
"More Apps" => "Fleire app-ar",
-"Select an App" => "Vel ein applikasjon",
-"See application page at apps.owncloud.com" => "Sjå applikasjonssida på apps.owncloud.com",
+"Select an App" => "Vel eit program",
+"See application page at apps.owncloud.com" => "Sjå programsida på apps.owncloud.com",
"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Lisensiert under <span class=\"licence\"></span> av <span class=\"author\"></span>",
"Update" => "Oppdater",
"User Documentation" => "Brukardokumentasjon",
@@ -87,14 +87,14 @@
"Show First Run Wizard again" => "Vis Oppstartvegvisaren igjen",
"Password" => "Passord",
"Your password was changed" => "Passordet ditt er endra",
-"Unable to change your password" => "Klarte ikkje å endra passordet",
+"Unable to change your password" => "Klarte ikkje endra passordet",
"Current password" => "Passord",
"New password" => "Nytt passord",
"Change password" => "Endra passord",
-"Display Name" => "Visningsnamn",
+"Display Name" => "Visingsnamn",
"Email" => "E-post",
"Your email address" => "Di epost-adresse",
-"Fill in an email address to enable password recovery" => "Fyll inn e-postadressa di for å aktivera passordgjenoppretting",
+"Fill in an email address to enable password recovery" => "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg",
"Language" => "Språk",
"Help translate" => "Hjelp oss å omsetja",
"WebDAV" => "WebDAV",
@@ -105,7 +105,7 @@
"Unlimited" => "Ubegrensa",
"Other" => "Anna",
"Storage" => "Lagring",
-"change display name" => "endra visningsnamn",
+"change display name" => "endra visingsnamn",
"set new password" => "lag nytt passord",
"Default" => "Standard"
);
--
GitLab