The branch, master has been updated via ae6ce429ee549961e9736fdec3c7427ee840956e (commit) via 8061e810584a3547a1b2525033d073f99881d6fb (commit) via 08a077f3d7cd724437e40ff52d76bc3e759f6977 (commit) via 602fee35ab74ed9cfcc66271745a4bf9f5742560 (commit) from 727d6e1325f71aacc22466625708052efe0f5f60 (commit)

- Log ----------------------------------------------------------------- commit ae6ce429ee549961e9736fdec3c7427ee840956e Merge: 727d6e1325f71aacc22466625708052efe0f5f60 8061e810584a3547a1b2525033d073f99881d6fb Author: Michal Čihař mcihar@novell.com Date: Tue Dec 7 11:21:51 2010 +0100

Merge remote branch 'pootle/master'

Conflicts: po/cs.po

commit 8061e810584a3547a1b2525033d073f99881d6fb Author: Michal Čihař michal@cihar.com Date: Tue Dec 7 12:14:53 2010 +0200

Translation update done using Pootle.

commit 08a077f3d7cd724437e40ff52d76bc3e759f6977 Author: Michal Čihař michal@cihar.com Date: Tue Dec 7 12:14:50 2010 +0200

Translation update done using Pootle.

commit 602fee35ab74ed9cfcc66271745a4bf9f5742560 Author: Michal Čihař michal@cihar.com Date: Tue Dec 7 12:14:47 2010 +0200

Translation update done using Pootle.

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

Summary of changes: po/cs.po | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/po/cs.po b/po/cs.po index cd72323..d0b5b56 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-alpha3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-07 11:19+0100\n" -"PO-Revision-Date: 2010-12-07 11:13+0100\n" +"PO-Revision-Date: 2010-12-07 11:21+0100\n" "Last-Translator: Michal Čihař michal@cihar.com\n" "Language-Team: czech cs@li.org\n" "Language: cs\n" @@ -1112,7 +1112,7 @@ msgstr "Zvolte která pole zobrazit"

#: js/messages.php:98 msgid "Add an option for column " -msgstr "Přidat paramer pro sloupec" +msgstr "Přidat paramer pro sloupec "

#: js/messages.php:101 msgid "Generate password" @@ -5574,7 +5574,7 @@ msgstr ""

#: libraries/import/csv.php:41 msgid "Column names: " -msgstr "Názvy polí:" +msgstr "Názvy polí: "

#: libraries/import/csv.php:60 libraries/import/csv.php:72 #: libraries/import/csv.php:76 libraries/import/csv.php:80 @@ -6092,7 +6092,7 @@ msgstr "Tato stránka neobsahuje žádné tabulky!"

#: libraries/schema/Export_Relation_Schema.class.php:207 msgid "SCHEMA ERROR: " -msgstr "Chyba při vytváření schéma:" +msgstr "Chyba při vytváření schéma: "

#: libraries/schema/Pdf_Relation_Schema.class.php:891 #: libraries/schema/Pdf_Relation_Schema.class.php:1119 @@ -7782,28 +7782,24 @@ msgid "Reset slave" msgstr "Resetovat podřízený server"

#: server_replication.php:326 -#, fuzzy #| msgid "SQL Thread %s only" msgid "Start SQL Thread only" -msgstr "%s jen SQL vlákno" +msgstr "Spustit jen SQL vlákno"

#: server_replication.php:328 -#, fuzzy #| msgid "SQL Thread %s only" msgid "Stop SQL Thread only" -msgstr "%s jen SQL vlákno" +msgstr "Zastavit jen SQL vlákno"

#: server_replication.php:331 -#, fuzzy #| msgid "IO Thread %s only" msgid "Start IO Thread only" -msgstr "%s jen IO vlákno" +msgstr "Spustit jen IO vlákno"

#: server_replication.php:333 -#, fuzzy #| msgid "IO Thread %s only" msgid "Stop IO Thread only" -msgstr "%s jen IO vlákno" +msgstr "Zastavit jen IO vlákno"

#: server_replication.php:338 msgid "Error management:"

hooks/post-receive