15 Oct
2010
15 Oct
'10
11:29 a.m.
The branch, master has been updated
via 75fd4ba212af4af9ea3cd54d641c6c6281c05f53 (commit)
via 9909fe1375cd0a13fd44f00dd285228af29389da (commit)
via 08e23bad9deaaf3557ab3baf6da0865b188dc6f2 (commit)
via fcded6734f300ecd8bf9a30441c5dc9e80800aba (commit)
via a590880765e98ad546401ac0f9b10214b5594446 (commit)
from 6206cd30f43e8ebb1b60073ea8044f8f88c4434a (commit)
- Log -----------------------------------------------------------------
commit 75fd4ba212af4af9ea3cd54d641c6c6281c05f53
Merge: 9909fe1375cd0a13fd44f00dd285228af29389da 6206cd30f43e8ebb1b60073ea8044f8f88c4434a
Author: Pootle server <pootle(a)cihar.com>
Date: Thu Oct 14 20:40:11 2010 +0200
Merge remote branch 'origin/master'
commit 9909fe1375cd0a13fd44f00dd285228af29389da
Merge: 08e23bad9deaaf3557ab3baf6da0865b188dc6f2 2ecf4b3641830ea454102360bea5d847417224c5
Author: Pootle server <pootle(a)cihar.com>
Date: Thu Oct 14 12:40:30 2010 +0200
Merge remote branch 'origin/master'
commit 08e23bad9deaaf3557ab3baf6da0865b188dc6f2
Merge: fcded6734f300ecd8bf9a30441c5dc9e80800aba ad207a415fd2ba6f0e110c9e74ba9ee50a5b25a8
Author: Pootle server <pootle(a)cihar.com>
Date: Wed Oct 13 20:40:31 2010 +0200
Merge remote branch 'origin/master'
commit fcded6734f300ecd8bf9a30441c5dc9e80800aba
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Oct 13 18:50:52 2010 +0200
Translation update done using Pootle.
commit a590880765e98ad546401ac0f9b10214b5594446
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Oct 13 18:50:36 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/fr.po | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/po/fr.po b/po/fr.po
index 463722f..439ba09 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-10-04 08:08-0400\n"
-"PO-Revision-Date: 2010-10-07 21:14+0200\n"
+"PO-Revision-Date: 2010-10-13 18:50+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: french <fr(a)li.org>\n"
"Language: fr\n"
@@ -1093,7 +1093,7 @@ msgstr "Montrer zone SQL"
#: js/messages.php:86
msgid "Inline Edit"
-msgstr "Éditiion sur place"
+msgstr "Édition en place"
#: js/messages.php:89 tbl_change.php:294 tbl_indexes.php:198
#: tbl_indexes.php:223
@@ -1950,7 +1950,7 @@ msgstr "Valider SQL"
#: libraries/common.lib.php:1240
msgid "Inline edit of this query"
-msgstr "Éditer cette requête en ligne"
+msgstr "Éditer cette requête en place"
#: libraries/common.lib.php:1242
msgid "Inline"
hooks/post-receive
--
phpMyAdmin