The branch, master has been updated via 90208fd34e3a4e459254b4491ade42db65b0e702 (commit) via a1674beea90b8a488c34844495182beb9378056c (commit) via a8cf64a6d4da319b900b9deacb183f89d44313d4 (commit) via 94918dd54ea81c44a85612ace543c3109e18d831 (commit) via 33318c086bff8fb2cfafb6bce58e0310383dbee1 (commit) from cc28728cc3e3d171d1fb0ff2c45df19def02b94e (commit)
- Log ----------------------------------------------------------------- commit 90208fd34e3a4e459254b4491ade42db65b0e702 Merge: cc28728cc3e3d171d1fb0ff2c45df19def02b94e a1674beea90b8a488c34844495182beb9378056c Author: Michal Čihař mcihar@suse.cz Date: Fri Jun 17 15:02:56 2011 +0200
Merge remote-tracking branch 'pootle/master'
Conflicts: po/cs.po
commit a1674beea90b8a488c34844495182beb9378056c Merge: a8cf64a6d4da319b900b9deacb183f89d44313d4 244427b9d24438e0c18259a5a0e7eea88f7ce1a6 Author: Pootle server pootle@cihar.com Date: Fri Jun 17 14:54:21 2011 +0200
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit a8cf64a6d4da319b900b9deacb183f89d44313d4 Author: Michal Čihař michal@cihar.com Date: Fri Jun 17 14:51:06 2011 +0200
Translation update done using Pootle.
commit 94918dd54ea81c44a85612ace543c3109e18d831 Author: Michal Čihař michal@cihar.com Date: Fri Jun 17 14:50:55 2011 +0200
Translation update done using Pootle.
commit 33318c086bff8fb2cfafb6bce58e0310383dbee1 Author: Michal Čihař michal@cihar.com Date: Fri Jun 17 14:50:13 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/cs.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/po/cs.po b/po/cs.po index 6445bf2..255e48c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-17 14:57+0200\n" -"PO-Revision-Date: 2011-06-17 10:49+0200\n" +"PO-Revision-Date: 2011-06-17 14:51+0200\n" "Last-Translator: Michal Čihař michal@cihar.com\n" "Language-Team: czech cs@li.org\n" "Language: cs\n" @@ -1216,7 +1216,7 @@ msgstr "Odstraňuji" #: js/messages.php:124 msgid "" "Note: If the file contains multiple tables, they will be combined into one" -msgstr "Poznámka: Pokud soubor obsahuje více tabulek, budou sloučeny do jedné." +msgstr "Poznámka: Pokud soubor obsahuje více tabulek, budou sloučeny do jedné"
#: js/messages.php:127 msgid "Hide query box" @@ -4464,8 +4464,8 @@ msgid "" "Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)%5DZIP%5B/a] compression " "for import and export operations" msgstr "" -"Povolí [a@http://cs.wikipedia.org/wiki/ZIP_%28souborov%C3%BD_form%C3%A1t%29]" -"ZIP[/a] kompresi pro import a export" +"Povolí [a@http://cs.wikipedia.org/wiki/ZIP_(souborov%C3%BD_form%C3%A1t)%5DZIP%5B/a] " +"kompresi pro import a export"
#: libraries/config/messages.inc.php:512 msgid "ZIP" @@ -7387,7 +7387,7 @@ msgstr "Vytvořit novou stránku a exportovat na ní"
#: pmd_pdf.php:111 msgid "New page name: " -msgstr "Název nové stránky:" +msgstr "Název nové stránky: "
#: pmd_pdf.php:114 msgid "Export/Import to scale"
hooks/post-receive