[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11258-g63c162d

Michal Čihař nijel at users.sourceforge.net
Thu Jul 21 15:19:23 CEST 2011


The branch, master has been updated
       via  63c162d615db9d4275b287aed7bd9471ab0e6b8e (commit)
       via  00c1d8881cf724f03827b5ca337a647d5fa41d13 (commit)
       via  29dbb1506f4f766b9469bca18663b6c85b055680 (commit)
       via  b25aff1d3519edf5f37b48e9b834190595bae01a (commit)
       via  519802fa3fdb46c87bb5e2eec5984ec83900b45d (commit)
       via  293c5c49aae0dc7ba47e08e93d457b3dbffa5540 (commit)
       via  347f490e96baf744aed4cbd549dd26689589aa14 (commit)
       via  146396adec0c49a3e5de5e35b62d0a0beaf7458f (commit)
       via  4b3d468a21cf2af01748089d1dee20f519eddfb1 (commit)
       via  667065e4233807046b17f5c4aacdf93393b34cce (commit)
       via  df6aba87f3afe616ca1439354c7efc1f473bf8d6 (commit)
       via  66fe0c9d7cf98839c8193d01e31f44cd1d9b8ca7 (commit)
       via  9c924d0a47ed14ee0c63ac41e7a293e97a01a39f (commit)
       via  4d102b2fe410bae9ce29b716b944098e5dbe7159 (commit)
       via  a256fe685512349232f1f8c615ed946d4e6d1863 (commit)
       via  df3aec325b77901644bbc6f0f07e6fd24cc120f6 (commit)
       via  8f56013823d692b7bcd8a9ec4b8d61518a6d9adc (commit)
       via  2b24140ffaafe1da82f4a985a3fcb554a9d51811 (commit)
       via  f160d2184814e17f768f20f86a8945c7d1168259 (commit)
       via  44c1af1494d56f3e9011a3f8e7e396858b1dca68 (commit)
       via  024bb4de1a4b08c27407054ce3313825c0a80a15 (commit)
       via  6fb8887fe29f0497a9bf16803f2a284079106701 (commit)
       via  c58e9fa849623a4a04d4e54e860f80e903aa82ff (commit)
       via  622ef2cb4f82fb078d866b1724b6e2a8aa99dcdf (commit)
       via  a961064bf1f891cce56589243f53bf321929dc68 (commit)
       via  e81e9a0aebe12f07456cf1add9f5384f2f5e76cc (commit)
       via  218c39a606bc4454053a26dd052e6ce0377f29e6 (commit)
       via  815dc39bcecabfd69819af4946ecd77a854b5690 (commit)
       via  153492869e25b342d2c78d10641c9d4638e57098 (commit)
       via  9aa37fa4d8cff3fae903afdf4b541362ce27242b (commit)
       via  2242f7243f62f81ad8caad756f769f1dea564fae (commit)
       via  ffdb23bdf12dc667f60acaa9c8fa0aea47f80538 (commit)
       via  d86c935f8e3d793df9c2120f3552130b03f7ff6e (commit)
       via  e750e9257b695b4989c7173196209e01dd887ea6 (commit)
      from  2ece3cda3dbc7b9e8c0fb4696cc2281997936b11 (commit)


- Log -----------------------------------------------------------------
commit 63c162d615db9d4275b287aed7bd9471ab0e6b8e
Merge: 2ece3cda3dbc7b9e8c0fb4696cc2281997936b11 00c1d8881cf724f03827b5ca337a647d5fa41d13
Author: Michal Čihař <mcihar at suse.cz>
Date:   Thu Jul 21 15:19:48 2011 +0200

    Merge remote-tracking branch 'pootle/master'

commit 00c1d8881cf724f03827b5ca337a647d5fa41d13
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:18:33 2011 +0200

    Translation update done using Pootle.

commit 29dbb1506f4f766b9469bca18663b6c85b055680
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:18:02 2011 +0200

    Translation update done using Pootle.

commit b25aff1d3519edf5f37b48e9b834190595bae01a
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:17:29 2011 +0200

    Translation update done using Pootle.

commit 519802fa3fdb46c87bb5e2eec5984ec83900b45d
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:16:50 2011 +0200

    Translation update done using Pootle.

commit 293c5c49aae0dc7ba47e08e93d457b3dbffa5540
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:16:39 2011 +0200

    Translation update done using Pootle.

commit 347f490e96baf744aed4cbd549dd26689589aa14
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:16:34 2011 +0200

    Translation update done using Pootle.

commit 146396adec0c49a3e5de5e35b62d0a0beaf7458f
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:16:22 2011 +0200

    Translation update done using Pootle.

commit 4b3d468a21cf2af01748089d1dee20f519eddfb1
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:15:59 2011 +0200

    Translation update done using Pootle.

commit 667065e4233807046b17f5c4aacdf93393b34cce
Author: mrbendig <mrbendig at mrbendig.com>
Date:   Thu Jul 21 15:15:39 2011 +0200

    Translation update done using Pootle.

commit df6aba87f3afe616ca1439354c7efc1f473bf8d6
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:15:22 2011 +0200

    Translation update done using Pootle.

commit 66fe0c9d7cf98839c8193d01e31f44cd1d9b8ca7
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:14:46 2011 +0200

    Translation update done using Pootle.

commit 9c924d0a47ed14ee0c63ac41e7a293e97a01a39f
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:14:19 2011 +0200

    Translation update done using Pootle.

commit 4d102b2fe410bae9ce29b716b944098e5dbe7159
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:14:09 2011 +0200

    Translation update done using Pootle.

commit a256fe685512349232f1f8c615ed946d4e6d1863
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:13:52 2011 +0200

    Translation update done using Pootle.

commit df3aec325b77901644bbc6f0f07e6fd24cc120f6
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:13:40 2011 +0200

    Translation update done using Pootle.

commit 8f56013823d692b7bcd8a9ec4b8d61518a6d9adc
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:13:16 2011 +0200

    Translation update done using Pootle.

commit 2b24140ffaafe1da82f4a985a3fcb554a9d51811
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:12:31 2011 +0200

    Translation update done using Pootle.

commit f160d2184814e17f768f20f86a8945c7d1168259
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:12:16 2011 +0200

    Translation update done using Pootle.

commit 44c1af1494d56f3e9011a3f8e7e396858b1dca68
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:12:05 2011 +0200

    Translation update done using Pootle.

commit 024bb4de1a4b08c27407054ce3313825c0a80a15
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:11:59 2011 +0200

    Translation update done using Pootle.

commit 6fb8887fe29f0497a9bf16803f2a284079106701
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:11:50 2011 +0200

    Translation update done using Pootle.

commit c58e9fa849623a4a04d4e54e860f80e903aa82ff
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:11:35 2011 +0200

    Translation update done using Pootle.

commit 622ef2cb4f82fb078d866b1724b6e2a8aa99dcdf
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:11:25 2011 +0200

    Translation update done using Pootle.

commit a961064bf1f891cce56589243f53bf321929dc68
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:11:18 2011 +0200

    Translation update done using Pootle.

commit e81e9a0aebe12f07456cf1add9f5384f2f5e76cc
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:11:00 2011 +0200

    Translation update done using Pootle.

commit 218c39a606bc4454053a26dd052e6ce0377f29e6
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:10:53 2011 +0200

    Translation update done using Pootle.

commit 815dc39bcecabfd69819af4946ecd77a854b5690
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:10:41 2011 +0200

    Translation update done using Pootle.

commit 153492869e25b342d2c78d10641c9d4638e57098
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:10:34 2011 +0200

    Translation update done using Pootle.

commit 9aa37fa4d8cff3fae903afdf4b541362ce27242b
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:10:16 2011 +0200

    Translation update done using Pootle.

commit 2242f7243f62f81ad8caad756f769f1dea564fae
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:10:06 2011 +0200

    Translation update done using Pootle.

commit ffdb23bdf12dc667f60acaa9c8fa0aea47f80538
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:09:49 2011 +0200

    Translation update done using Pootle.

commit d86c935f8e3d793df9c2120f3552130b03f7ff6e
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:09:35 2011 +0200

    Translation update done using Pootle.

commit e750e9257b695b4989c7173196209e01dd887ea6
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Jul 21 15:09:19 2011 +0200

    Translation update done using Pootle.

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

Summary of changes:
 po/cs.po |   79 ++++++++++++++++++++++++++++---------------------------------
 po/de.po |    8 ++----
 2 files changed, 39 insertions(+), 48 deletions(-)

diff --git a/po/cs.po b/po/cs.po
index 3973f51..589dcb0 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 at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-21 14:00+0200\n"
-"PO-Revision-Date: 2011-07-21 15:08+0200\n"
+"PO-Revision-Date: 2011-07-21 15:18+0200\n"
 "Last-Translator: Michal Čihař <michal at cihar.com>\n"
 "Language-Team: czech <cs at li.org>\n"
 "Language: cs\n"
@@ -1246,13 +1246,14 @@ msgstr ""
 #: js/messages.php:121
 #, php-format
 msgid "long_query_time is set to %d second(s)."
-msgstr ""
+msgstr "long_query_time je nastaven na %d sekund."
 
 #: js/messages.php:122
 msgid ""
 "Following settings will be applied globally and reset to default on server "
 "restart:"
 msgstr ""
+"Budou provedeny následující změny, které budou platné do restartu serveru:"
 
 #. l10n: %s is FILE or TABLE
 #: js/messages.php:124
@@ -1279,13 +1280,15 @@ msgstr "Vypnout %s"
 #: js/messages.php:130
 #, php-format
 msgid "Set long_query_time to %ds"
-msgstr ""
+msgstr "Nastavit long_query_time na %ds"
 
 #: js/messages.php:131
 msgid ""
 "You can't change these variables. Please log in as root or contact your "
 "database administrator."
 msgstr ""
+"Nemůžete změnit uvedené proměnné. Prosím přihlašte se jako root nebo "
+"kontaktujte vašeho správce databáze."
 
 #: js/messages.php:132
 #| msgid "Manage your settings"
@@ -1311,7 +1314,7 @@ msgstr "Rozdíly"
 #: js/messages.php:138
 #, php-format
 msgid "Divided by %s:"
-msgstr ""
+msgstr "Vyděleno %s:"
 
 #: js/messages.php:140
 #| msgid "Select page"
@@ -1320,7 +1323,7 @@ msgstr "Zvolený časový rozsah:"
 
 #: js/messages.php:141
 msgid "Group together INSERTs into same table"
-msgstr ""
+msgstr "Sloučit dotazy INSERT pro stejné tabulky"
 
 #: js/messages.php:142
 msgid ""
@@ -1330,15 +1333,15 @@ msgstr ""
 
 #: js/messages.php:143
 msgid "From slow log"
-msgstr ""
+msgstr "Ze zánamu pomalých dotazů"
 
 #: js/messages.php:144
 msgid "From general log"
-msgstr ""
+msgstr "Z obecného zánamu dotazů"
 
 #: js/messages.php:145
 msgid "Analysing & loading logs. This may take a while."
-msgstr ""
+msgstr "Načítám a analyzuji záznamy. To může chvíli trvat."
 
 #: js/messages.php:146
 msgid ""
@@ -1357,6 +1360,8 @@ msgstr ""
 #: js/messages.php:148
 msgid "Log data loaded. Queries executed in this time span:"
 msgstr ""
+"Záznamy byly načteny. V tomto časovém rozmezí byly spuštěny následující "
+"dotazy:"
 
 #: js/messages.php:150
 #| msgid "Jump to database"
@@ -1366,6 +1371,8 @@ msgstr "Přejít na tabulku se záznamem"
 #: js/messages.php:151
 msgid "Log analysed, but not data found in this time span."
 msgstr ""
+"Záznamy byly načteny, ale v tomto časovém rozmezí nebyly nalezeny žádné "
+"dotazy."
 
 #: js/messages.php:155 libraries/tbl_properties.inc.php:780
 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@@ -9799,39 +9806,35 @@ msgstr "Návod/Nastavení"
 
 #: server_status.php:1302
 msgid "Done rearranging/editing charts"
-msgstr ""
+msgstr "Ukončit upravování grafů"
 
 #: server_status.php:1309
-#, fuzzy
 #| msgid "Add parameter"
 msgid "Add chart"
-msgstr "Přidat parametr"
+msgstr "Přidat graf"
 
 #: server_status.php:1311
 msgid "Rearrange/edit charts"
-msgstr ""
+msgstr "Upravit/Uspořádat grafy"
 
 #: server_status.php:1313
 msgid "Refresh rate:"
 msgstr "Obnovovací frekvence:"
 
 #: server_status.php:1316
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "Chart columns:"
-msgstr "Sloupců v textové oblasti"
+msgstr "Sloupců grafů:"
 
 #: server_status.php:1330
-#, fuzzy
 #| msgid "User for config auth"
 msgid "Clear monitor config"
-msgstr "Uživatel pro přihlašování config"
+msgstr "Odstranit nastavení monitoru"
 
 #: server_status.php:1333
-#, fuzzy
 #| msgid "1. Introduction"
 msgid "Monitor Instructions"
-msgstr "1. Úvod"
+msgstr "Instrukce monitoru"
 
 #: server_status.php:1334
 msgid ""
@@ -9863,84 +9866,74 @@ msgid ""
 msgstr ""
 
 #: server_status.php:1361
-#, fuzzy
 #| msgid "Usage"
 msgid "CPU Usage"
-msgstr "Používá"
+msgstr "Využití procesoru"
 
 #: server_status.php:1364
-#, fuzzy
 #| msgid "2. Usage"
 msgid "Memory Usage"
-msgstr "2. Použití"
+msgstr "Využití paměti"
 
 #: server_status.php:1367
-#, fuzzy
 #| msgid "Usage"
 msgid "Swap Usage"
-msgstr "Používá"
+msgstr "Využití odkládacího prostoru"
 
 #: server_status.php:1370
-#, fuzzy
 #| msgid "All status variables"
 msgid "Status variable(s)"
-msgstr "Všechny stavové proměnné"
+msgstr "Stavové proměnné"
 
 #: server_status.php:1372
-#, fuzzy
 #| msgid "Select Tables"
 msgid "Select series:"
-msgstr "Vybrat tabulky"
+msgstr "Vyberte série:"
 
 #: server_status.php:1374
 msgid "Commonly monitored"
-msgstr ""
+msgstr "Obvykle monitorované"
 
 #: server_status.php:1389
-#, fuzzy
 #| msgid "You must provide a valid table name"
 msgid "or type variable name:"
-msgstr "Musíte zadat platné jméno tabulky"
+msgstr "nebo zadejte jméno proměnné:"
 
 #: server_status.php:1393
 msgid "Display as differential value"
-msgstr ""
+msgstr "Zobrazit jako rozdíl"
 
 #: server_status.php:1395
 msgid "Apply a divisor"
-msgstr ""
+msgstr "Vynásobit"
 
 #: server_status.php:1402
 msgid "Append unit to data values"
-msgstr ""
+msgstr "Přidat jednoty"
 
 #: server_status.php:1408
-#, fuzzy
 #| msgid "Add trigger"
 msgid "Add this series"
-msgstr "Přidat spoušť"
+msgstr "Přidat tuto sérii"
 
 #: server_status.php:1410
 msgid "Clear series"
-msgstr ""
+msgstr "Odstranit série"
 
 #: server_status.php:1413
-#, fuzzy
 #| msgid "Series:"
 msgid "Series in Chart:"
-msgstr "Série:"
+msgstr "Série v grafu::"
 
 #: server_status.php:1421
-#, fuzzy
 #| msgid "Loading"
 msgid "Loading logs"
-msgstr "Nahrávám"
+msgstr "Nahrávám záznamy"
 
 #: server_status.php:1424
-#, fuzzy
 #| msgid "Show statistics"
 msgid "Log statistics"
-msgstr "Zobrazit statistiky"
+msgstr "Statistiky záznamů"
 
 #: server_synchronize.php:92
 msgid "Could not connect to the source"
diff --git a/po/de.po b/po/de.po
index 60297d2..4f5c04e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-21 14:00+0200\n"
-"PO-Revision-Date: 2011-07-20 00:23+0200\n"
+"PO-Revision-Date: 2011-07-21 15:15+0200\n"
 "Last-Translator:  <mrbendig at mrbendig.com>\n"
 "Language-Team: german <de at li.org>\n"
 "Language: de\n"
@@ -1285,7 +1285,6 @@ msgid "Set long_query_time to %ds"
 msgstr "Setze long_query_time auf %ds"
 
 #: js/messages.php:131
-#, fuzzy
 #| msgid ""
 #| "You don't have super user rights to change this variables. Please log in "
 #| "as root account or contact your database administrator."
@@ -1293,9 +1292,8 @@ msgid ""
 "You can't change these variables. Please log in as root or contact your "
 "database administrator."
 msgstr ""
-"Sie haben keine super user Rechte um diese Variable zu ändern. Bitte melden "
-"Sie sich mit einem Root-Benutzer ein, oder kontaktieren Sie Ihren Datenbank-"
-"Administrator."
+"Sie können diese Variablen nicht ändern. Bitte melden Sie sich mit einem "
+"Root-Benutzer ein, oder kontaktieren Sie Ihren Datenbank-Administrator."
 
 #: js/messages.php:132
 msgid "Change settings"


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list