[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1155-g31a023f

[Michal Čihař]

The branch, master has been updated
       via  31a023f96090c16bc791ee3bf2decb4d23c45388 (commit)
       via  f8c1c2712bf62d34370262a80961696244f8ba30 (commit)
       via  90fa85076c5a51fb09744ca0121f113358bdddf4 (commit)
       via  15a712575e582b8b1b5ee0609f2208896cf6bf91 (commit)
       via  4fc2a6d3d1747797206fb9facf96e20787525b58 (commit)
       via  bd97ce16f299da87b963984e53ea0f87086afaab (commit)
       via  e834697183c89ea9b6facab06b249c4fc7752dfb (commit)
      from  43afb034ee33c20d12b0ada65b11e2dc43b51a02 (commit)


- Log -----------------------------------------------------------------
commit 31a023f96090c16bc791ee3bf2decb4d23c45388
Merge: f8c1c2712bf62d34370262a80961696244f8ba30 43afb034ee33c20d12b0ada65b11e2dc43b51a02
Author: Michal Čihař <michal at cihar.com>
Date:   Wed Mar 31 16:40:22 2010 +0200

    Merge remote branch 'origin/master'

commit f8c1c2712bf62d34370262a80961696244f8ba30
Merge: 90fa85076c5a51fb09744ca0121f113358bdddf4 251403e61741b961bc73a4edbe11b2e055dd19ef
Author: Michal Čihař <michal at cihar.com>
Date:   Wed Mar 31 14:41:07 2010 +0200

    Merge remote branch 'origin/master'

commit 90fa85076c5a51fb09744ca0121f113358bdddf4
Author: marc <marc at infomarc.info>
Date:   Wed Mar 31 14:04:42 2010 +0200

    Translation update done using Pootle.

commit 15a712575e582b8b1b5ee0609f2208896cf6bf91
Author: marc <marc at infomarc.info>
Date:   Wed Mar 31 14:04:26 2010 +0200

    Translation update done using Pootle.

commit 4fc2a6d3d1747797206fb9facf96e20787525b58
Author: marc <marc at infomarc.info>
Date:   Wed Mar 31 14:03:28 2010 +0200

    Translation update done using Pootle.

commit bd97ce16f299da87b963984e53ea0f87086afaab
Author: marc <marc at infomarc.info>
Date:   Wed Mar 31 14:02:56 2010 +0200

    Translation update done using Pootle.

commit e834697183c89ea9b6facab06b249c4fc7752dfb
Author: marc <marc at infomarc.info>
Date:   Wed Mar 31 13:50:47 2010 +0200

    Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes:
 po/fr.po |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index d92bed9..4d57b28 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-03-30 23:18+0200\n"
-"PO-Revision-Date: 2010-03-30 18:30+0200\n"
+"PO-Revision-Date: 2010-03-31 14:04+0200\n"
 "Last-Translator:  <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"
 
@@ -62,12 +62,12 @@ msgstr[0] "%1$d enregistrement supprimé."
 msgstr[1] "%1$d enregistrements supprimés."
 
 #: libraries/Message.class.php:320
-#, fuzzy, php-format
+#, php-format
 #| msgid "%1$d row(s) inserted."
 msgid "%1$d row inserted."
 msgid_plural "%1$d rows inserted."
-msgstr[0] "%1$d enregistrement(s) inséré(s)."
-msgstr[1] "%1$d enregistrement(s) inséré(s)."
+msgstr[0] "%1$d enregistrement inséré."
+msgstr[1] "%1$d enregistrements insérés."
 
 #. l10n: Text direction, use either ltr or rtl
 #: libraries/messages.inc.php:15
@@ -6147,9 +6147,8 @@ msgid "Row marker"
 msgstr "Activer le marqueur d'enregistrements"
 
 #: setup/lib/messages.inc.php:23
-#, fuzzy
 msgid "Highlight row pointed by the mouse cursor"
-msgstr "...dans le panneau de navigation"
+msgstr "Mettre en surbrillance l'enregistrement sur lequel pointe la souris"
 
 #: setup/lib/messages.inc.php:24
 msgid "Highlight pointer"
@@ -6276,7 +6275,7 @@ msgstr "Serveur par défaut"
 
 #: setup/lib/messages.inc.php:47
 msgid "Tab that is displayed when entering a database"
-msgstr ""
+msgstr "L'onglet affiché lors de l'entrée dans une base de données"
 
 #: setup/lib/messages.inc.php:48
 msgid "Default database tab"
@@ -6284,7 +6283,7 @@ msgstr "Onglet par défaut pour bases de données"
 
 #: setup/lib/messages.inc.php:49
 msgid "Tab that is displayed when entering a server"
-msgstr ""
+msgstr "L'onglet initial dans l'affichage serveur"
 
 #: setup/lib/messages.inc.php:50
 msgid "Default server tab"
@@ -6292,7 +6291,7 @@ msgstr "Onglet par défaut pour serveur"
 
 #: setup/lib/messages.inc.php:51
 msgid "Tab that is displayed when entering a table"
-msgstr ""
+msgstr "L'onglet initial lors de l'accès à une table"
 
 #: setup/lib/messages.inc.php:52
 msgid "Default table tab"


hooks/post-receive
-- 
phpMyAdmin