[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1935-g226a043 - Git

8 Feb 2011

The branch, master has been updated
       via  226a0433cdb89383994a7c31085a2fb38b54bf98 (commit)
       via  9e18ed94a643438db3a424cb79f00b8fcfe59d95 (commit)
       via  527ae9db4bb5fbe7dc1f254f95386a044b64c2be (commit)
       via  03ed7804956e013793a1e6bc8a997469d2e9bb48 (commit)
       via  e7c8e002ec6abad32684ee2bd78cad9497600a92 (commit)
       via  ed9257291de49c4b4ec414889f85c1dfa72959ff (commit)
       via  a1b12104d04fb925d696a9cf851c8269f8f9f671 (commit)
       via  ba52e0c8416070960a007d090d65f91cd026ab3e (commit)
       via  784e529f603afc51ab4b06e03d91c8a26f2b8b73 (commit)
       via  6d42409543f74bcdf5751588882e640ee72599e2 (commit)
       via  da20e2d22c510503337af0d4577fe02b51d0621c (commit)
       via  6385d23f8697f56cc4c6e2aa77ab41ad164845b7 (commit)
       via  3a0d0927666dd5d4bb298596862ec0f0b9822808 (commit)
       via  6e550b768354dfcf4b2b974fe81a13db7d3cf0de (commit)
       via  e4d4996fb8563cc3e91fba55e22cb93d261f2c0b (commit)
       via  656c40afc5733dbe28afe9d84c19f19f37da47ba (commit)
       via  692b0592297628e1f69c827e09c21159a21c4d0c (commit)
      from  7ae146651970376ab618e0217beaf807d97348b0 (commit)
- Log -----------------------------------------------------------------
commit 226a0433cdb89383994a7c31085a2fb38b54bf98
Merge: 7ae146651970376ab618e0217beaf807d97348b0 9e18ed94a643438db3a424cb79f00b8fcfe59d95
Author: Michal Čihař michal@cihar.com
Date:   Tue Feb 8 19:32:39 2011 +0100
Merge remote branch 'pootle/master'
Conflicts:
    	po/en_GB.po
    	po/fr.po
    	po/tr.po
commit 9e18ed94a643438db3a424cb79f00b8fcfe59d95
Author: Marc Delisle marc@infomarc.info
Date:   Tue Feb 8 19:46:45 2011 +0200
Translation update done using Pootle.
commit 527ae9db4bb5fbe7dc1f254f95386a044b64c2be
Author: Marc Delisle marc@infomarc.info
Date:   Tue Feb 8 19:46:11 2011 +0200
Translation update done using Pootle.
commit 03ed7804956e013793a1e6bc8a997469d2e9bb48
Author: Marc Delisle marc@infomarc.info
Date:   Tue Feb 8 19:45:46 2011 +0200
Translation update done using Pootle.
commit e7c8e002ec6abad32684ee2bd78cad9497600a92
Author: Marc Delisle marc@infomarc.info
Date:   Tue Feb 8 19:45:41 2011 +0200
Translation update done using Pootle.
commit ed9257291de49c4b4ec414889f85c1dfa72959ff
Author: Marc Delisle marc@infomarc.info
Date:   Tue Feb 8 19:45:25 2011 +0200
Translation update done using Pootle.
commit a1b12104d04fb925d696a9cf851c8269f8f9f671
Author: Marc Delisle marc@infomarc.info
Date:   Tue Feb 8 19:43:48 2011 +0200
Translation update done using Pootle.
commit ba52e0c8416070960a007d090d65f91cd026ab3e
Author: Marc Delisle marc@infomarc.info
Date:   Tue Feb 8 19:38:27 2011 +0200
Translation update done using Pootle.
commit 784e529f603afc51ab4b06e03d91c8a26f2b8b73
Author: Marc Delisle marc@infomarc.info
Date:   Tue Feb 8 19:38:22 2011 +0200
Translation update done using Pootle.
commit 6d42409543f74bcdf5751588882e640ee72599e2
Author: Marc Delisle marc@infomarc.info
Date:   Tue Feb 8 19:38:17 2011 +0200
Translation update done using Pootle.
commit da20e2d22c510503337af0d4577fe02b51d0621c
Author: Marc Delisle marc@infomarc.info
Date:   Tue Feb 8 19:38:13 2011 +0200
Translation update done using Pootle.
commit 6385d23f8697f56cc4c6e2aa77ab41ad164845b7
Author: Marc Delisle marc@infomarc.info
Date:   Tue Feb 8 19:38:08 2011 +0200
Translation update done using Pootle.
commit 3a0d0927666dd5d4bb298596862ec0f0b9822808
Author: Burak Yavuz hitowerdigit@hotmail.com
Date:   Tue Feb 8 19:00:26 2011 +0200
Translation update done using Pootle.
commit 6e550b768354dfcf4b2b974fe81a13db7d3cf0de
Author: Burak Yavuz hitowerdigit@hotmail.com
Date:   Tue Feb 8 19:00:14 2011 +0200
Translation update done using Pootle.
commit e4d4996fb8563cc3e91fba55e22cb93d261f2c0b
Author: Burak Yavuz hitowerdigit@hotmail.com
Date:   Tue Feb 8 18:59:57 2011 +0200
Translation update done using Pootle.
commit 656c40afc5733dbe28afe9d84c19f19f37da47ba
Author: Burak Yavuz hitowerdigit@hotmail.com
Date:   Tue Feb 8 18:58:38 2011 +0200
Translation update done using Pootle.
commit 692b0592297628e1f69c827e09c21159a21c4d0c
Author: Burak Yavuz hitowerdigit@hotmail.com
Date:   Tue Feb 8 18:58:30 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 po/en_GB.po |   14 +++++++-------
 po/fr.po    |   16 ++++++++--------
 po/tr.po    |   14 +++++++-------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/po/en_GB.po b/po/en_GB.po
index c255d26..f9d3ec9 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@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-02-08 17:09+0100\n"
-"PO-Revision-Date: 2011-02-03 19:19+0200\n"
+"PO-Revision-Date: 2011-02-08 19:38+0200\n"
 "Last-Translator: Marc Delisle marc@infomarc.info\n"
 "Language-Team: english-gb en_GB@li.org\n"
 "Language: en_GB\n"
@@ -112,6 +112,8 @@ msgid ""
 "The %s file is not available on this system, please visit www.phpmyadmin.net "
 "for more information."
 msgstr ""
+"The %s file is not available on this system, please visit www.phpmyadmin.net "
+"for more information."
#: db_create.php:58
 #, php-format
@@ -2108,17 +2110,16 @@ msgstr "There are no files to upload"
#: libraries/config.values.php:45 libraries/config.values.php:50
 msgid "Both"
-msgstr ""
+msgstr "Both"
#: libraries/config.values.php:74
 msgid "Open"
-msgstr ""
+msgstr "Open"
#: libraries/config.values.php:74
-#, fuzzy
 #| msgid "Close"
 msgid "Closed"
-msgstr "Close"
+msgstr "Closed"
#: libraries/config.values.php:95 libraries/export/htmlword.php:24
 #: libraries/export/latex.php:41 libraries/export/odt.php:33
@@ -4829,10 +4830,9 @@ msgid "Browser transformation"
 msgstr "Browser transformation"
#: libraries/display_tbl.lib.php:1165
-#, fuzzy
 #| msgid "Copyright"
 msgid "Copy"
-msgstr "Copyright"
+msgstr "Copy"
#: libraries/display_tbl.lib.php:1180 libraries/display_tbl.lib.php:1192
 msgid "The row has been deleted"
diff --git a/po/fr.po b/po/fr.po
index ffd710c..7b7dcb0 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@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-02-08 17:09+0100\n"
-"PO-Revision-Date: 2011-02-03 19:20+0200\n"
+"PO-Revision-Date: 2011-02-08 19:46+0200\n"
 "Last-Translator: Marc Delisle marc@infomarc.info\n"
 "Language-Team: french fr@li.org\n"
 "Language: fr\n"
@@ -113,6 +113,8 @@ msgid ""
 "The %s file is not available on this system, please visit www.phpmyadmin.net "
 "for more information."
 msgstr ""
+"Le fichier %s n'est pas disponible sur ce serveur, veuillez visiter "
+"www.phpmyadmin.net pour plus d'informations."
#: db_create.php:58
 #, php-format
@@ -1115,7 +1117,7 @@ msgstr "Montrer zone SQL"
#: js/messages.php:86
 msgid "Inline Edit"
-msgstr "Édition en place"
+msgstr "Éditer en place"
#: js/messages.php:89
 msgid "Hide search criteria"
@@ -2131,17 +2133,16 @@ msgstr "Aucun fichier n'est disponible pour le transfert"
#: libraries/config.values.php:45 libraries/config.values.php:50
 msgid "Both"
-msgstr ""
+msgstr "Les deux"
#: libraries/config.values.php:74
 msgid "Open"
-msgstr ""
+msgstr "Ouvert"
#: libraries/config.values.php:74
-#, fuzzy
 #| msgid "Close"
 msgid "Closed"
-msgstr "Fermer"
+msgstr "Fermé"
#: libraries/config.values.php:95 libraries/export/htmlword.php:24
 #: libraries/export/latex.php:41 libraries/export/odt.php:33
@@ -4887,10 +4888,9 @@ msgid "Browser transformation"
 msgstr "Transformation"
#: libraries/display_tbl.lib.php:1165
-#, fuzzy
 #| msgid "Copyright"
 msgid "Copy"
-msgstr "Copyright"
+msgstr "Copier"
#: libraries/display_tbl.lib.php:1180 libraries/display_tbl.lib.php:1192
 msgid "The row has been deleted"
diff --git a/po/tr.po b/po/tr.po
index dea584d..e78cbe9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-02-08 17:09+0100\n"
-"PO-Revision-Date: 2011-02-03 13:37+0200\n"
+"PO-Revision-Date: 2011-02-08 19:00+0200\n"
 "Last-Translator: Burak Yavuz hitowerdigit@hotmail.com\n"
 "Language-Team: turkish tr@li.org\n"
 "Language: tr\n"
@@ -112,6 +112,8 @@ msgid ""
 "The %s file is not available on this system, please visit www.phpmyadmin.net "
 "for more information."
 msgstr ""
+"%s dosyası bu sistemde mevcut değil, lütfen daha fazla bilgi için "
+"www.phpmyadmin.net adresini ziyaret edin."
#: db_create.php:58
 #, php-format
@@ -2110,17 +2112,16 @@ msgstr "Göndermek için hiç dosya yok"
#: libraries/config.values.php:45 libraries/config.values.php:50
 msgid "Both"
-msgstr ""
+msgstr "Her ikisi"
#: libraries/config.values.php:74
 msgid "Open"
-msgstr ""
+msgstr "Açık"
#: libraries/config.values.php:74
-#, fuzzy
 #| msgid "Close"
 msgid "Closed"
-msgstr "Kapat"
+msgstr "Kapandı"
#: libraries/config.values.php:95 libraries/export/htmlword.php:24
 #: libraries/export/latex.php:41 libraries/export/odt.php:33
@@ -4866,10 +4867,9 @@ msgid "Browser transformation"
 msgstr "Tarayıcı dönüşümü"
#: libraries/display_tbl.lib.php:1165
-#, fuzzy
 #| msgid "Copyright"
 msgid "Copy"
-msgstr "Telif hakkı"
+msgstr "Kopyala"
#: libraries/display_tbl.lib.php:1180 libraries/display_tbl.lib.php:1192
 msgid "The row has been deleted"
hooks/post-receive
-- 
phpMyAdmin


    