[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-4697-gbbafbd3 - Git

22 Jun 2011

The branch, master has been updated
       via  bbafbd302ef46b103a1fc0d422f8b798714997c0 (commit)
       via  4ffb148cae799c2585a9ac424a0e979fc8db5fdd (commit)
       via  e374ed692e994fe0691cb99aa89ca6bb90bb858d (commit)
       via  c5333b263aaa6d46bf96196913686ad9b1674c58 (commit)
       via  56442f4c5f3454b9f01a21e1e33f56afedecd109 (commit)
       via  efb3066544a834a1db4d2a27db7c64d33fd307c6 (commit)
       via  5d2380cc25faaf606ce0e36b5b8fe8457beda303 (commit)
       via  8ee402050105f50bf28515ed37fa9321da507de2 (commit)
       via  c04e1cbf6b6365545e627ee808cb3cdf33e55da8 (commit)
       via  629d33ffe1e1112b5f04f7d38a9b9328b0f2f13f (commit)
       via  7e8a74eb2303041528cd350b70e62d7d569f6b2a (commit)
       via  6f82931f61d77cc9b28b442e062c400548f05895 (commit)
       via  2870f11309a6c5ce5192571df86a6da019e11dfc (commit)
       via  d5a773f890462c1af088f9095b996cbce6264f45 (commit)
       via  a549767ebd039426525a8b8b0ac0bcf7de34f49e (commit)
       via  9bbd1669114b7ceb7ed9810e8320237658680354 (commit)
       via  e0a3ffddfd397c2835c5825a5a5d26d728e5f1c3 (commit)
       via  169a8fc1c74b3152037bcbd38b9e20953ef617f2 (commit)
       via  1c69c6b9541f1950ec863b91fc484b37659dc394 (commit)
       via  ef05d2275d59b9858298ec1dadaa6572095af00b (commit)
       via  3cd8d7344861c1bc02de80ae38cef7e2940e2282 (commit)
       via  6120ad3d374c6117683ea383619d549f8d842a50 (commit)
       via  afca639412b6d1be81696eac4885bf57414bafa0 (commit)
       via  a49a9d604c090c96e1a50a8ffcb7a162f8cd8bd3 (commit)
       via  1ce011677e8b584982e21ce3582c92e86d42ea6a (commit)
       via  4b9b121191b5f59e27174bda9b647f2c40d7088f (commit)
       via  29683df95bdbf25e9940fa03cfacd7b0fb1ebb0a (commit)
       via  6f08b16e3539eed5291e06b96cfca9bc6a73b449 (commit)
       via  a6bd0c31f9fe6e07c57d4cc61cb3d705f49839f3 (commit)
       via  3852f37d47149ff8fe4169fb422bf8e3a065634b (commit)
       via  3e86878d2cb7ce8a86f3bf11af2651e3d9f1cdf0 (commit)
      from  3d74915b4e9f6e9a57a0d6ee5d009b02a49f79b7 (commit)
- Log -----------------------------------------------------------------
commit bbafbd302ef46b103a1fc0d422f8b798714997c0
Merge: 3d74915b4e9f6e9a57a0d6ee5d009b02a49f79b7 4ffb148cae799c2585a9ac424a0e979fc8db5fdd
Author: Michal Čihař mcihar@suse.cz
Date:   Wed Jun 22 10:34:27 2011 +0200
Merge remote-tracking branch 'pootle/master'
Conflicts:
    	po/br.po
    	po/cs.po
commit 4ffb148cae799c2585a9ac424a0e979fc8db5fdd
Author: Michal Čihař michal@cihar.com
Date:   Wed Jun 22 10:13:41 2011 +0200
Translation update done using Pootle.
commit e374ed692e994fe0691cb99aa89ca6bb90bb858d
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:13:36 2011 +0200
Translation update done using Pootle.
commit c5333b263aaa6d46bf96196913686ad9b1674c58
Author: Michal Čihař michal@cihar.com
Date:   Wed Jun 22 10:13:28 2011 +0200
Translation update done using Pootle.
commit 56442f4c5f3454b9f01a21e1e33f56afedecd109
Author: Michal Čihař michal@cihar.com
Date:   Wed Jun 22 10:13:14 2011 +0200
Translation update done using Pootle.
commit efb3066544a834a1db4d2a27db7c64d33fd307c6
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:13:13 2011 +0200
Translation update done using Pootle.
commit 5d2380cc25faaf606ce0e36b5b8fe8457beda303
Author: Michal Čihař michal@cihar.com
Date:   Wed Jun 22 10:13:04 2011 +0200
Translation update done using Pootle.
commit 8ee402050105f50bf28515ed37fa9321da507de2
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:13:02 2011 +0200
Translation update done using Pootle.
commit c04e1cbf6b6365545e627ee808cb3cdf33e55da8
Author: Michal Čihař michal@cihar.com
Date:   Wed Jun 22 10:12:17 2011 +0200
Translation update done using Pootle.
commit 629d33ffe1e1112b5f04f7d38a9b9328b0f2f13f
Author: Michal Čihař michal@cihar.com
Date:   Wed Jun 22 10:11:47 2011 +0200
Translation update done using Pootle.
commit 7e8a74eb2303041528cd350b70e62d7d569f6b2a
Author: Michal Čihař michal@cihar.com
Date:   Wed Jun 22 10:11:09 2011 +0200
Translation update done using Pootle.
commit 6f82931f61d77cc9b28b442e062c400548f05895
Author: Michal Čihař michal@cihar.com
Date:   Wed Jun 22 10:10:58 2011 +0200
Translation update done using Pootle.
commit 2870f11309a6c5ce5192571df86a6da019e11dfc
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:10:47 2011 +0200
Translation update done using Pootle.
commit d5a773f890462c1af088f9095b996cbce6264f45
Author: Michal Čihař michal@cihar.com
Date:   Wed Jun 22 10:10:41 2011 +0200
Translation update done using Pootle.
commit a549767ebd039426525a8b8b0ac0bcf7de34f49e
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:10:35 2011 +0200
Translation update done using Pootle.
commit 9bbd1669114b7ceb7ed9810e8320237658680354
Author: Michal Čihař michal@cihar.com
Date:   Wed Jun 22 10:10:27 2011 +0200
Translation update done using Pootle.
commit e0a3ffddfd397c2835c5825a5a5d26d728e5f1c3
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:10:19 2011 +0200
Translation update done using Pootle.
commit 169a8fc1c74b3152037bcbd38b9e20953ef617f2
Author: Michal Čihař michal@cihar.com
Date:   Wed Jun 22 10:10:08 2011 +0200
Translation update done using Pootle.
commit 1c69c6b9541f1950ec863b91fc484b37659dc394
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:10:06 2011 +0200
Translation update done using Pootle.
commit ef05d2275d59b9858298ec1dadaa6572095af00b
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:09:40 2011 +0200
Translation update done using Pootle.
commit 3cd8d7344861c1bc02de80ae38cef7e2940e2282
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:09:30 2011 +0200
Translation update done using Pootle.
commit 6120ad3d374c6117683ea383619d549f8d842a50
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:09:26 2011 +0200
Translation update done using Pootle.
commit afca639412b6d1be81696eac4885bf57414bafa0
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:09:12 2011 +0200
Translation update done using Pootle.
commit a49a9d604c090c96e1a50a8ffcb7a162f8cd8bd3
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:09:04 2011 +0200
Translation update done using Pootle.
commit 1ce011677e8b584982e21ce3582c92e86d42ea6a
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:08:55 2011 +0200
Translation update done using Pootle.
commit 4b9b121191b5f59e27174bda9b647f2c40d7088f
Merge: 29683df95bdbf25e9940fa03cfacd7b0fb1ebb0a a6facee514dce369580cff6106cd80bf9858ab43
Author: Pootle server pootle@cihar.com
Date:   Wed Jun 22 10:08:51 2011 +0200
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit 29683df95bdbf25e9940fa03cfacd7b0fb1ebb0a
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:08:44 2011 +0200
Translation update done using Pootle.
commit 6f08b16e3539eed5291e06b96cfca9bc6a73b449
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:08:39 2011 +0200
Translation update done using Pootle.
commit a6bd0c31f9fe6e07c57d4cc61cb3d705f49839f3
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:08:35 2011 +0200
Translation update done using Pootle.
commit 3852f37d47149ff8fe4169fb422bf8e3a065634b
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:08:30 2011 +0200
Translation update done using Pootle.
commit 3e86878d2cb7ce8a86f3bf11af2651e3d9f1cdf0
Author: fulup.jakez fulup.jakez@ofis-bzh.org
Date:   Wed Jun 22 10:08:21 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
 po/br.po |   36 ++++++++++++++++++------------------
 po/cs.po |   24 +++++++++++++-----------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/po/br.po b/po/br.po
index 1f98b8e..54d47ac 100644
--- a/po/br.po
+++ b/po/br.po
@@ -8,7 +8,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-22 10:16+0200\n"
-"PO-Revision-Date: 2011-06-22 10:08+0200\n"
+"PO-Revision-Date: 2011-06-22 10:13+0200\n"
 "Last-Translator:  fulup.jakez@ofis-bzh.org\n"
 "Language-Team: LANGUAGE LL@li.org\n"
 "Language: br\n"
@@ -429,84 +429,84 @@ msgstr "mod gwelet"
 #: db_qbe.php:222 libraries/db_structure.lib.php:95
 #: libraries/display_tbl.lib.php:927
 msgid "Sort"
-msgstr ""
+msgstr "Urzhiañ"
#: db_qbe.php:231 db_qbe.php:265 libraries/db_structure.lib.php:102
 #: libraries/display_tbl.lib.php:549 libraries/display_tbl.lib.php:888
 #: server_databases.php:158 server_databases.php:175 tbl_operations.php:275
 #: tbl_select.php:278
 msgid "Ascending"
-msgstr ""
+msgstr "War gresk"
#: db_qbe.php:232 db_qbe.php:273 libraries/db_structure.lib.php:110
 #: libraries/display_tbl.lib.php:554 libraries/display_tbl.lib.php:885
 #: server_databases.php:158 server_databases.php:175 tbl_operations.php:276
 #: tbl_select.php:279
 msgid "Descending"
-msgstr ""
+msgstr "War zigresk"
#: db_qbe.php:286 db_tracking.php:91 libraries/display_tbl.lib.php:429
 #: tbl_change.php:279 tbl_tracking.php:648
 msgid "Show"
-msgstr ""
+msgstr "Diskouez"
#: db_qbe.php:322
 msgid "Criteria"
-msgstr ""
+msgstr "Dezverk"
#: db_qbe.php:375 db_qbe.php:457 db_qbe.php:549 db_qbe.php:580
 msgid "Ins"
-msgstr ""
+msgstr "Ensoc'hañ"
#: db_qbe.php:379 db_qbe.php:461 db_qbe.php:546 db_qbe.php:577
 msgid "And"
-msgstr ""
+msgstr "Ha"
#: db_qbe.php:388 db_qbe.php:469 db_qbe.php:551 db_qbe.php:582
 msgid "Del"
-msgstr ""
+msgstr "Diverk."
#: db_qbe.php:392 db_qbe.php:473 db_qbe.php:544 db_qbe.php:575
 #: server_privileges.php:307 tbl_change.php:887 tbl_indexes.php:256
 #: tbl_select.php:252
 msgid "Or"
-msgstr ""
+msgstr "Pe"
#: db_qbe.php:529
 msgid "Modify"
-msgstr ""
+msgstr "Kemmañ"
#: db_qbe.php:606
 msgid "Add/Delete criteria rows"
-msgstr ""
+msgstr "Ouzhpennañ/Diverkañ linennoù dezverkoù"
#: db_qbe.php:618
 msgid "Add/Delete columns"
-msgstr ""
+msgstr "Ouzhpennañ/Diverkañ bannoù"
#: db_qbe.php:631 db_qbe.php:656
 msgid "Update Query"
-msgstr ""
+msgstr "Hizivaat ar reked"
#: db_qbe.php:639
 msgid "Use Tables"
-msgstr ""
+msgstr "Implijout taolennoù"
#: db_qbe.php:662
 #, php-format
 msgid "SQL query on database <b>%s</b>:"
-msgstr ""
+msgstr "Reked SQL ouzh an diaz roadennoù <b>%s</b>:"
#: db_qbe.php:955 libraries/common.lib.php:1168
 msgid "Submit Query"
-msgstr ""
+msgstr "Kas ar reked"
#: db_routines.php:152 import.php:453 libraries/Message.class.php:185
 #: libraries/display_tbl.lib.php:2272 libraries/sql_query_form.lib.php:139
 #: tbl_operations.php:228 tbl_relation.php:289 tbl_row_action.php:126
 #: view_operations.php:60
 msgid "Your SQL query has been executed successfully"
-msgstr ""
+msgstr "Sevenet eo bet ho reked SQL ervat"
#: db_routines.php:155
 #, php-format
diff --git a/po/cs.po b/po/cs.po
index 06522bc..3399655 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-22 10:16+0200\n"
-"PO-Revision-Date: 2011-06-17 15:05+0200\n"
+"PO-Revision-Date: 2011-06-22 10:13+0200\n"
 "Last-Translator: Michal Čihař michal@cihar.com\n"
 "Language-Team: czech cs@li.org\n"
 "Language: cs\n"
@@ -511,9 +511,9 @@ msgstr "Váš SQL-dotaz byl úspěšně vykonán"
 #, php-format
 msgid "%d row affected by the last statement inside the procedure"
 msgid_plural "%d rows affected by the last statement inside the procedure"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Posledním příkazem v proceduře byla ovlivněna %d řádka"
+msgstr[1] "Posledním příkazem v proceduře byly ovlivněny %d řádky"
+msgstr[2] "Posledním příkazem v proceduře bylo ovlivněno %d řádek"
#: db_routines.php:165
 #, fuzzy, php-format
@@ -530,7 +530,7 @@ msgstr "MySQL vrátil prázdný výsledek (tj. nulový počet řádků)."
 #: db_routines.php:319
 #, php-format
 msgid "Query "%s" failed"
-msgstr ""
+msgstr "Dotaz "%s" selhal"
#: db_routines.php:191 db_routines.php:291 db_routines.php:296
 #: db_routines.php:306 db_routines.php:320 libraries/common.lib.php:609
@@ -551,7 +551,7 @@ msgstr "V databázi nebyly nalezeny žádné tabulky"
#: db_routines.php:230 db_routines.php:234
 msgid "Execute routine"
-msgstr ""
+msgstr "Spustit rutinu"
#: db_routines.php:254 db_routines.php:258
 #, fuzzy, php-format
@@ -567,11 +567,11 @@ msgstr "Chybný index serveru: „%s“"
#: db_routines.php:304
 msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
+msgstr "Bohužel se nepodařilo obnovit odstraněnou rutinu."
#: db_routines.php:305
 msgid "The backed up query was:"
-msgstr ""
+msgstr "Záložní dotaz byl:"
#: db_routines.php:309
 #, fuzzy, php-format
@@ -587,7 +587,7 @@ msgstr "Byla vytvořena tabulka %1$s."
#: db_routines.php:330
 msgid "<b>One or more errors have occured while processing your request:</b>"
-msgstr ""
+msgstr "<b>Při zpracování požadavku došlo k několika chybám:</b>"
#: db_routines.php:374
 #, fuzzy
@@ -1319,7 +1319,7 @@ msgstr "Odstraňuji"
#: js/messages.php:122
 msgid "The definition of a stored function must contain a RETURN statement!"
-msgstr ""
+msgstr "Definice uložené funkce musí obsahovat příkaz RETURN!"
#: js/messages.php:123
 #, fuzzy
@@ -2113,6 +2113,8 @@ msgid ""
 "This usually means there is a syntax error in it, please check any errors "
 "shown bellow."
 msgstr ""
+"Obvykle to je způsobenou chybou v tomto souboru, prosím opravte jakékoliv "
+"chyby vypsané níže."
#: libraries/common.inc.php:595
 #, php-format
@@ -2354,7 +2356,7 @@ msgstr "Nebyl zvolen žádný soubor pro nahrání"
#: libraries/common.lib.php:2964 libraries/common.lib.php:2965
 msgid "Execute"
-msgstr ""
+msgstr "Spustit"
#: libraries/config.values.php:45 libraries/config.values.php:47
 #: libraries/config.values.php:51
hooks/post-receive
-- 
phpMyAdmin


    