[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1213-g37b3534
Michal Čihař
nijel at users.sourceforge.net
Thu Apr 1 15:34:04 CEST 2010
The branch, master has been updated
via 37b3534e54eeb247362271adcb081fd226b5c2a4 (commit)
via 1d9f6aa90fb02761405c6642cfa720f6e1785ea7 (commit)
via b17e9a02d294a3aeb8020dee256dbc15f8168cf6 (commit)
via 6102d296269db3ebdf8ad4ebc914a3e602910ded (commit)
from cd7757a858bd8910ee4df1f3347508e813e7f24c (commit)
- Log -----------------------------------------------------------------
commit 37b3534e54eeb247362271adcb081fd226b5c2a4
Merge: cd7757a858bd8910ee4df1f3347508e813e7f24c 1d9f6aa90fb02761405c6642cfa720f6e1785ea7
Author: Michal Čihař <mcihar at novell.com>
Date: Thu Apr 1 15:33:53 2010 +0200
Merge remote branch 'pootle/master'
Conflicts:
po/fr.po
commit 1d9f6aa90fb02761405c6642cfa720f6e1785ea7
Author: Marc Delisle <marc at infomarc.info>
Date: Thu Apr 1 15:18:50 2010 +0200
Translation update done using Pootle.
commit b17e9a02d294a3aeb8020dee256dbc15f8168cf6
Author: Marc Delisle <marc at infomarc.info>
Date: Thu Apr 1 15:18:16 2010 +0200
Translation update done using Pootle.
commit 6102d296269db3ebdf8ad4ebc914a3e602910ded
Author: Marc Delisle <marc at infomarc.info>
Date: Thu Apr 1 15:15:49 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/fr.po | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/po/fr.po b/po/fr.po
index 9eae351..6e62be6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
"POT-Creation-Date: 2010-04-01 09:24-0400\n"
-"PO-Revision-Date: 2010-04-01 14:39+0200\n"
+"PO-Revision-Date: 2010-04-01 15:18+0200\n"
"Last-Translator: Marc <marc at infomarc.info>\n"
"Language-Team: french <fr at li.org>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Pootle 2.0.1\n"
@@ -992,7 +992,7 @@ msgstr "Donner tous les privilèges sur la base de données "%s""
#: libraries/messages.inc.php:205
msgid "Grant all privileges on wildcard name (username\\_%)"
-msgstr "Donner les privilèges passepartout (\"%\")"
+msgstr "Donner les privilèges passepartout (utilisateur\\_%)"
#: libraries/messages.inc.php:206
msgid "Creation/Update/Check dates"
@@ -4087,9 +4087,9 @@ msgid ""
"(for example '\\\\xyz' or 'a\\'b')."
msgstr ""
"Les différentes valeurs des champs de type enum/set sont à spécifier sous la "
-"forme 'a','b','c'...<br />Pour utiliser un caractère \"\\\" ou \"'\" dans "
-"l'une de ces valeurs, faites-le précéder du caractère d'échappement \"\\"
-"\" (par exemple '\\\\xyz' ou 'a\\'b')."
+"forme 'a','b','c'...<br />Pour utiliser un antislash(\"\\\") ou une apostrophe "
+"(\"'\") dans l'une de ces valeurs, faites-le précéder d'un antislash (par "
+"exemple '\\\\xyz' ou 'a\\'b')."
#: libraries/messages.inc.php:886
msgid "settings"
@@ -5331,9 +5331,9 @@ msgid ""
"However on last run no data has been parsed, this usually means phpMyAdmin "
"won't be able to finish this import unless you increase php time limits."
msgstr ""
-"Cependant lors du dernier traitement, aucune section n\\a été analysée; ceci "
+"Cependant lors du dernier traitement, aucune section n'a été analysée; ceci "
"signifie que phpMyAdmin ne pourra terminer cette importation, à moins que la "
-"limite de temps de PHP ne soit augmentée"
+"limite de temps de PHP ne soit augmentée."
#: libraries/messages.inc.php:1127
msgid ""
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list