[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1559-g879864b

Michal Čihař nijel at users.sourceforge.net
Tue Feb 1 13:14:56 CET 2011


The branch, master has been updated
       via  879864b300ae3118e0e9bb5142c0f3da77807346 (commit)
       via  040ce81e4a8dfe418a480c1fe86c7272688fd25d (commit)
       via  61557a93c88e172101cdd02d48282d0faa9baafd (commit)
       via  22d7c1e6e8cccb2209b51632e7644143b2f19bef (commit)
       via  13f190280de8c6b4077436c1e3f989fa8edf3666 (commit)
       via  25e3f69a4b6d9a0e9bd5416d825a746fe7aaff4c (commit)
       via  e6c41481cd17a47715c84a27957bfb881c5367d0 (commit)
       via  4da90822a24f00a00fd7c7950315042e0d96b8b4 (commit)
       via  e7c18b48086e1f5118ed6ecfbc5d82596be71348 (commit)
       via  98cb0bf771f2c2dc5fb6e761eec516794ac04c05 (commit)
       via  1e8fc55da11a037160cb9ffc2a7eeda8a9baada9 (commit)
       via  c2615c7570ecd826d4445e2c29828cfd61c3bd9d (commit)
       via  d091d6ca3a223e9a20a550b70bd82c1f1b45fcd3 (commit)
       via  615d5b43b1b69be8b062cc7391ae8aa4b64f6407 (commit)
       via  3990bfc516be8f0801d5280faa3460353d029952 (commit)
       via  18d492d23cf4bea1e1ee36e9d7159ab8a074ecbe (commit)
      from  c199f6b8bd1e909370b7f091fbb36e3ec092c978 (commit)


- Log -----------------------------------------------------------------
commit 879864b300ae3118e0e9bb5142c0f3da77807346
Merge: 040ce81e4a8dfe418a480c1fe86c7272688fd25d c199f6b8bd1e909370b7f091fbb36e3ec092c978
Author: Pootle server <pootle at cihar.com>
Date:   Tue Feb 1 08:40:27 2011 +0100

    Merge remote branch 'origin/master'

commit 040ce81e4a8dfe418a480c1fe86c7272688fd25d
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Jan 31 19:41:19 2011 +0200

    Translation update done using Pootle.

commit 61557a93c88e172101cdd02d48282d0faa9baafd
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Jan 31 19:41:05 2011 +0200

    Translation update done using Pootle.

commit 22d7c1e6e8cccb2209b51632e7644143b2f19bef
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Jan 31 19:40:41 2011 +0200

    Translation update done using Pootle.

commit 13f190280de8c6b4077436c1e3f989fa8edf3666
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Jan 31 19:40:18 2011 +0200

    Translation update done using Pootle.

commit 25e3f69a4b6d9a0e9bd5416d825a746fe7aaff4c
Merge: e6c41481cd17a47715c84a27957bfb881c5367d0 1e84e0b7bc097d330e84bf2edb147f8fafb4a9cf
Author: Pootle server <pootle at cihar.com>
Date:   Mon Jan 31 18:40:05 2011 +0100

    Merge remote branch 'origin/master'

commit e6c41481cd17a47715c84a27957bfb881c5367d0
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Jan 31 19:39:58 2011 +0200

    Translation update done using Pootle.

commit 4da90822a24f00a00fd7c7950315042e0d96b8b4
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Jan 31 19:39:33 2011 +0200

    Translation update done using Pootle.

commit e7c18b48086e1f5118ed6ecfbc5d82596be71348
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Jan 31 19:39:15 2011 +0200

    Translation update done using Pootle.

commit 98cb0bf771f2c2dc5fb6e761eec516794ac04c05
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Jan 31 19:31:51 2011 +0200

    Translation update done using Pootle.

commit 1e8fc55da11a037160cb9ffc2a7eeda8a9baada9
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Jan 31 19:31:46 2011 +0200

    Translation update done using Pootle.

commit c2615c7570ecd826d4445e2c29828cfd61c3bd9d
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Jan 31 19:31:41 2011 +0200

    Translation update done using Pootle.

commit d091d6ca3a223e9a20a550b70bd82c1f1b45fcd3
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Jan 31 19:31:33 2011 +0200

    Translation update done using Pootle.

commit 615d5b43b1b69be8b062cc7391ae8aa4b64f6407
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Jan 31 19:31:28 2011 +0200

    Translation update done using Pootle.

commit 3990bfc516be8f0801d5280faa3460353d029952
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Jan 31 19:31:22 2011 +0200

    Translation update done using Pootle.

commit 18d492d23cf4bea1e1ee36e9d7159ab8a074ecbe
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Jan 31 19:31:15 2011 +0200

    Translation update done using Pootle.

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

Summary of changes:
 po/en_GB.po |   17 ++++++++++-------
 po/fr.po    |   17 ++++++++++-------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/po/en_GB.po b/po/en_GB.po
index 891913e..591f3b4 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-01-31 15:47+0100\n"
-"PO-Revision-Date: 2011-01-31 15:04+0200\n"
+"PO-Revision-Date: 2011-01-31 19:31+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: english-gb <en_GB at li.org>\n"
 "Language: en_GB\n"
@@ -5102,20 +5102,21 @@ msgid ""
 "Documentation and further information about PBMS can be found on %sThe "
 "PrimeBase Media Streaming home page%s."
 msgstr ""
+"Documentation and further information about PBMS can be found on %sThe "
+"PrimeBase Media Streaming home page%s."
 
 #: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127
-#, fuzzy
 #| msgid "Relations"
 msgid "Related Links"
-msgstr "Relations"
+msgstr "Related Links"
 
 #: libraries/engines/pbms.lib.php:98
 msgid "The PrimeBase Media Streaming Blog by Barry Leslie"
-msgstr ""
+msgstr "The PrimeBase Media Streaming Blog by Barry Leslie"
 
 #: libraries/engines/pbms.lib.php:99
 msgid "PrimeBase XT Home Page"
-msgstr ""
+msgstr "PrimeBase XT Home Page"
 
 #: libraries/engines/pbxt.lib.php:22
 msgid "Index cache size"
@@ -5271,14 +5272,16 @@ msgid ""
 "Documentation and further information about PBXT can be found on the "
 "%sPrimeBase XT Home Page%s."
 msgstr ""
+"Documentation and further information about PBXT can be found on the %"
+"sPrimeBase XT Home Page%s."
 
 #: libraries/engines/pbxt.lib.php:129
 msgid "The PrimeBase XT Blog by Paul McCullagh"
-msgstr ""
+msgstr "The PrimeBase XT Blog by Paul McCullagh"
 
 #: libraries/engines/pbxt.lib.php:130
 msgid "The PrimeBase Media Streaming (PBMS) home page"
-msgstr ""
+msgstr "The PrimeBase Media Streaming (PBMS) home page"
 
 #: libraries/export/csv.php:21 libraries/import/csv.php:27
 msgid "Columns separated with:"
diff --git a/po/fr.po b/po/fr.po
index 84a929f..f8e2772 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-01-31 15:47+0100\n"
-"PO-Revision-Date: 2011-01-31 15:05+0200\n"
+"PO-Revision-Date: 2011-01-31 19:41+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: french <fr at li.org>\n"
 "Language: fr\n"
@@ -5169,20 +5169,21 @@ msgid ""
 "Documentation and further information about PBMS can be found on %sThe "
 "PrimeBase Media Streaming home page%s."
 msgstr ""
+"La documentation de PBMS et des informations additionnelles sont disponibles "
+"sur %sle site de PrimeBase Media Streaming%s."
 
 #: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127
-#, fuzzy
 #| msgid "Relations"
 msgid "Related Links"
-msgstr "Relations"
+msgstr "Liens connexes"
 
 #: libraries/engines/pbms.lib.php:98
 msgid "The PrimeBase Media Streaming Blog by Barry Leslie"
-msgstr ""
+msgstr "Le blogue PrimeBase Media Streaming par Barry Leslie"
 
 #: libraries/engines/pbms.lib.php:99
 msgid "PrimeBase XT Home Page"
-msgstr ""
+msgstr "Le site de PrimeBase XT"
 
 #: libraries/engines/pbxt.lib.php:22
 msgid "Index cache size"
@@ -5342,14 +5343,16 @@ msgid ""
 "Documentation and further information about PBXT can be found on the "
 "%sPrimeBase XT Home Page%s."
 msgstr ""
+"La documentation de PBXT et des informations additionnelles sont disponibles "
+"sur %sle site de PrimeBase XT%s."
 
 #: libraries/engines/pbxt.lib.php:129
 msgid "The PrimeBase XT Blog by Paul McCullagh"
-msgstr ""
+msgstr "Le blogue de PrimeBase XT par Paul McCullagh"
 
 #: libraries/engines/pbxt.lib.php:130
 msgid "The PrimeBase Media Streaming (PBMS) home page"
-msgstr ""
+msgstr "Le site PrimeBase Media Streaming (PBMS)"
 
 #: libraries/export/csv.php:21 libraries/import/csv.php:27
 msgid "Columns separated with:"


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list