Merge remote branch 'pootle/master'

Conflicts:
	po/en_GB.po
	po/fr.po
	po/tr.po
This commit is contained in:
Michal Čihař
2011-02-08 19:32:39 +01:00
3 changed files with 22 additions and 22 deletions

View File

@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n" "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-02-08 17:09+0100\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" "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: english-gb <en_GB@li.org>\n" "Language-Team: english-gb <en_GB@li.org>\n"
"Language: en_GB\n" "Language: en_GB\n"
@@ -112,6 +112,8 @@ msgid ""
"The %s file is not available on this system, please visit www.phpmyadmin.net " "The %s file is not available on this system, please visit www.phpmyadmin.net "
"for more information." "for more information."
msgstr "" msgstr ""
"The %s file is not available on this system, please visit www.phpmyadmin.net "
"for more information."
#: db_create.php:58 #: db_create.php:58
#, php-format #, php-format
@@ -2108,17 +2110,16 @@ msgstr "There are no files to upload"
#: libraries/config.values.php:45 libraries/config.values.php:50 #: libraries/config.values.php:45 libraries/config.values.php:50
msgid "Both" msgid "Both"
msgstr "" msgstr "Both"
#: libraries/config.values.php:74 #: libraries/config.values.php:74
msgid "Open" msgid "Open"
msgstr "" msgstr "Open"
#: libraries/config.values.php:74 #: libraries/config.values.php:74
#, fuzzy
#| msgid "Close" #| msgid "Close"
msgid "Closed" msgid "Closed"
msgstr "Close" msgstr "Closed"
#: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/config.values.php:95 libraries/export/htmlword.php:24
#: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/latex.php:41 libraries/export/odt.php:33
@@ -4829,10 +4830,9 @@ msgid "Browser transformation"
msgstr "Browser transformation" msgstr "Browser transformation"
#: libraries/display_tbl.lib.php:1165 #: libraries/display_tbl.lib.php:1165
#, fuzzy
#| msgid "Copyright" #| msgid "Copyright"
msgid "Copy" msgid "Copy"
msgstr "Copyright" msgstr "Copy"
#: libraries/display_tbl.lib.php:1180 libraries/display_tbl.lib.php:1192 #: libraries/display_tbl.lib.php:1180 libraries/display_tbl.lib.php:1192
msgid "The row has been deleted" msgid "The row has been deleted"

View File

@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n" "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-02-08 17:09+0100\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" "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: french <fr@li.org>\n" "Language-Team: french <fr@li.org>\n"
"Language: fr\n" "Language: fr\n"
@@ -113,6 +113,8 @@ msgid ""
"The %s file is not available on this system, please visit www.phpmyadmin.net " "The %s file is not available on this system, please visit www.phpmyadmin.net "
"for more information." "for more information."
msgstr "" msgstr ""
"Le fichier %s n'est pas disponible sur ce serveur, veuillez visiter "
"www.phpmyadmin.net pour plus d'informations."
#: db_create.php:58 #: db_create.php:58
#, php-format #, php-format
@@ -1115,7 +1117,7 @@ msgstr "Montrer zone SQL"
#: js/messages.php:86 #: js/messages.php:86
msgid "Inline Edit" msgid "Inline Edit"
msgstr "Édition en place" msgstr "Éditer en place"
#: js/messages.php:89 #: js/messages.php:89
msgid "Hide search criteria" 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 #: libraries/config.values.php:45 libraries/config.values.php:50
msgid "Both" msgid "Both"
msgstr "" msgstr "Les deux"
#: libraries/config.values.php:74 #: libraries/config.values.php:74
msgid "Open" msgid "Open"
msgstr "" msgstr "Ouvert"
#: libraries/config.values.php:74 #: libraries/config.values.php:74
#, fuzzy
#| msgid "Close" #| msgid "Close"
msgid "Closed" msgid "Closed"
msgstr "Fermer" msgstr "Fermé"
#: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/config.values.php:95 libraries/export/htmlword.php:24
#: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/latex.php:41 libraries/export/odt.php:33
@@ -4887,10 +4888,9 @@ msgid "Browser transformation"
msgstr "Transformation" msgstr "Transformation"
#: libraries/display_tbl.lib.php:1165 #: libraries/display_tbl.lib.php:1165
#, fuzzy
#| msgid "Copyright" #| msgid "Copyright"
msgid "Copy" msgid "Copy"
msgstr "Copyright" msgstr "Copier"
#: libraries/display_tbl.lib.php:1180 libraries/display_tbl.lib.php:1192 #: libraries/display_tbl.lib.php:1180 libraries/display_tbl.lib.php:1192
msgid "The row has been deleted" msgid "The row has been deleted"

View File

@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n" "Project-Id-Version: phpMyAdmin 3.4.0-beta3-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-02-08 17:09+0100\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" "Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
"Language-Team: turkish <tr@li.org>\n" "Language-Team: turkish <tr@li.org>\n"
"Language: tr\n" "Language: tr\n"
@@ -112,6 +112,8 @@ msgid ""
"The %s file is not available on this system, please visit www.phpmyadmin.net " "The %s file is not available on this system, please visit www.phpmyadmin.net "
"for more information." "for more information."
msgstr "" 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 #: db_create.php:58
#, php-format #, php-format
@@ -2110,17 +2112,16 @@ msgstr "Göndermek için hiç dosya yok"
#: libraries/config.values.php:45 libraries/config.values.php:50 #: libraries/config.values.php:45 libraries/config.values.php:50
msgid "Both" msgid "Both"
msgstr "" msgstr "Her ikisi"
#: libraries/config.values.php:74 #: libraries/config.values.php:74
msgid "Open" msgid "Open"
msgstr "" msgstr "ık"
#: libraries/config.values.php:74 #: libraries/config.values.php:74
#, fuzzy
#| msgid "Close" #| msgid "Close"
msgid "Closed" msgid "Closed"
msgstr "Kapat" msgstr "Kapandı"
#: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/config.values.php:95 libraries/export/htmlword.php:24
#: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/latex.php:41 libraries/export/odt.php:33
@@ -4866,10 +4867,9 @@ msgid "Browser transformation"
msgstr "Tarayıcı dönüşümü" msgstr "Tarayıcı dönüşümü"
#: libraries/display_tbl.lib.php:1165 #: libraries/display_tbl.lib.php:1165
#, fuzzy
#| msgid "Copyright" #| msgid "Copyright"
msgid "Copy" msgid "Copy"
msgstr "Telif hakkı" msgstr "Kopyala"
#: libraries/display_tbl.lib.php:1180 libraries/display_tbl.lib.php:1192 #: libraries/display_tbl.lib.php:1180 libraries/display_tbl.lib.php:1192
msgid "The row has been deleted" msgid "The row has been deleted"