The branch, master has been updated via a4bf8a5263fc0f27acc482072fc37d73709256b1 (commit) via 14e9d5588b17d23cea79907612cf0b7b37483498 (commit) via ef366296b4b672d29eead6b19aa32ca6f7131d00 (commit) via 62050e0d0677b04e728c1516464ab7f982c24dac (commit) via b62f9caf291ef588825588d8ad1c8413c8a8bc2c (commit) via 9bba0931e6dcfacd2d12b2630765911ac5d2cb80 (commit) via a3406a25be29e1f89525603a1f84a87f7094856e (commit) from a035ded0500e1d24dde151ab12929575114ec3fd (commit)
- Log ----------------------------------------------------------------- commit a4bf8a5263fc0f27acc482072fc37d73709256b1 Merge: a035ded 14e9d55 Author: Michal Čihař mcihar@suse.cz Date: Mon Oct 24 17:12:12 2011 +0200
Merge remote-tracking branch 'pootle/master'
Conflicts: po/cs.po
commit 14e9d5588b17d23cea79907612cf0b7b37483498 Author: Michal Čihař michal@cihar.com Date: Mon Oct 24 17:11:50 2011 +0200
Translation update done using Pootle.
commit ef366296b4b672d29eead6b19aa32ca6f7131d00 Author: Michal Čihař michal@cihar.com Date: Mon Oct 24 17:11:21 2011 +0200
Translation update done using Pootle.
commit 62050e0d0677b04e728c1516464ab7f982c24dac Author: Michal Čihař michal@cihar.com Date: Mon Oct 24 17:11:02 2011 +0200
Translation update done using Pootle.
commit b62f9caf291ef588825588d8ad1c8413c8a8bc2c Author: Michal Čihař michal@cihar.com Date: Mon Oct 24 17:10:19 2011 +0200
Translation update done using Pootle.
commit 9bba0931e6dcfacd2d12b2630765911ac5d2cb80 Author: Michal Čihař michal@cihar.com Date: Mon Oct 24 17:10:14 2011 +0200
Translation update done using Pootle.
commit a3406a25be29e1f89525603a1f84a87f7094856e Author: Michal Čihař michal@cihar.com Date: Mon Oct 24 17:09:10 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/cs.po | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/po/cs.po b/po/cs.po index 0e44236..3d24a73 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-10-24 09:52-0400\n" -"PO-Revision-Date: 2011-09-19 13:15+0200\n" +"PO-Revision-Date: 2011-10-24 17:11+0200\n" "Last-Translator: Michal Čihař michal@cihar.com\n" "Language-Team: czech cs@li.org\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.0.5\n"
@@ -1792,7 +1792,7 @@ msgstr ""
#: js/messages.php:277 msgid "The plot can be resized by dragging it along the bottom right corner." -msgstr "" +msgstr "Graf můžete zvětšit táhnutím za pravý dolní roh."
#: js/messages.php:279 msgid "Strings are converted into integer for plotting" @@ -6739,7 +6739,7 @@ msgstr "Soubor ESRI" #: libraries/import/shp.php:280 #, php-format msgid "There was an error importing the ESRI shape file: "%s"." -msgstr "Při nahrávání souboru ESRI došlo k chybě: "%s"." +msgstr "Při nahrávání souboru ESRI došlo k chybě: „%s“."
#: libraries/import/shp.php:336 msgid "" @@ -6750,7 +6750,7 @@ msgstr "Nahraný soubor je chybný nebo obsahuje chybná data." #: libraries/import/shp.php:338 #, php-format msgid "MySQL Spatial Extension does not support ESRI type "%s"." -msgstr "" +msgstr "Prostorové rozšíření MySQL nepodporuje ESRI typ „%s“."
#: libraries/import/shp.php:376 msgid "The imported file does not contain any data" @@ -10621,6 +10621,8 @@ msgstr "Stáhnout" #: setup/frames/form.inc.php:25 msgid "Incorrect formset, check $formsets array in setup/frames/form.inc.php" msgstr "" +"Chybný formset, zkontrolujte pole $formsets v souboru " +"setup/frames/form.inc.php"
#: setup/frames/index.inc.php:49 msgid "Cannot load or save configuration" @@ -11640,7 +11642,7 @@ msgstr "Další parametr vyhledávání"
#: tbl_zoom_select.php:276 msgid "Use this column to label each point" -msgstr "" +msgstr "Použít tento sloupec pro přiřazení názvu každému bodu"
#: tbl_zoom_select.php:296 msgid "Maximum rows to plot" @@ -11727,7 +11729,7 @@ msgstr "" msgid "" "Let the server run for a longer time until it has executed a greater amount " "of queries." -msgstr "" +msgstr "Nechte server běžet delší dobu dokud nespustí větší množství dotazů."
#: po/advisory_rules.php:13 #, php-format
hooks/post-receive
-
Michal Čihař