Translation update done using Pootle.

This commit is contained in:
Marc Delisle
2010-09-22 21:31:53 +02:00
committed by Pootle server
parent cadd682815
commit a32ad73099

View File

@@ -7065,10 +7065,9 @@ msgid "This feature is not supported by your web browser"
msgstr "Cette fonction n'est pas supportée par votre navigateur"
#: prefs_manage.php:263
#, fuzzy
#| msgid "Server configuration"
msgid "Merge with current configuration"
msgstr "Configuration du serveur"
msgstr "Fusionner avec la configuration courante"
#: prefs_manage.php:277
#, php-format