Merge branch 'master' into files_encryption-style-fixes

1 files changed, 167 insertions, 53 deletions

diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 1beebaaf58f..33a6365c90e 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-25 00:05+0100\n"
-"PO-Revision-Date: 2013-01-24 01:50+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2013-02-03 00:04+0100\n"
+"PO-Revision-Date: 2013-02-02 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,6 +23,58 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr "Échec de la suppression de la configuration du serveur"
+
+#: ajax/testConfiguration.php:35
+msgid "The configuration is valid and the connection could be established!"
+msgstr "La configuration est valide est la connexion peut être établie !"
+
+#: ajax/testConfiguration.php:37
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr "La configuration est valide, mais le lien ne peut être établi. Veuillez vérifier les paramètres du serveur ainsi que vos identifiants de connexion."
+
+#: ajax/testConfiguration.php:40
+msgid ""
+"The configuration is invalid. Please look in the ownCloud log for further "
+"details."
+msgstr "La configuration est invalide. Veuillez vous référer aux fichiers de journaux ownCloud pour plus d'information."
+
+#: js/settings.js:66
+msgid "Deletion failed"
+msgstr "La suppression a échoué"
+
+#: js/settings.js:82
+msgid "Take over settings from recent server configuration?"
+msgstr "Récupérer les paramètres depuis une configuration récente du serveur ?"
+
+#: js/settings.js:83
+msgid "Keep settings?"
+msgstr "Garder ces paramètres ?"
+
+#: js/settings.js:97
+msgid "Cannot add server configuration"
+msgstr "Impossible d'ajouter la configuration du serveur."
+
+#: js/settings.js:121
+msgid "Connection test succeeded"
+msgstr "Test de connexion réussi"
+
+#: js/settings.js:126
+msgid "Connection test failed"
+msgstr "Le test de connexion a échoué"
+
+#: js/settings.js:136
+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
+msgid "Confirm Deletion"
+msgstr "Confirmer la suppression"
+
 #: templates/settings.php:8
 msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
@@ -37,165 +89,227 @@ msgid ""
 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
+msgid "Server configuration"
+msgstr "Configuration du serveur"
+
+#: templates/settings.php:17
+msgid "Add Server Configuration"
+msgstr "Ajouter une configuration du serveur"
+
+#: templates/settings.php:21
 msgid "Host"
 msgstr "Hôte"
 
-#: templates/settings.php:15
+#: templates/settings.php:21
 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:16
+#: templates/settings.php:22
 msgid "Base DN"
 msgstr "DN Racine"
 
-#: templates/settings.php:16
+#: templates/settings.php:22
 msgid "One Base DN per line"
 msgstr "Un DN racine par ligne"
 
-#: templates/settings.php:16
+#: templates/settings.php:22
 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:17
+#: templates/settings.php:23
 msgid "User DN"
 msgstr "DN Utilisateur (Autorisé à consulter l'annuaire)"
 
-#: templates/settings.php:17
+#: templates/settings.php:23
 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:18
+#: templates/settings.php:24
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/settings.php:18
+#: templates/settings.php:24
 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:19
+#: templates/settings.php:25
 msgid "User Login Filter"
 msgstr "Modèle d'authentification utilisateurs"
 
-#: templates/settings.php:19
+#: templates/settings.php:25
 #, 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:19
+#: templates/settings.php:25
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\""
 
-#: templates/settings.php:20
+#: templates/settings.php:26
 msgid "User List Filter"
 msgstr "Filtre d'utilisateurs"
 
-#: templates/settings.php:20
+#: templates/settings.php:26
 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:20
+#: templates/settings.php:26
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sans élément de substitution, par exemple \"objectClass=person\"."
 
-#: templates/settings.php:21
+#: templates/settings.php:27
 msgid "Group Filter"
 msgstr "Filtre de groupes"
 
-#: templates/settings.php:21
+#: templates/settings.php:27
 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:21
+#: templates/settings.php:27
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Configuration Active"
+msgstr "Configuration active"
+
+#: templates/settings.php:33
+msgid "When unchecked, this configuration will be skipped."
+msgstr "Lorsque non cochée, la configuration sera ignorée."
+
+#: templates/settings.php:34
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:25
-msgid "Base User Tree"
-msgstr "DN racine de l'arbre utilisateurs"
+#: templates/settings.php:35
+msgid "Backup (Replica) Host"
+msgstr "Serveur de backup (réplique)"
 
-#: templates/settings.php:25
-msgid "One User Base DN per line"
-msgstr "Un DN racine utilisateur par ligne"
+#: templates/settings.php:35
+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:26
-msgid "Base Group Tree"
-msgstr "DN racine de l'arbre groupes"
+#: templates/settings.php:36
+msgid "Backup (Replica) Port"
+msgstr "Port du serveur de backup (réplique)"
 
-#: templates/settings.php:26
-msgid "One Group Base DN per line"
-msgstr "Un DN racine groupe par ligne"
+#: templates/settings.php:37
+msgid "Disable Main Server"
+msgstr "Désactiver le serveur principal"
 
-#: templates/settings.php:27
-msgid "Group-Member association"
-msgstr "Association groupe-membre"
+#: templates/settings.php:37
+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:28
+#: templates/settings.php:38
 msgid "Use TLS"
 msgstr "Utiliser TLS"
 
-#: templates/settings.php:28
+#: templates/settings.php:38
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Ne pas utiliser pour les connexions SSL, car cela échouera."
 
-#: templates/settings.php:29
+#: templates/settings.php:39
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Serveur LDAP insensible à la casse (Windows)"
 
-#: templates/settings.php:30
+#: templates/settings.php:40
 msgid "Turn off SSL certificate validation."
 msgstr "Désactiver la validation du certificat SSL."
 
-#: templates/settings.php:30
+#: templates/settings.php:40
 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:30
+#: templates/settings.php:40
 msgid "Not recommended, use for testing only."
 msgstr "Non recommandé, utilisation pour tests uniquement."
 
-#: templates/settings.php:31
+#: templates/settings.php:41
+msgid "in seconds. A change empties the cache."
+msgstr "en secondes. Tout changement vide le cache."
+
+#: templates/settings.php:43
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:45
 msgid "User Display Name Field"
 msgstr "Champ \"nom d'affichage\" de l'utilisateur"
 
-#: templates/settings.php:31
+#: templates/settings.php:45
 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:32
+#: templates/settings.php:46
+msgid "Base User Tree"
+msgstr "DN racine de l'arbre utilisateurs"
+
+#: templates/settings.php:46
+msgid "One User Base DN per line"
+msgstr "Un DN racine utilisateur par ligne"
+
+#: templates/settings.php:47
+msgid "User Search Attributes"
+msgstr "Recherche des attributs utilisateur"
+
+#: templates/settings.php:47 templates/settings.php:50
+msgid "Optional; one attribute per line"
+msgstr "Optionnel, un attribut par ligne"
+
+#: templates/settings.php:48
 msgid "Group Display Name Field"
 msgstr "Champ \"nom d'affichage\" du groupe"
 
-#: templates/settings.php:32
+#: templates/settings.php:48
 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:34
+#: templates/settings.php:49
+msgid "Base Group Tree"
+msgstr "DN racine de l'arbre groupes"
+
+#: templates/settings.php:49
+msgid "One Group Base DN per line"
+msgstr "Un DN racine groupe par ligne"
+
+#: templates/settings.php:50
+msgid "Group Search Attributes"
+msgstr "Recherche des attributs du groupe"
+
+#: templates/settings.php:51
+msgid "Group-Member association"
+msgstr "Association groupe-membre"
+
+#: templates/settings.php:53
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:56
 msgid "in bytes"
 msgstr "en octets"
 
-#: templates/settings.php:36
-msgid "in seconds. A change empties the cache."
-msgstr "en secondes. Tout changement vide le cache."
-
-#: templates/settings.php:37
+#: templates/settings.php:58
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Laisser vide "
 
-#: templates/settings.php:39
+#: templates/settings.php:62
 msgid "Help"
 msgstr "Aide"