Changeset 245:aa189f933741

Timestamp:

05/12/11 11:07:44 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

default

Parents:

244:c122cb3d47eb (diff), 243:c8413869f8dc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge

Files:

• locales/fr/main.po (modified) (1 diff)
• locales/fr/main.po (modified) (2 diffs)

locales/fr/main.po

@@ -2810 +2810 @@
 msgid "Activate enhanced uploader in media manager"
 msgstr "Activer l'interface avancée du gestionnaire de médias"
+
+msgid "Do not use standard favicon"
+msgstr "Ne pas utiliser le favicon standard"
+
+msgid "This will be applied for all users"
+msgstr "Ce choix sera actif pour tous les utilisateurs"

locales/fr/main.po

@@ -2275 +2275 @@
 msgstr "Envoyer"
 
+msgid "Loading enhanced uploader, please wait."
+msgstr "Chargement de l'interface avancée."
+
 msgid "No file in queue."
 msgstr "Aucun fichier en file d'attente."
@@ -2806 +2809 @@
 
 msgid "Activate enhanced uploader in media manager"
-msgstr "Activer l'interface avancée du gestionnaire de média"
+msgstr "Activer l'interface avancée du gestionnaire de médias"
 
 msgid "Do not use standard favicon"