The branch, master has been updated via 8834ecdaa54e4783fe465a0bc48828a2dc69a030 (commit) via 137027138bc01e1eb91a82fb9e16edca57a5f81d (commit) via a77cf8ef1292d326b16c47ac3386130595d99aa3 (commit) via e6d72ffeb2905f20fdb7ec027e93e5092cb9aaee (commit) via 33d307dc666ee5bfe16b430e61cc1c3b5748cbce (commit) via e7b73ad8d28b51c2822829179c40e656aac7b97c (commit) via 0a9faeccbc2e2fe6c7f7e92ca141d9fd2e761ab9 (commit) via 92879394e7bebfbb94010c320605ef4aea91e31c (commit) via 98b08149ec3e9ec354acb32b7e75d826a27f3998 (commit) via f68838904789f030579aa91470fba2a4ae790bd9 (commit) via e7735febd692b5c34659e0e72db633ce4ca2fadb (commit) from f26a91317cb6cacf73093ab4082c9cd63917de2f (commit)
- Log ----------------------------------------------------------------- commit 8834ecdaa54e4783fe465a0bc48828a2dc69a030 Merge: f26a91317cb6cacf73093ab4082c9cd63917de2f 137027138bc01e1eb91a82fb9e16edca57a5f81d Author: Michal Čihař michal@cihar.com Date: Mon Nov 8 01:03:38 2010 +0100
Merge remote branch 'pootle/master'
Conflicts: po/fr.po po/tr.po
commit 137027138bc01e1eb91a82fb9e16edca57a5f81d Author: Marc Delisle marc@infomarc.info Date: Sun Nov 7 14:27:40 2010 +0200
Translation update done using Pootle.
commit a77cf8ef1292d326b16c47ac3386130595d99aa3 Author: Marc Delisle marc@infomarc.info Date: Sun Nov 7 14:26:17 2010 +0200
Translation update done using Pootle.
commit e6d72ffeb2905f20fdb7ec027e93e5092cb9aaee Author: Marc Delisle marc@infomarc.info Date: Sun Nov 7 14:23:34 2010 +0200
Translation update done using Pootle.
commit 33d307dc666ee5bfe16b430e61cc1c3b5748cbce Author: Marc Delisle marc@infomarc.info Date: Sun Nov 7 14:23:29 2010 +0200
Translation update done using Pootle.
commit e7b73ad8d28b51c2822829179c40e656aac7b97c Merge: 0a9faeccbc2e2fe6c7f7e92ca141d9fd2e761ab9 850556978b89629dde667a482937755dde21fc0c Author: Pootle server pootle@cihar.com Date: Sun Nov 7 00:40:11 2010 +0100
Merge remote branch 'origin/master'
commit 0a9faeccbc2e2fe6c7f7e92ca141d9fd2e761ab9 Author: Burak Yavuz hitowerdigit@hotmail.com Date: Fri Nov 5 17:48:46 2010 +0200
Translation update done using Pootle.
commit 92879394e7bebfbb94010c320605ef4aea91e31c Author: Burak Yavuz hitowerdigit@hotmail.com Date: Fri Nov 5 17:48:21 2010 +0200
Translation update done using Pootle.
commit 98b08149ec3e9ec354acb32b7e75d826a27f3998 Author: Burak Yavuz hitowerdigit@hotmail.com Date: Fri Nov 5 17:47:50 2010 +0200
Translation update done using Pootle.
commit f68838904789f030579aa91470fba2a4ae790bd9 Author: Burak Yavuz hitowerdigit@hotmail.com Date: Fri Nov 5 17:40:47 2010 +0200
Translation update done using Pootle.
commit e7735febd692b5c34659e0e72db633ce4ca2fadb Author: Burak Yavuz hitowerdigit@hotmail.com Date: Fri Nov 5 17:40:38 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/fr.po | 11 +++++------ po/tr.po | 14 +++++++------- 2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/po/fr.po b/po/fr.po index 2191e8a..6d29fcc 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@lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-07 07:20-0500\n" -"PO-Revision-Date: 2010-11-04 18:59+0200\n" +"PO-Revision-Date: 2010-11-07 14:27+0200\n" "Last-Translator: Marc Delisle marc@infomarc.info\n" "Language-Team: french fr@li.org\n" "MIME-Version: 1.0\n" @@ -34,9 +34,10 @@ msgid "" "parent window, or your browser's security settings are configured to block " "cross-window updates." msgstr "" -"La fenêtre principale n'a pu être mise à jour. Il est possible que vous " -"l'ayiez fermée, ou encore que votre navigateur bloque les mises à jour inter-" -"fenêtres pour des raisons de sécurité." +"La fenêtre demandée depuis votre navigateur ne peut être rafraîchie. Il est " +"possible que vous ayez fermé la fenêtre source , ou encore que votre " +"navigateur bloque les mises à jour inter-fenêtres pour des raisons de " +"sécurité."
#: browse_foreigners.php:148 libraries/common.lib.php:2823 #: libraries/common.lib.php:2830 libraries/common.lib.php:3005 @@ -4715,13 +4716,11 @@ msgid "Options" msgstr "Options"
#: libraries/display_tbl.lib.php:558 libraries/display_tbl.lib.php:568 -#, fuzzy #| msgid "Partial Texts" msgid "Partial texts" msgstr "Textes réduits"
#: libraries/display_tbl.lib.php:559 libraries/display_tbl.lib.php:572 -#, fuzzy #| msgid "Full Texts" msgid "Full texts" msgstr "Textes complets" diff --git a/po/tr.po b/po/tr.po index 3c17090..ec387ee 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-07 07:20-0500\n" -"PO-Revision-Date: 2010-11-03 00:21+0200\n" +"PO-Revision-Date: 2010-11-05 17:48+0200\n" "Last-Translator: Burak Yavuz hitowerdigit@hotmail.com\n" "Language-Team: turkish tr@li.org\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n"
@@ -4700,16 +4700,14 @@ msgid "Options" msgstr "Seçenekler"
#: libraries/display_tbl.lib.php:558 libraries/display_tbl.lib.php:568 -#, fuzzy #| msgid "Partial Texts" msgid "Partial texts" -msgstr "Kısmi Metinler" +msgstr "Kısmi metinler"
#: libraries/display_tbl.lib.php:559 libraries/display_tbl.lib.php:572 -#, fuzzy #| msgid "Full Texts" msgid "Full texts" -msgstr "Tam Metinler" +msgstr "Tam metinler"
#: libraries/display_tbl.lib.php:585 msgid "Relational key" @@ -5345,7 +5343,9 @@ msgstr ""
#: libraries/export/sql.php:35 msgid "Additional custom header comment (\n splits lines):" -msgstr "İlave özel başlık yorumu (\ n satırları böler):" +msgstr "" +"İlave özel başlık yorumu (\n" +" satırları böler):"
#: libraries/export/sql.php:37 msgid ""
hooks/post-receive
-
Michal Čihař