June 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-4083-gbefcbbb
by Michal Čihař 17 Jun '11

17 Jun '11

The branch, master has been updated via befcbbb8111ed4b67bb891ab31087c972942cf37 (commit) via 03a20fabfc91da84f26539aea7861ee8cf0695c5 (commit) via aeadb04420f1427f0d098b7e402aeea5b67b915d (commit) via d41dbffa3da43c25a18a6e9ec5e2640fc2b7e867 (commit) via b8709dbde1b126e323a3379cb8b62d04b1d039cd (commit) via 9d40ae7f7ab20e593bf8314be91adde01253efec (commit) via 24e2b43d30fce5191ed25f262e6819057ff40707 (commit) via 520eebf74783224a56e64292b5e0e043ef9be011 (commit) via f37cd3283f18c901855df5dabafd1fb68f413aad (commit) via bf39b65dc3daa787b04402a4eceb2f35760179a4 (commit) via 746dd701927c8f33d4b355d8df34d91c7466ca7c (commit) via 940360875b5df91bdaf649887affdad043ce773f (commit) via 617002b0208fc1014d8ff6473520486687bf8271 (commit) via 3ae79096249cfb8d9d921ef206f0ae879da61c47 (commit) via f78d1d57c775e48f4dcfc93da19d42328de555a3 (commit) via ffe9aaee38e498cf5bcea7d1cb4caa625fb357ae (commit) via 8ad5bb31b2c7c0aef3fa3fd5ee8b8ee934468df6 (commit) via de1c8ef230519e011253fd5520ec832025020ec7 (commit) via 0b5c63f7b79bebdbdb7f3b82c934f97a7a52c76f (commit) via d3ed3ccbf4cf8562dc596750f7c6650151dc66a1 (commit) via 364562529992f738388cfa0f50edb3227e7b27cc (commit) via 3cc00267971067bdeae5d1a191eab7f6053fa2e3 (commit) via 4bf98275522a64ba522eba1df38352289853c6fa (commit) via 2e4c93f8461cd904c84e6ecdbdea682ab99a4148 (commit) via 827bd8c050894505f1f7c9fb82b284980c7580f6 (commit) via 39c23548a6371020917e9685f50d3927124cd42b (commit) via 40c7f24cdeef1f5d4ca67ef621e07d913aa2c04d (commit) via 888bb7227c384e921e0acceb355bd40b6fdfdad5 (commit) via 201c6ef257e5ef611883186cded478edabea221f (commit) via 7fa89b740c6f795ae0b6eacaf0c9212c268a0214 (commit) via 1f9593ba4ce167a3fe875a0eb1fdc5a18deba172 (commit) via cb3bdd02508dd9a7aa516029e91c22d637dbab44 (commit) via 191563c5a5191270255894a66d41a3130df82adb (commit) via 84832f2e879911996558deb36f09f9308e6b6c0a (commit) from 31309248b132e93e08bf15ceb3c36aa75c298640 (commit) - Log ----------------------------------------------------------------- commit befcbbb8111ed4b67bb891ab31087c972942cf37 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:49:20 2011 +0200 Translation update done using Pootle. commit 03a20fabfc91da84f26539aea7861ee8cf0695c5 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:49:16 2011 +0200 Translation update done using Pootle. commit aeadb04420f1427f0d098b7e402aeea5b67b915d Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:49:12 2011 +0200 Translation update done using Pootle. commit d41dbffa3da43c25a18a6e9ec5e2640fc2b7e867 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:49:05 2011 +0200 Translation update done using Pootle. commit b8709dbde1b126e323a3379cb8b62d04b1d039cd Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:49:00 2011 +0200 Translation update done using Pootle. commit 9d40ae7f7ab20e593bf8314be91adde01253efec Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:48:42 2011 +0200 Translation update done using Pootle. commit 24e2b43d30fce5191ed25f262e6819057ff40707 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:48:38 2011 +0200 Translation update done using Pootle. commit 520eebf74783224a56e64292b5e0e043ef9be011 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:48:30 2011 +0200 Translation update done using Pootle. commit f37cd3283f18c901855df5dabafd1fb68f413aad Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:48:21 2011 +0200 Translation update done using Pootle. commit bf39b65dc3daa787b04402a4eceb2f35760179a4 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:48:14 2011 +0200 Translation update done using Pootle. commit 746dd701927c8f33d4b355d8df34d91c7466ca7c Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:48:01 2011 +0200 Translation update done using Pootle. commit 940360875b5df91bdaf649887affdad043ce773f Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:46:39 2011 +0200 Translation update done using Pootle. commit 617002b0208fc1014d8ff6473520486687bf8271 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:46:12 2011 +0200 Translation update done using Pootle. commit 3ae79096249cfb8d9d921ef206f0ae879da61c47 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:45:35 2011 +0200 Translation update done using Pootle. commit f78d1d57c775e48f4dcfc93da19d42328de555a3 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:45:07 2011 +0200 Translation update done using Pootle. commit ffe9aaee38e498cf5bcea7d1cb4caa625fb357ae Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:44:56 2011 +0200 Translation update done using Pootle. commit 8ad5bb31b2c7c0aef3fa3fd5ee8b8ee934468df6 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:44:45 2011 +0200 Translation update done using Pootle. commit de1c8ef230519e011253fd5520ec832025020ec7 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:44:20 2011 +0200 Translation update done using Pootle. commit 0b5c63f7b79bebdbdb7f3b82c934f97a7a52c76f Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:44:12 2011 +0200 Translation update done using Pootle. commit d3ed3ccbf4cf8562dc596750f7c6650151dc66a1 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:43:52 2011 +0200 Translation update done using Pootle. commit 364562529992f738388cfa0f50edb3227e7b27cc Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:43:43 2011 +0200 Translation update done using Pootle. commit 3cc00267971067bdeae5d1a191eab7f6053fa2e3 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:43:16 2011 +0200 Translation update done using Pootle. commit 4bf98275522a64ba522eba1df38352289853c6fa Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:42:32 2011 +0200 Translation update done using Pootle. commit 2e4c93f8461cd904c84e6ecdbdea682ab99a4148 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:41:54 2011 +0200 Translation update done using Pootle. commit 827bd8c050894505f1f7c9fb82b284980c7580f6 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:41:23 2011 +0200 Translation update done using Pootle. commit 39c23548a6371020917e9685f50d3927124cd42b Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:41:03 2011 +0200 Translation update done using Pootle. commit 40c7f24cdeef1f5d4ca67ef621e07d913aa2c04d Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:40:42 2011 +0200 Translation update done using Pootle. commit 888bb7227c384e921e0acceb355bd40b6fdfdad5 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:40:26 2011 +0200 Translation update done using Pootle. commit 201c6ef257e5ef611883186cded478edabea221f Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:40:01 2011 +0200 Translation update done using Pootle. commit 7fa89b740c6f795ae0b6eacaf0c9212c268a0214 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:39:54 2011 +0200 Translation update done using Pootle. commit 1f9593ba4ce167a3fe875a0eb1fdc5a18deba172 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:39:40 2011 +0200 Translation update done using Pootle. commit cb3bdd02508dd9a7aa516029e91c22d637dbab44 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:39:09 2011 +0200 Translation update done using Pootle. commit 191563c5a5191270255894a66d41a3130df82adb Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:38:59 2011 +0200 Translation update done using Pootle. commit 84832f2e879911996558deb36f09f9308e6b6c0a Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:38:42 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 102 ++++++++++++++++++++++++++++--------------------------------- 1 files changed, 47 insertions(+), 55 deletions(-) diff --git a/po/cs.po b/po/cs.po index 28ed5ce..44b43ba 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(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-17 10:36+0200\n" -"PO-Revision-Date: 2011-06-17 10:28+0200\n" +"PO-Revision-Date: 2011-06-17 10:49+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -240,7 +240,7 @@ msgstr "Vytisknout" #: db_export.php:30 msgid "View dump (schema) of database" -msgstr "Export databáze" +msgstr "Zobrazit výpis (schéma) databáze" #: db_export.php:34 db_printview.php:94 db_qbe.php:101 db_tracking.php:48 #: export.php:371 navigation.php:323 @@ -1825,7 +1825,7 @@ msgstr "Dokumentace phpMyAdmina" #: libraries/auth/cookie.auth.lib.php:243 #: libraries/auth/cookie.auth.lib.php:244 msgid "You can enter hostname/IP address and port separated by space." -msgstr "Můžete zadat jméno počítače (nebo IP adresu) a port oddělené mezerou." +msgstr "Můžete zadat jméno počítače nebo IP adresu a port oddělené mezerou." #: libraries/auth/cookie.auth.lib.php:243 msgid "Server:" @@ -1858,7 +1858,7 @@ msgstr "Přihlášení bez hesla je zakázáno v konfiguraci (viz AllowNoPasswor #, php-format msgid "No activity within %s seconds; please log in again" msgstr "" -"Byli jste příliš dlouho neaktivní (déle než %s sekund), prosím přihlaste se " +"Nebyla zaznamenána žádná aktivita po dobu %s sekund, prosím přihlaste se " "znovu" #: libraries/auth/cookie.auth.lib.php:657 @@ -2086,7 +2086,7 @@ msgstr "Vysvětlit SQL" #: libraries/common.lib.php:1124 msgid "Skip Explain SQL" -msgstr "Bez vysvětlení (EXPLAIN) SQL" +msgstr "Bez vysvětlení SQL" #: libraries/common.lib.php:1158 msgid "Without PHP Code" @@ -2447,12 +2447,12 @@ msgid "" "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] " "authentication" msgstr "" -"Tajné heslo (fráze) používané pro šifrování cookies při přihlašování pomocí " +"Tajné heslo používané pro šifrování cookies při přihlašování pomocí " "[kbd]cookie[/kbd]" #: libraries/config/messages.inc.php:25 msgid "Blowfish secret" -msgstr "Klíč pro šifrování cookies (blowfish_secret)" +msgstr "Klíč pro šifrování cookies" #: libraries/config/messages.inc.php:26 msgid "Highlight selected rows" @@ -2655,8 +2655,8 @@ msgid "" "Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no " "limit)" msgstr "" -"Zadejte počet sekund, po které může skript běžet, nebo ([kbd]0[/kbd] pro " -"žádná omezení" +"Zadejte počet sekund, po které může skript běžet ([kbd]0[/kbd] pro žádná " +"omezení)" #: libraries/config/messages.inc.php:69 msgid "Maximum execution time" @@ -3587,7 +3587,7 @@ msgstr "Výchozí pořadí řazení" #: libraries/config/messages.inc.php:329 msgid "Use persistent connections to MySQL databases" -msgstr "Použije trvalé (persistentní) připojení k MySQL databázi" +msgstr "Použije trvalé připojení k MySQL databázi" #: libraries/config/messages.inc.php:330 msgid "Persistent connections" @@ -3793,7 +3793,8 @@ msgstr "Komprimovat připojení" #: libraries/config/messages.inc.php:377 msgid "How to connect to server, keep [kbd]tcp[/kbd] if unsure" -msgstr "Jak se připojit k serveru, ponechte tcp pokud si nejste jistí" +msgstr "" +"Jak se připojit k serveru, ponechte [kbd]tcp[/kbd] pokud si nejste jistí" #: libraries/config/messages.inc.php:378 msgid "Connection type" @@ -3904,9 +3905,9 @@ msgid "" "alphabetical order." msgstr "" "Můžete použít žolíky MySQL (% a _), escapujte je, pokud je chcete použít " -"jako znaky, např. použijte 'moje\\_db' a ne 'moje_db'. Použitím této volby " -"můžete také změnit pořadí databází, stačí na konci seznamu uvést [kbd]*[/" -"kbd] pro zobrazní ostatních v abecedním pořadí." +"jako znaky, např. použijte [kbd]moje\\_db[/kbd] a ne [kbd]moje_db[/kbd]. " +"Použitím této volby můžete také změnit pořadí databází, stačí na konci " +"seznamu uvést [kbd]*[/kbd] pro zobrazní ostatních v abecedním pořadí." #: libraries/config/messages.inc.php:400 msgid "Show only listed databases" @@ -4163,7 +4164,7 @@ msgstr "Dlouhé jméno tohoto serveru" #: libraries/config/messages.inc.php:448 msgid "Whether a user should be displayed a "show all (rows)" button" -msgstr "Jestli uživateli bude zobrazeno tlačítko "zobrazit vše"" +msgstr "Jestli uživateli bude zobrazeno tlačítko "Zobrazit vše"" #: libraries/config/messages.inc.php:449 msgid "Allow to display all the rows" @@ -4463,8 +4464,8 @@ msgid "" "Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/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 importování a exportování" +"Povolí [a@http://cs.wikipedia.org/wiki/ZIP_%28souborov%C3%BD_form%C3%A1t%" +"29]ZIP[/a] kompresi pro import a export" #: libraries/config/messages.inc.php:512 msgid "ZIP" @@ -8199,22 +8200,22 @@ msgid "Refresh rate" msgstr "Obnovovací frekvence" #: server_status.php:31 -#, fuzzy, php-format +#, php-format #| msgid "Minute" msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "Minuty" -msgstr[1] "Minuty" -msgstr[2] "Minuty" +msgstr[0] "%d minuta" +msgstr[1] "%d minuty" +msgstr[2] "%d minut" #: server_status.php:33 -#, fuzzy, php-format +#, php-format #| msgid "Second" msgid "%d second" msgid_plural "%d seconds" -msgstr[0] "Sekundy" -msgstr[1] "Sekundy" -msgstr[2] "Sekundy" +msgstr[0] "%d sekunda" +msgstr[1] "%d sekundy" +msgstr[2] "%d sekund" #: server_status.php:134 #, php-format @@ -8298,26 +8299,23 @@ msgid "All status variables" msgstr "Všechny stavové proměnné" #: server_status.php:455 -#, fuzzy #| msgid "Do not change the password" msgid "Containing the word:" -msgstr "Neměnit heslo" +msgstr "Obsahující slovo:" #: server_status.php:460 -#, fuzzy #| msgid "Show open tables" msgid "Show only alert values" -msgstr "Zobrazit otevřené tabulky" +msgstr "Zobrazit jen hodnoty s upozorněním" #: server_status.php:464 msgid "Filter by category..." -msgstr "" +msgstr "Filtrovat podle kategorie..." #: server_status.php:477 -#, fuzzy #| msgid "Related Links" msgid "Related links:" -msgstr "Související odkazy" +msgstr "Související odkazy:" #: server_status.php:521 server_status.php:556 server_status.php:669 #: server_status.php:714 @@ -8339,12 +8337,12 @@ msgstr "Typ dotazu" #. l10n: # = Amount of queries #: server_status.php:554 msgid "#" -msgstr "" +msgstr "#" #: server_status.php:618 #, php-format msgid "Network traffic since startup: %s" -msgstr "" +msgstr "Síťový provoz od spuštění: %s" #: server_status.php:626 #, php-format @@ -8422,10 +8420,9 @@ msgid "ID" msgstr "ID" #: server_status.php:849 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "The number of failed attempts to connect to the MySQL server." -msgstr "Nepodařilo se připojit k MySQL serveru" +msgstr "Počet chybných připojení k MySQL serveru." #: server_status.php:850 msgid "" @@ -8444,7 +8441,7 @@ msgstr "Počet transakcí, které využily dočasný binární log." #: server_status.php:852 msgid "" "The number of connection attempts (successful or not) to the MySQL server." -msgstr "" +msgstr "Celkový počet připojení (i chybných) k MySQL serveru." #: server_status.php:853 msgid "" @@ -8859,7 +8856,7 @@ msgstr "" msgid "" "The maximum number of connections that have been in use simultaneously since " "the server started." -msgstr "" +msgstr "Maximální počet současně používaných připojení od spuštění serveru." #: server_status.php:924 msgid "The number of rows waiting to be written in INSERT DELAYED queues." @@ -8891,6 +8888,9 @@ msgid "" "fragmentation issues, which may be solved by issuing a FLUSH QUERY CACHE " "statement." msgstr "" +"Počet volných bloků paměti ve vyrovnávací paměti dotazů. Velké číslo ukazuje " +"na problému s fragmentací, která může být vyřešena spuštěním příkazu FLUSH " +"QUERY CACHE." #: server_status.php:930 msgid "The amount of free memory for query cache." @@ -9620,10 +9620,9 @@ msgid "Line" msgstr "Čára" #: tbl_chart.php:88 -#, fuzzy #| msgid "Inline" msgid "Spline" -msgstr "Upravit zde" +msgstr "Křivka" #: tbl_chart.php:89 msgid "Pie" @@ -9634,50 +9633,43 @@ msgid "Stacked" msgstr "Skládané" #: tbl_chart.php:94 -#, fuzzy #| msgid "Report title:" msgid "Chart title" -msgstr "Název výpisu:" +msgstr "Název grafu" #: tbl_chart.php:99 msgid "X-Axis:" -msgstr "" +msgstr "Osa X:" #: tbl_chart.php:113 -#, fuzzy #| msgid "SQL queries" msgid "Series:" -msgstr "SQL dotazy" +msgstr "Série:" #: tbl_chart.php:115 -#, fuzzy #| msgid "Textarea columns" msgid "The remaining columns" -msgstr "Sloupců v textové oblasti" +msgstr "Zbývající sloupce" #: tbl_chart.php:128 -#, fuzzy #| msgid "X Axis label" msgid "X-Axis label:" -msgstr "Popis osy X" +msgstr "Popis osy X:" #: tbl_chart.php:128 -#, fuzzy #| msgid "Value" msgid "X Values" -msgstr "Hodnota" +msgstr "Hodnoty X" #: tbl_chart.php:129 -#, fuzzy #| msgid "Y Axis label" msgid "Y-Axis label:" -msgstr "Popis osy Y" +msgstr "Popis osy Y:" #: tbl_chart.php:129 -#, fuzzy #| msgid "Value" msgid "Y Values" -msgstr "Hodnota" +msgstr "Hodnoty Y" #: tbl_create.php:56 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-4048-g5423626
by Michal Čihař 17 Jun '11

17 Jun '11

The branch, master has been updated via 54236268e03b1562e6de3ba80a393eb0a99cba39 (commit) via 6e73650cfc0fc954873a2b89ae6d212429567b96 (commit) via 364de739228455ed8ee47aefd9e326282b834663 (commit) via 6eae4435a649d16b815729d8a86f523e109bd8ce (commit) via 070bb043204135f8b986e25cafe9df2eb6757cb1 (commit) via ac9e03b502a07f36b3ab1e812bf1be9d993254bc (commit) via 126a69565adafdc6c045559e080d0b336e73c657 (commit) via 6c8e4c58c5c551746fa196f1daebf4d45d1d9b01 (commit) via 16c8f2990265dee3f65d5059c0572630d7ec828c (commit) via c83fbfe0c1b248ccd8682d0f2bfe9f1462a3d4e0 (commit) via ca6f9c4dcf9808f41f8d94a7c77baff5e5c8089c (commit) via 345c0ed9028cceb8fa5aec7651c140a6d6b2f01e (commit) via 6c4ed0b60c495f78576a02e2accb4dca0486f61e (commit) via 9552c0381ed57708df47454c60cf91a7b7076e1e (commit) via f2bfb2aa3aec3664724dea606621634a030f03ce (commit) via ef334edaad6821fac84bd6de70b1b3289fb1cbb5 (commit) via 73f8ab0695adbfa91169bb2b7791959b7e30a27e (commit) via f9bdd4163156d127c3f738ab50ebb0ebb8ca6161 (commit) via ea0161e0b55ef275ed613280c2c83ed3705f9a80 (commit) via 64710e3fd3e47aaff8f5a41519fcee54b46dd5b5 (commit) via c6388fec60a376699a70c981432035804fe467c0 (commit) via f69ced64462ac15db958c560b5fd6acc7329bd8c (commit) via e19aae70ee054207329b19e998c7ef138b13d0d0 (commit) from bb5fe3f2d63cdf0b8281b25cd060ffbf39856ab5 (commit) - Log ----------------------------------------------------------------- commit 54236268e03b1562e6de3ba80a393eb0a99cba39 Merge: bb5fe3f2d63cdf0b8281b25cd060ffbf39856ab5 6e73650cfc0fc954873a2b89ae6d212429567b96 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jun 17 10:36:00 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 6e73650cfc0fc954873a2b89ae6d212429567b96 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:28:26 2011 +0200 Translation update done using Pootle. commit 364de739228455ed8ee47aefd9e326282b834663 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:28:20 2011 +0200 Translation update done using Pootle. commit 6eae4435a649d16b815729d8a86f523e109bd8ce Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:28:10 2011 +0200 Translation update done using Pootle. commit 070bb043204135f8b986e25cafe9df2eb6757cb1 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:27:54 2011 +0200 Translation update done using Pootle. commit ac9e03b502a07f36b3ab1e812bf1be9d993254bc Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:27:42 2011 +0200 Translation update done using Pootle. commit 126a69565adafdc6c045559e080d0b336e73c657 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:27:33 2011 +0200 Translation update done using Pootle. commit 6c8e4c58c5c551746fa196f1daebf4d45d1d9b01 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:26:49 2011 +0200 Translation update done using Pootle. commit 16c8f2990265dee3f65d5059c0572630d7ec828c Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:26:46 2011 +0200 Translation update done using Pootle. commit c83fbfe0c1b248ccd8682d0f2bfe9f1462a3d4e0 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:26:39 2011 +0200 Translation update done using Pootle. commit ca6f9c4dcf9808f41f8d94a7c77baff5e5c8089c Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:26:26 2011 +0200 Translation update done using Pootle. commit 345c0ed9028cceb8fa5aec7651c140a6d6b2f01e Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:26:18 2011 +0200 Translation update done using Pootle. commit 6c4ed0b60c495f78576a02e2accb4dca0486f61e Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:26:07 2011 +0200 Translation update done using Pootle. commit 9552c0381ed57708df47454c60cf91a7b7076e1e Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:25:58 2011 +0200 Translation update done using Pootle. commit f2bfb2aa3aec3664724dea606621634a030f03ce Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:25:41 2011 +0200 Translation update done using Pootle. commit ef334edaad6821fac84bd6de70b1b3289fb1cbb5 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:25:25 2011 +0200 Translation update done using Pootle. commit 73f8ab0695adbfa91169bb2b7791959b7e30a27e Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:25:11 2011 +0200 Translation update done using Pootle. commit f9bdd4163156d127c3f738ab50ebb0ebb8ca6161 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:24:48 2011 +0200 Translation update done using Pootle. commit ea0161e0b55ef275ed613280c2c83ed3705f9a80 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:24:38 2011 +0200 Translation update done using Pootle. commit 64710e3fd3e47aaff8f5a41519fcee54b46dd5b5 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:24:32 2011 +0200 Translation update done using Pootle. commit c6388fec60a376699a70c981432035804fe467c0 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:24:24 2011 +0200 Translation update done using Pootle. commit f69ced64462ac15db958c560b5fd6acc7329bd8c Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:24:12 2011 +0200 Translation update done using Pootle. commit e19aae70ee054207329b19e998c7ef138b13d0d0 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jun 17 10:23:57 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 53 +++++++++++++++++++++-------------------------------- 1 files changed, 21 insertions(+), 32 deletions(-) diff --git a/po/cs.po b/po/cs.po index 6b252ec..5e9fb78 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(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-17 10:06+0200\n" -"PO-Revision-Date: 2011-06-07 13:35+0200\n" +"PO-Revision-Date: 2011-06-17 10:28+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "Language: cs\n" @@ -1012,10 +1012,9 @@ msgstr "Nebylo zadáno číslo!" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:51 -#, fuzzy #| msgid "Log file count" msgid "Total count" -msgstr "Počet souborů s logy" +msgstr "Celkový počet" #: js/messages.php:54 msgid "The host name is empty!" @@ -1061,24 +1060,22 @@ msgid "Edit" msgstr "Upravit" #: js/messages.php:66 server_status.php:411 -#, fuzzy #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "Server" +msgstr "Živý graf provozu" #: js/messages.php:67 server_status.php:414 msgid "Live conn./process chart" -msgstr "" +msgstr "Živý graf připojení a procesů" #: js/messages.php:68 server_status.php:443 -#, fuzzy #| msgid "Show query chart" msgid "Live query chart" -msgstr "Zobrazit graf dotazu" +msgstr "Živý graf dotazů" #: js/messages.php:70 msgid "Static data" -msgstr "" +msgstr "Statická data" #. l10n: Total number of queries #: js/messages.php:72 libraries/build_html_for_db.lib.php:45 @@ -1091,7 +1088,7 @@ msgstr "Celkem" #. l10n: Other, small valued, queries #: js/messages.php:74 server_status.php:600 msgid "Other" -msgstr "" +msgstr "Ostatní" #. l10n: Thousands separator #: js/messages.php:76 libraries/common.lib.php:1375 @@ -1105,41 +1102,38 @@ msgstr "." #: js/messages.php:80 msgid "kB sent since last refresh" -msgstr "" +msgstr "Odesláno kiB od posledního obnovení" #: js/messages.php:81 msgid "kB received since last refresh" -msgstr "" +msgstr "Přijato kiB od posledního obnovení" #: js/messages.php:82 -#, fuzzy #| msgid "Server Choice" msgid "Server traffic (in kB)" -msgstr "Server" +msgstr "Síťový provoz (v kiB)" #: js/messages.php:83 msgid "Connections since last refresh" -msgstr "" +msgstr "Spojení od posledního obnovaní" #: js/messages.php:84 server_status.php:792 msgid "Processes" msgstr "Procesy" #: js/messages.php:85 -#, fuzzy #| msgid "Connections" msgid "Connections / Processes" -msgstr "Připojení" +msgstr "Připojení / Procesů" #: js/messages.php:86 msgid "Issued queries since last refresh" -msgstr "" +msgstr "Provedených dotazů od posledního obnovení" #: js/messages.php:87 -#, fuzzy #| msgid "SQL queries" msgid "Issued queries" -msgstr "SQL dotazy" +msgstr "Provedené dotazy" #: js/messages.php:89 server_status.php:386 msgid "Query statistics" @@ -4963,24 +4957,22 @@ msgid "Language" msgstr "Jazyk" #: libraries/display_tbl.lib.php:397 -#, fuzzy #| msgid "Textarea columns" msgid "Restore column order" -msgstr "Sloupců v textové oblasti" +msgstr "Obnovit pořadí sloupců" #: libraries/display_tbl.lib.php:411 msgid "Drag to reorder" -msgstr "" +msgstr "Uspořádejte přetažením" #: libraries/display_tbl.lib.php:412 -#, fuzzy #| msgid "Click to select" msgid "Click to sort" -msgstr "Klikněte pro vybrání" +msgstr "Klikněte pro řazení" #: libraries/display_tbl.lib.php:413 msgid "Click to mark/unmark" -msgstr "" +msgstr "Klikněte pro označení" #: libraries/display_tbl.lib.php:425 #, php-format @@ -8284,22 +8276,19 @@ msgid "Runtime Information" msgstr "Stav serveru" #: server_status.php:385 -#, fuzzy #| msgid "Server Choice" msgid "Server traffic" -msgstr "Server" +msgstr "Síťový provoz serveru" #: server_status.php:387 -#, fuzzy #| msgid "See slave status table" msgid "All status variables" -msgstr "Zobrazit tabulku se stavem podřízených" +msgstr "Všechny stavové proměnné" #: server_status.php:397 server_status.php:430 -#, fuzzy #| msgid "Refresh" msgid "Refresh rate" -msgstr "Obnovit" +msgstr "Obnovovací frekvence" #: server_status.php:398 server_status.php:431 #, fuzzy hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-4025-gbb5fe3f
by Michal Čihař 17 Jun '11

17 Jun '11

The branch, master has been updated via bb5fe3f2d63cdf0b8281b25cd060ffbf39856ab5 (commit) from 1c5be4523737f014c1038375b040cc66acc564b1 (commit) - Log ----------------------------------------------------------------- commit bb5fe3f2d63cdf0b8281b25cd060ffbf39856ab5 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jun 17 10:35:23 2011 +0200 Factor out refresh rate selection and use ngettext for it ----------------------------------------------------------------------- Summary of changes: server_status.php | 39 +++++++++++++++++---------------------- 1 files changed, 17 insertions(+), 22 deletions(-) diff --git a/server_status.php b/server_status.php index 0811558..045e40e 100644 --- a/server_status.php +++ b/server_status.php @@ -21,6 +21,21 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) require_once './libraries/common.inc.php'; /** + * Function to output refresh rate selection. + */ +function PMA_choose_refresh_rate() { + echo '<option value="5">' . __('Refresh rate') . '</option>'; + foreach(array(1, 2, 5, 1, 20, 40, 60, 120, 300, 600) as $key => $rate) { + if ($rate % 60 == 0) { + $minrate = $rate / 60; + echo '<option value="' . $rate . '">' . sprintf(_ngettext('%d minute', '%d minutes', $minrate), $minrate) . '</option>'; + } else { + echo '<option value="' . $rate . '">' . sprintf(_ngettext('%d second', '%d seconds', $rate), $rate) . '</option>'; + } + } +} + +/** * Ajax request */ @@ -394,17 +409,7 @@ echo __('Runtime Information'); <?php echo __('Refresh'); ?> </a> <select name="trafficChartRefresh" style="display:none;"> - <option value="5"><?php echo __('Refresh rate'); ?></option> - <option value="1">1 <?php echo __('second'); ?></option> - <option value="2">2 <?php echo __('seconds'); ?></option> - <option value="5">5 <?php echo __('seconds'); ?></option> - <option value="10">10 <?php echo __('seconds'); ?></option> - <option value="20">20 <?php echo __('seconds'); ?></option> - <option value="40">40 <?php echo __('seconds'); ?></option> - <option value="60">1 <?php echo __('minutes'); ?></option> - <option value="120">2 <?php echo __('minutes'); ?></option> - <option value="300">5 <?php echo __('minutes'); ?></option> - <option value="600">10 <?php echo __('minutes'); ?></option> + <?php PMA_choose_refresh_rate(); ?> </select> <a class="tabChart livetrafficLink" href="#"> @@ -427,17 +432,7 @@ echo __('Runtime Information'); <?php echo __('Refresh'); ?> </a> <select name="queryChartRefresh" style="display:none;"> - <option value="5"><?php echo __('Refresh rate'); ?></option> - <option value="1">1 <?php echo __('second'); ?></option> - <option value="2">2 <?php echo __('seconds'); ?></option> - <option value="5">5 <?php echo __('seconds'); ?></option> - <option value="10">10 <?php echo __('seconds'); ?></option> - <option value="20">20 <?php echo __('seconds'); ?></option> - <option value="40">40 <?php echo __('seconds'); ?></option> - <option value="60">1 <?php echo __('minutes'); ?></option> - <option value="120">2 <?php echo __('minutes'); ?></option> - <option value="300">5 <?php echo __('minutes'); ?></option> - <option value="600">10 <?php echo __('minutes'); ?></option> + <?php PMA_choose_refresh_rate(); ?> </select> <a class="tabChart livequeriesLink" href="#"> <?php echo __('Live query chart'); ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-4023-gf2577a7
by Michal Čihař 17 Jun '11

17 Jun '11

The branch, master has been updated via f2577a7435989c86e5198248699c7ad11df2fbfd (commit) via f1e1f3b4ac9aaebd0efa6fe4731180e87a9e3c84 (commit) via 218188bbf766d347f2f8c05256ecfd9939834398 (commit) via 346f56e4a3dbe8d17027d3b9cf7c56c6b0e64b76 (commit) via 6d214ca29b726e7582aceab22d0510dbadb5fc7e (commit) via cde6c028fd003ba349e56cf50645efe223816d47 (commit) via de6ba1be2efe627ce8542496d137aa93047ab310 (commit) via 01fe11f0e613fd2447fca535ded967eda2f3ed22 (commit) via 408d18de29bfa3c8f71b016e68e1fa5da6e811a0 (commit) via 5b468f3f33edf5eb07c0378bb42d1d454967f358 (commit) via 1104fd9650992d7ade95f1ccef9b64778fd04f80 (commit) via e2652acc8d6e084f2447690f61840f1f2745b5b5 (commit) via 03baba5c14f43a9184d8354e0a5fc7c8742a8e81 (commit) via 95c7b7a0769db5acfe4216964ac28512b4d8ee1c (commit) via 42afef738c85cf3d6e0a662e1cd1747e8a003115 (commit) via ba0dc54309124161a5e8b60fb2ac94931c62a4a6 (commit) via 5bfe53a787e4dc29e9d9d84f96072a56c47a4f51 (commit) via 30b59e4f319b1876dc5ec6b7cb862e5fac5ba2b0 (commit) via f58659d70542fab0b5fe2b30bca2c48d479ca5f6 (commit) via 87bd266c243ca602097413295d8a240647d52d21 (commit) via 5bd96211e194673d04972792bce565f5ddaaac43 (commit) via de73d60118c2a1c22723042b9f2089120b3b1227 (commit) via 7bc6e67a849d7fc420136d15ff9ddd8085cd6182 (commit) via 8110fa1c45d2acd5def8af094922237cdf52264d (commit) via 553e052cf6dbd83cdc9d1508dcfbe0ba7e442c6c (commit) via 86c3429dfcfb4c27267f5ec9583a7270b2fb27cc (commit) via 0efcc59ad164b486a096a27997155b0d08ef1f8c (commit) via 353ebf04475ded4572741feefa299e9f863dcc44 (commit) via 9d5fb9dabe2ce391376c3b10e2be906eb3c4c2bf (commit) via 54b5c8044203f27f2812653d2fa3fd339eecc11f (commit) via e9874a0530edd4e17838d80242db2347966109c8 (commit) via ddda8d649f30f85244a2db93ccdf02172ba753f4 (commit) via c0093414aecf7f134e8d816db46d54c45249a935 (commit) via 25acb441710010c618b7b8fc31a9238889b8ab61 (commit) via bf4a98a421ef55b36a560ed9adb475c18ec0abcb (commit) via eaf31970eb77c1487242873cb11a1ccbb68583bc (commit) via 39618c10f3eab5b555fd8d9f6761dc782d6b677c (commit) via f7fcac36062af2d2859973b74870182c84efed95 (commit) via 213803983335da15dfc2855db5b8c4465b688f95 (commit) via 7f7d2faee54a96efb5149f510242f0e570114e68 (commit) via e288d74e49231b1afe5837bdfacfa8156e22120a (commit) via 2dfc62c01ea0f9fc9745a60d862863a90df9cbb6 (commit) via 40a283e778b90f2a8a48c3a3c99f7bdd0a7fe8a9 (commit) via 0ca3dc7318e7ba8df5ddb00a02230b74f402565f (commit) via cd7e9f36a88260e99413fac3c5315ef98883d9c3 (commit) via e9a084ce3d7ed0b102b9dddc900e6820f1b21372 (commit) via fba66bf24cd1106eb22b1667978c3cb9ad9e324a (commit) via 5a05bfcf050043e604e25eb5fd8a85da31ff2b11 (commit) via 9feffdfbdef823a4dbc62bd14c8a2fb2eddd1dfe (commit) via 439cf0dcc5392cb95aef4437b8ecede54e710ea0 (commit) via 0c05c3b7db9c97bd15c4d72e824b1c8cae5ed2f0 (commit) via 8315bb9501512150b34e8deed5566a80bb2f6a9b (commit) via 77ce79428cdd288d820be0374ff4ca668eaf1b06 (commit) via bd8fabb2128c2dcaa1cbbd55389df3fef7e45260 (commit) via 7ba9d3369a36cc144644c5e3e88ac9ac15466c56 (commit) via 350435aa769e6c3b131a6712ec4dbecbafa0241a (commit) via 8cbb44122ff1c268a71047cdc94fa25dc353300a (commit) via abd34cf7128f37f8d9021663e8997d83f0d526e2 (commit) via 38a8d40719ead1c16350a45ca01167d12ac8a229 (commit) via 6ad791b222edef5080bae0cd32a7ec7e7c63763f (commit) via f0a13eb7c73458af55a006dc44572812d76cf5ca (commit) via bc3ae3734be89de0af52f6f1cc4f8117c90d712f (commit) via 6e2886ffa0463a8222f0700de7147201edbb3389 (commit) via 882a4dd1a962df4f0bb1d2615f6ab2451d487514 (commit) via e7fd6392d8d9f52ceaac392a4928ee98100b131c (commit) via ebe0c2e4af9067049dc76c9a7a4f59e0540eb8c8 (commit) via 274b142d05ec0d111606e02b11e5e947893352b1 (commit) via 1c5e47dd39e0aa4d024dd0c48132f5eba0831cbf (commit) via 261d44d68d90d80b61aa7c7bc44a806f4bcac8fc (commit) via 0f4c2d16380148dd0ee465730cd56544180dffd4 (commit) via 9fc343e7a7f65271e23f7f07b13dc002271edf59 (commit) via 22a993911d3be699061e6ab001e8d2dddc9378f1 (commit) via 6539d4b54a16149ee9be7611098b36eac27c0712 (commit) via 40f064bee358ef9e11ee5ad6cc11c9db8204d648 (commit) via a6a4723ad2c4e9cc1c18d3fc984b9dfebbcf600c (commit) via f035da1b8df7892165cdb2070f53c22868a7b7e2 (commit) via 7196cc2b24277c2e6abc202df1aec2cd4a518a95 (commit) via 9f34cbf73a7864f0861f8cf96f5b65468b2de18a (commit) via d4941bf08c2cb6f86a90d252b20e21bc9cf082ce (commit) via 107d043ee1fcb7d2a18d40931862ccc962141627 (commit) via c5421aaf305d191964e40c674d08d80f5fb06e7d (commit) via 282b7578ad6f30cbde005d1d6f3a935e6727f133 (commit) via b3569b3e62fb5efa2841e6e2d53c6b194354342f (commit) via 146b268766e654ca05bd918db72e9161214bcc0a (commit) via 2e8ddf977c413b41ed91cf575d3b12b0ee9599b0 (commit) via b49c1c8b371c7277e76262ecc9d5acb2feb6a1da (commit) via f833ea24bd43de270643a1ea45281f61edc9f192 (commit) via 28b7674e0ff501c5dbb6040e605811d282d1c79c (commit) via 4ab2974c95ef6cff9b9dde1845f5ab2b918ed2ec (commit) via 2c82db33618fb1c6ae682f472f4762e573440db6 (commit) via b38ffd67b6387a901e949c55d99d998b01f7d1dc (commit) via 9d5d07653ad92eadf989e81988f1426f102995a6 (commit) via 29d9ae2f655e784c73e977261a412caea89583aa (commit) via 4cc2ae0e3b171b026aa57213b9a67beec92a8df1 (commit) via 738a0b5158dd2a010eabd07eb5bb1d06efcbca3f (commit) via 9f3201c64094b60b8a772207c08190490f14e186 (commit) via fe7f05f9bbfb2999309656c457d72dce71f3e90b (commit) via 106ca3e0c22409b506819cf9aa2413cfb53cda85 (commit) via 675d69da7d98631395b3958a4b0d72b8a4a3cc66 (commit) via bee7fc5d8a49e3f23528e82a3b1544a482152e3a (commit) via efcd9b6ade62a510a384d23889957205fd530863 (commit) via 580e37161b4aa738a4e5b309a66d462a0f3effe6 (commit) via 44538e990389fdb0fab4bb92cc59fa6c3a804b56 (commit) via d7860f9a3624f8ae06eb4d44ff48cb3119b4abfa (commit) via 3c09c7904e9be360eb01fdc0241917e683db2046 (commit) via cb9e0e37e9db8f5c94ce38de6032d00c8d7d2480 (commit) via afab0dca041bb91e8e7367a09c14d6a56bcc5c75 (commit) via df68e0311c7f2d829d35142a0f9ec643e15cef9d (commit) via fe22d14410c0cf5198290ddda0c87da081525e81 (commit) via b47ea710fc0b643b99a8ec0df1beebc416973542 (commit) via b6608bbda0461d36eec0c697aa62f300050100a1 (commit) via 2ed036636a5fd0350e78b22479fa4305542fb170 (commit) via a3cab00a52658b7d5c1db47780f1999f93a2357a (commit) via 69f4672625e26f948664c8b6423b175e1ffd67b4 (commit) via e83729045cade4ce5897db01afa5da5cda0cf263 (commit) via da83ebed1939dcff4422a013ea2a267b6f95ddf4 (commit) via b51748a23f487bba16d5d0bf1fc66e34c84f6427 (commit) via 28482741d736977e0d2ff7b924a13d2e92ba7630 (commit) via 52d72385daa72b189c25d636b035d939eea6200c (commit) via dd99336a0fbe697fe1dad8ce6d84bdcab5baa838 (commit) via b1a412629f54b382c430f1cf42f06decfe88763f (commit) via 9f40d99a600838d2947d13dbf4017f1337cccc75 (commit) via 250ed7d7b4d8487e19cbe605f2b18f5868b97c9b (commit) via f2b85cab7937a7545ce6ef1934812ca9604f9b1f (commit) via 9686c57d99b9f2e1520efa89f0bcc82d9188c5ba (commit) via 302a8b16b012cf86775a3ef59140260aa7e82d14 (commit) via 0d04137f384a5dbac1eb8c1736319e1e8a7d8cb3 (commit) via 904c172b0dc5267e379bfbe6e6f75d04d4eac895 (commit) via 8fe0060a99cf6b017c7f4fc6168e69ee4bef392d (commit) via 747af41e6527c9fc42d60c4b4e0c9e22ea82ae42 (commit) via 81a7918e388d0fc998c6d4e7fb267d38188e35c7 (commit) via 7332cd13a5cd20802f729f1a89296fd4691ce029 (commit) via 9e06738a93c7c761a120ed15ddfb1295d223fb0d (commit) via 4b4f2abaea703f2638099e127854193256424ba0 (commit) via 76f49010ee44484e1994545ac0b113c377c9480d (commit) via de6e4d611379ca5469223f3250ef9a9df62a7cac (commit) via cd039460f6e051daf46023612441a09a54d81021 (commit) via 7a3fe9022ef6a56fc38ce0d49160ecacde53a659 (commit) via 3b6a21d28220d1c40c51a50288982dbf363c3525 (commit) via b4fcb499e0c080e92496994e1331676f6d3cc5d4 (commit) via 5e2e85b0b2359a2dec295a6420aafd3c480f9c46 (commit) via f00941c287c78f8f3f8163cfe7b263552b1d7c6f (commit) via 5461d46c6e8c08b64781963d76e0877f1bdeb62c (commit) via 0d02375b981ec408d6e73cc69d341ad9a0f71210 (commit) via c772fc6deafd7c5fbcd149457458482f54600907 (commit) via 78961fec184d2a8a441e6c734ebd35f874a52f96 (commit) via 62e70a3b934c989cbf0bb4716a2d4005580c7a57 (commit) via cb4d4abb4ceefa04ad4428d7f6f3f97e980bfdfd (commit) via 61056efc99348f8942525c3a1d99c19843fa4a48 (commit) via 568b7352b2f9d00e664b17fcb270b60268695673 (commit) via 0c44049775a922b4c3017794cd733ef94d67967c (commit) via ca42d3a9bc0d4f4383f859123884ee75651174cf (commit) via 8d4b6d66e4e562921f42ce427ad4c20426552439 (commit) via ef887489fd13364a26bd0c01c3c62db8100747c0 (commit) via f5b07d72f14847710a5d35c0b9c3f7f04251bfff (commit) via 6a36e59f32157db66878b4d8e4e842ac071f44b3 (commit) from 75f916fd3c13333b655a72427d8158ce17c3995e (commit) - Log ----------------------------------------------------------------- commit f2577a7435989c86e5198248699c7ad11df2fbfd Merge: 75f916fd3c13333b655a72427d8158ce17c3995e f1e1f3b4ac9aaebd0efa6fe4731180e87a9e3c84 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jun 17 09:13:20 2011 +0200 Merge remote-tracking branch 'pootle/master' commit f1e1f3b4ac9aaebd0efa6fe4731180e87a9e3c84 Merge: 218188bbf766d347f2f8c05256ecfd9939834398 79f28d8dbbcfe0e42847d2bfa3bb5a9003f5f470 Author: Pootle server <pootle(a)cihar.com> Date: Thu Jun 16 22:40:06 2011 +0200 Merge remote-tracking branch 'origin/master' commit 218188bbf766d347f2f8c05256ecfd9939834398 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:33:55 2011 +0200 Translation update done using Pootle. commit 346f56e4a3dbe8d17027d3b9cf7c56c6b0e64b76 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:32:20 2011 +0200 Translation update done using Pootle. commit 6d214ca29b726e7582aceab22d0510dbadb5fc7e Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:31:26 2011 +0200 Translation update done using Pootle. commit cde6c028fd003ba349e56cf50645efe223816d47 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:31:09 2011 +0200 Translation update done using Pootle. commit de6ba1be2efe627ce8542496d137aa93047ab310 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:30:07 2011 +0200 Translation update done using Pootle. commit 01fe11f0e613fd2447fca535ded967eda2f3ed22 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:30:02 2011 +0200 Translation update done using Pootle. commit 408d18de29bfa3c8f71b016e68e1fa5da6e811a0 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:29:56 2011 +0200 Translation update done using Pootle. commit 5b468f3f33edf5eb07c0378bb42d1d454967f358 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:29:52 2011 +0200 Translation update done using Pootle. commit 1104fd9650992d7ade95f1ccef9b64778fd04f80 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:29:47 2011 +0200 Translation update done using Pootle. commit e2652acc8d6e084f2447690f61840f1f2745b5b5 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:29:40 2011 +0200 Translation update done using Pootle. commit 03baba5c14f43a9184d8354e0a5fc7c8742a8e81 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:29:34 2011 +0200 Translation update done using Pootle. commit 95c7b7a0769db5acfe4216964ac28512b4d8ee1c Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:29:25 2011 +0200 Translation update done using Pootle. commit 42afef738c85cf3d6e0a662e1cd1747e8a003115 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:29:18 2011 +0200 Translation update done using Pootle. commit ba0dc54309124161a5e8b60fb2ac94931c62a4a6 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:26:58 2011 +0200 Translation update done using Pootle. commit 5bfe53a787e4dc29e9d9d84f96072a56c47a4f51 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:26:29 2011 +0200 Translation update done using Pootle. commit 30b59e4f319b1876dc5ec6b7cb862e5fac5ba2b0 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:25:27 2011 +0200 Translation update done using Pootle. commit f58659d70542fab0b5fe2b30bca2c48d479ca5f6 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:25:01 2011 +0200 Translation update done using Pootle. commit 87bd266c243ca602097413295d8a240647d52d21 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:24:41 2011 +0200 Translation update done using Pootle. commit 5bd96211e194673d04972792bce565f5ddaaac43 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:24:36 2011 +0200 Translation update done using Pootle. commit de73d60118c2a1c22723042b9f2089120b3b1227 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:24:25 2011 +0200 Translation update done using Pootle. commit 7bc6e67a849d7fc420136d15ff9ddd8085cd6182 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:24:18 2011 +0200 Translation update done using Pootle. commit 8110fa1c45d2acd5def8af094922237cdf52264d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:24:16 2011 +0200 Translation update done using Pootle. commit 553e052cf6dbd83cdc9d1508dcfbe0ba7e442c6c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:24:04 2011 +0200 Translation update done using Pootle. commit 86c3429dfcfb4c27267f5ec9583a7270b2fb27cc Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:23:59 2011 +0200 Translation update done using Pootle. commit 0efcc59ad164b486a096a27997155b0d08ef1f8c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:23:52 2011 +0200 Translation update done using Pootle. commit 353ebf04475ded4572741feefa299e9f863dcc44 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:23:51 2011 +0200 Translation update done using Pootle. commit 9d5fb9dabe2ce391376c3b10e2be906eb3c4c2bf Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:23:49 2011 +0200 Translation update done using Pootle. commit 54b5c8044203f27f2812653d2fa3fd339eecc11f Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:23:45 2011 +0200 Translation update done using Pootle. commit e9874a0530edd4e17838d80242db2347966109c8 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:23:35 2011 +0200 Translation update done using Pootle. commit ddda8d649f30f85244a2db93ccdf02172ba753f4 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:23:28 2011 +0200 Translation update done using Pootle. commit c0093414aecf7f134e8d816db46d54c45249a935 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:23:07 2011 +0200 Translation update done using Pootle. commit 25acb441710010c618b7b8fc31a9238889b8ab61 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:22:54 2011 +0200 Translation update done using Pootle. commit bf4a98a421ef55b36a560ed9adb475c18ec0abcb Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:22:31 2011 +0200 Translation update done using Pootle. commit eaf31970eb77c1487242873cb11a1ccbb68583bc Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:22:11 2011 +0200 Translation update done using Pootle. commit 39618c10f3eab5b555fd8d9f6761dc782d6b677c Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:21:51 2011 +0200 Translation update done using Pootle. commit f7fcac36062af2d2859973b74870182c84efed95 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:21:38 2011 +0200 Translation update done using Pootle. commit 213803983335da15dfc2855db5b8c4465b688f95 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:21:37 2011 +0200 Translation update done using Pootle. commit 7f7d2faee54a96efb5149f510242f0e570114e68 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:20:24 2011 +0200 Translation update done using Pootle. commit e288d74e49231b1afe5837bdfacfa8156e22120a Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:20:13 2011 +0200 Translation update done using Pootle. commit 2dfc62c01ea0f9fc9745a60d862863a90df9cbb6 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:20:09 2011 +0200 Translation update done using Pootle. commit 40a283e778b90f2a8a48c3a3c99f7bdd0a7fe8a9 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:19:43 2011 +0200 Translation update done using Pootle. commit 0ca3dc7318e7ba8df5ddb00a02230b74f402565f Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:19:34 2011 +0200 Translation update done using Pootle. commit cd7e9f36a88260e99413fac3c5315ef98883d9c3 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:19:28 2011 +0200 Translation update done using Pootle. commit e9a084ce3d7ed0b102b9dddc900e6820f1b21372 Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:19:04 2011 +0200 Translation update done using Pootle. commit fba66bf24cd1106eb22b1667978c3cb9ad9e324a Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:17:43 2011 +0200 Translation update done using Pootle. commit 5a05bfcf050043e604e25eb5fd8a85da31ff2b11 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:16:53 2011 +0200 Translation update done using Pootle. commit 9feffdfbdef823a4dbc62bd14c8a2fb2eddd1dfe Author: Domen <dbc334(a)gmail.com> Date: Thu Jun 16 22:15:01 2011 +0200 Translation update done using Pootle. commit 439cf0dcc5392cb95aef4437b8ecede54e710ea0 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:14:33 2011 +0200 Translation update done using Pootle. commit 0c05c3b7db9c97bd15c4d72e824b1c8cae5ed2f0 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:13:36 2011 +0200 Translation update done using Pootle. commit 8315bb9501512150b34e8deed5566a80bb2f6a9b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:12:19 2011 +0200 Translation update done using Pootle. commit 77ce79428cdd288d820be0374ff4ca668eaf1b06 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:11:39 2011 +0200 Translation update done using Pootle. commit bd8fabb2128c2dcaa1cbbd55389df3fef7e45260 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:11:18 2011 +0200 Translation update done using Pootle. commit 7ba9d3369a36cc144644c5e3e88ac9ac15466c56 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:10:36 2011 +0200 Translation update done using Pootle. commit 350435aa769e6c3b131a6712ec4dbecbafa0241a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:10:17 2011 +0200 Translation update done using Pootle. commit 8cbb44122ff1c268a71047cdc94fa25dc353300a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:09:08 2011 +0200 Translation update done using Pootle. commit abd34cf7128f37f8d9021663e8997d83f0d526e2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:08:48 2011 +0200 Translation update done using Pootle. commit 38a8d40719ead1c16350a45ca01167d12ac8a229 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:08:35 2011 +0200 Translation update done using Pootle. commit 6ad791b222edef5080bae0cd32a7ec7e7c63763f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:08:19 2011 +0200 Translation update done using Pootle. commit f0a13eb7c73458af55a006dc44572812d76cf5ca Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:08:06 2011 +0200 Translation update done using Pootle. commit bc3ae3734be89de0af52f6f1cc4f8117c90d712f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:07:29 2011 +0200 Translation update done using Pootle. commit 6e2886ffa0463a8222f0700de7147201edbb3389 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:06:23 2011 +0200 Translation update done using Pootle. commit 882a4dd1a962df4f0bb1d2615f6ab2451d487514 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:06:12 2011 +0200 Translation update done using Pootle. commit e7fd6392d8d9f52ceaac392a4928ee98100b131c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:05:49 2011 +0200 Translation update done using Pootle. commit ebe0c2e4af9067049dc76c9a7a4f59e0540eb8c8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:05:23 2011 +0200 Translation update done using Pootle. commit 274b142d05ec0d111606e02b11e5e947893352b1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:04:54 2011 +0200 Translation update done using Pootle. commit 1c5e47dd39e0aa4d024dd0c48132f5eba0831cbf Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:04:30 2011 +0200 Translation update done using Pootle. commit 261d44d68d90d80b61aa7c7bc44a806f4bcac8fc Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:04:06 2011 +0200 Translation update done using Pootle. commit 0f4c2d16380148dd0ee465730cd56544180dffd4 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:03:55 2011 +0200 Translation update done using Pootle. commit 9fc343e7a7f65271e23f7f07b13dc002271edf59 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:03:31 2011 +0200 Translation update done using Pootle. commit 22a993911d3be699061e6ab001e8d2dddc9378f1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 22:02:31 2011 +0200 Translation update done using Pootle. commit 6539d4b54a16149ee9be7611098b36eac27c0712 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jun 16 21:59:32 2011 +0200 Translation update done using Pootle. commit 40f064bee358ef9e11ee5ad6cc11c9db8204d648 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 21:00:57 2011 +0200 Translation update done using Pootle. commit a6a4723ad2c4e9cc1c18d3fc984b9dfebbcf600c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:36:48 2011 +0200 Translation update done using Pootle. commit f035da1b8df7892165cdb2070f53c22868a7b7e2 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:36:14 2011 +0200 Translation update done using Pootle. commit 7196cc2b24277c2e6abc202df1aec2cd4a518a95 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:33:05 2011 +0200 Translation update done using Pootle. commit 9f34cbf73a7864f0861f8cf96f5b65468b2de18a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:31:49 2011 +0200 Translation update done using Pootle. commit d4941bf08c2cb6f86a90d252b20e21bc9cf082ce Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:30:17 2011 +0200 Translation update done using Pootle. commit 107d043ee1fcb7d2a18d40931862ccc962141627 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:29:20 2011 +0200 Translation update done using Pootle. commit c5421aaf305d191964e40c674d08d80f5fb06e7d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:29:16 2011 +0200 Translation update done using Pootle. commit 282b7578ad6f30cbde005d1d6f3a935e6727f133 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:28:56 2011 +0200 Translation update done using Pootle. commit b3569b3e62fb5efa2841e6e2d53c6b194354342f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:28:17 2011 +0200 Translation update done using Pootle. commit 146b268766e654ca05bd918db72e9161214bcc0a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:26:00 2011 +0200 Translation update done using Pootle. commit 2e8ddf977c413b41ed91cf575d3b12b0ee9599b0 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:25:55 2011 +0200 Translation update done using Pootle. commit b49c1c8b371c7277e76262ecc9d5acb2feb6a1da Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:25:33 2011 +0200 Translation update done using Pootle. commit f833ea24bd43de270643a1ea45281f61edc9f192 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:16:34 2011 +0200 Translation update done using Pootle. commit 28b7674e0ff501c5dbb6040e605811d282d1c79c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:15:36 2011 +0200 Translation update done using Pootle. commit 4ab2974c95ef6cff9b9dde1845f5ab2b918ed2ec Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:15:28 2011 +0200 Translation update done using Pootle. commit 2c82db33618fb1c6ae682f472f4762e573440db6 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:15:19 2011 +0200 Translation update done using Pootle. commit b38ffd67b6387a901e949c55d99d998b01f7d1dc Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:15:08 2011 +0200 Translation update done using Pootle. commit 9d5d07653ad92eadf989e81988f1426f102995a6 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:14:48 2011 +0200 Translation update done using Pootle. commit 29d9ae2f655e784c73e977261a412caea89583aa Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:14:25 2011 +0200 Translation update done using Pootle. commit 4cc2ae0e3b171b026aa57213b9a67beec92a8df1 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:14:05 2011 +0200 Translation update done using Pootle. commit 738a0b5158dd2a010eabd07eb5bb1d06efcbca3f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:13:50 2011 +0200 Translation update done using Pootle. commit 9f3201c64094b60b8a772207c08190490f14e186 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:13:28 2011 +0200 Translation update done using Pootle. commit fe7f05f9bbfb2999309656c457d72dce71f3e90b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:12:31 2011 +0200 Translation update done using Pootle. commit 106ca3e0c22409b506819cf9aa2413cfb53cda85 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:12:19 2011 +0200 Translation update done using Pootle. commit 675d69da7d98631395b3958a4b0d72b8a4a3cc66 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:10:56 2011 +0200 Translation update done using Pootle. commit bee7fc5d8a49e3f23528e82a3b1544a482152e3a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:10:16 2011 +0200 Translation update done using Pootle. commit efcd9b6ade62a510a384d23889957205fd530863 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:10:11 2011 +0200 Translation update done using Pootle. commit 580e37161b4aa738a4e5b309a66d462a0f3effe6 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:10:07 2011 +0200 Translation update done using Pootle. commit 44538e990389fdb0fab4bb92cc59fa6c3a804b56 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:10:01 2011 +0200 Translation update done using Pootle. commit d7860f9a3624f8ae06eb4d44ff48cb3119b4abfa Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:09:50 2011 +0200 Translation update done using Pootle. commit 3c09c7904e9be360eb01fdc0241917e683db2046 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:09:22 2011 +0200 Translation update done using Pootle. commit cb9e0e37e9db8f5c94ce38de6032d00c8d7d2480 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:09:03 2011 +0200 Translation update done using Pootle. commit afab0dca041bb91e8e7367a09c14d6a56bcc5c75 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:08:10 2011 +0200 Translation update done using Pootle. commit df68e0311c7f2d829d35142a0f9ec643e15cef9d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:05:53 2011 +0200 Translation update done using Pootle. commit fe22d14410c0cf5198290ddda0c87da081525e81 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:04:37 2011 +0200 Translation update done using Pootle. commit b47ea710fc0b643b99a8ec0df1beebc416973542 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 20:02:36 2011 +0200 Translation update done using Pootle. commit b6608bbda0461d36eec0c697aa62f300050100a1 Merge: 2ed036636a5fd0350e78b22479fa4305542fb170 4338b70d9fdec523d93af791ba34817431e20154 Author: Pootle server <pootle(a)cihar.com> Date: Thu Jun 16 18:40:04 2011 +0200 Merge remote-tracking branch 'origin/master' commit 2ed036636a5fd0350e78b22479fa4305542fb170 Merge: a3cab00a52658b7d5c1db47780f1999f93a2357a 51af35ee1409256c70ed2ea226dd984582ed830f Author: Pootle server <pootle(a)cihar.com> Date: Thu Jun 16 14:40:04 2011 +0200 Merge remote-tracking branch 'origin/master' commit a3cab00a52658b7d5c1db47780f1999f93a2357a Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:17:02 2011 +0200 Translation update done using Pootle. commit 69f4672625e26f948664c8b6423b175e1ffd67b4 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:16:48 2011 +0200 Translation update done using Pootle. commit e83729045cade4ce5897db01afa5da5cda0cf263 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:16:35 2011 +0200 Translation update done using Pootle. commit da83ebed1939dcff4422a013ea2a267b6f95ddf4 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:14:26 2011 +0200 Translation update done using Pootle. commit b51748a23f487bba16d5d0bf1fc66e34c84f6427 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:13:47 2011 +0200 Translation update done using Pootle. commit 28482741d736977e0d2ff7b924a13d2e92ba7630 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:12:39 2011 +0200 Translation update done using Pootle. commit 52d72385daa72b189c25d636b035d939eea6200c Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:11:54 2011 +0200 Translation update done using Pootle. commit dd99336a0fbe697fe1dad8ce6d84bdcab5baa838 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:11:39 2011 +0200 Translation update done using Pootle. commit b1a412629f54b382c430f1cf42f06decfe88763f Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:11:16 2011 +0200 Translation update done using Pootle. commit 9f40d99a600838d2947d13dbf4017f1337cccc75 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:09:08 2011 +0200 Translation update done using Pootle. commit 250ed7d7b4d8487e19cbe605f2b18f5868b97c9b Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:08:00 2011 +0200 Translation update done using Pootle. commit f2b85cab7937a7545ce6ef1934812ca9604f9b1f Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:06:51 2011 +0200 Translation update done using Pootle. commit 9686c57d99b9f2e1520efa89f0bcc82d9188c5ba Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:06:32 2011 +0200 Translation update done using Pootle. commit 302a8b16b012cf86775a3ef59140260aa7e82d14 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:05:28 2011 +0200 Translation update done using Pootle. commit 0d04137f384a5dbac1eb8c1736319e1e8a7d8cb3 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:05:13 2011 +0200 Translation update done using Pootle. commit 904c172b0dc5267e379bfbe6e6f75d04d4eac895 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:05:07 2011 +0200 Translation update done using Pootle. commit 8fe0060a99cf6b017c7f4fc6168e69ee4bef392d Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:04:55 2011 +0200 Translation update done using Pootle. commit 747af41e6527c9fc42d60c4b4e0c9e22ea82ae42 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:04:46 2011 +0200 Translation update done using Pootle. commit 81a7918e388d0fc998c6d4e7fb267d38188e35c7 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:04:30 2011 +0200 Translation update done using Pootle. commit 7332cd13a5cd20802f729f1a89296fd4691ce029 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:04:20 2011 +0200 Translation update done using Pootle. commit 9e06738a93c7c761a120ed15ddfb1295d223fb0d Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:04:05 2011 +0200 Translation update done using Pootle. commit 4b4f2abaea703f2638099e127854193256424ba0 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:03:40 2011 +0200 Translation update done using Pootle. commit 76f49010ee44484e1994545ac0b113c377c9480d Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:03:08 2011 +0200 Translation update done using Pootle. commit de6e4d611379ca5469223f3250ef9a9df62a7cac Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:02:49 2011 +0200 Translation update done using Pootle. commit cd039460f6e051daf46023612441a09a54d81021 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:02:36 2011 +0200 Translation update done using Pootle. commit 7a3fe9022ef6a56fc38ce0d49160ecacde53a659 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:02:15 2011 +0200 Translation update done using Pootle. commit 3b6a21d28220d1c40c51a50288982dbf363c3525 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:01:53 2011 +0200 Translation update done using Pootle. commit b4fcb499e0c080e92496994e1331676f6d3cc5d4 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:01:43 2011 +0200 Translation update done using Pootle. commit 5e2e85b0b2359a2dec295a6420aafd3c480f9c46 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:01:30 2011 +0200 Translation update done using Pootle. commit f00941c287c78f8f3f8163cfe7b263552b1d7c6f Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:01:16 2011 +0200 Translation update done using Pootle. commit 5461d46c6e8c08b64781963d76e0877f1bdeb62c Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:01:01 2011 +0200 Translation update done using Pootle. commit 0d02375b981ec408d6e73cc69d341ad9a0f71210 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:00:42 2011 +0200 Translation update done using Pootle. commit c772fc6deafd7c5fbcd149457458482f54600907 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:00:19 2011 +0200 Translation update done using Pootle. commit 78961fec184d2a8a441e6c734ebd35f874a52f96 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 12:00:00 2011 +0200 Translation update done using Pootle. commit 62e70a3b934c989cbf0bb4716a2d4005580c7a57 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 11:59:49 2011 +0200 Translation update done using Pootle. commit cb4d4abb4ceefa04ad4428d7f6f3f97e980bfdfd Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 11:59:26 2011 +0200 Translation update done using Pootle. commit 61056efc99348f8942525c3a1d99c19843fa4a48 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 11:58:57 2011 +0200 Translation update done using Pootle. commit 568b7352b2f9d00e664b17fcb270b60268695673 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 11:58:26 2011 +0200 Translation update done using Pootle. commit 0c44049775a922b4c3017794cd733ef94d67967c Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 11:58:05 2011 +0200 Translation update done using Pootle. commit ca42d3a9bc0d4f4383f859123884ee75651174cf Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 11:57:49 2011 +0200 Translation update done using Pootle. commit 8d4b6d66e4e562921f42ce427ad4c20426552439 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 11:57:18 2011 +0200 Translation update done using Pootle. commit ef887489fd13364a26bd0c01c3c62db8100747c0 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 11:56:44 2011 +0200 Translation update done using Pootle. commit f5b07d72f14847710a5d35c0b9c3f7f04251bfff Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 11:55:58 2011 +0200 Translation update done using Pootle. commit 6a36e59f32157db66878b4d8e4e842ac071f44b3 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Thu Jun 16 11:55:43 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/el.po | 118 ++++++++++++++++++++++++++----------------------------------- po/ru.po | 98 +++++++++++++++++++++------------------------------ po/sl.po | 102 +++++++++++++++++++++-------------------------------- po/tr.po | 100 +++++++++++++++++++++------------------------------- 4 files changed, 172 insertions(+), 246 deletions(-) diff --git a/po/el.po b/po/el.po index eee4c35..212d745 100644 --- a/po/el.po +++ b/po/el.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-15 08:36-0400\n" -"PO-Revision-Date: 2011-06-06 09:50+0200\n" +"PO-Revision-Date: 2011-06-16 12:17+0200\n" "Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -1013,10 +1013,9 @@ msgstr "Αυτό δεν είναι αριθμός!" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:51 -#, fuzzy #| msgid "Log file count" msgid "Total count" -msgstr "Πλήθος γραμμών αρχείου καταγραφής" +msgstr "Συνολικό πλήθος" #: js/messages.php:54 msgid "The host name is empty!" @@ -1036,10 +1035,9 @@ msgstr "Οι κωδικοί πρόσβασης δεν είναι ίδιοι!" #: js/messages.php:58 server_privileges.php:1679 server_privileges.php:1703 #: server_privileges.php:2108 server_privileges.php:2302 -#, fuzzy #| msgid "Any user" msgid "Add user" -msgstr "Οποιοσδήποτε Χρήστης" +msgstr "Προσθήκη χρήστη" #: js/messages.php:59 msgid "Reloading Privileges" @@ -1055,24 +1053,22 @@ msgid "Close" msgstr "Κλείσιμο" #: js/messages.php:64 server_status.php:397 -#, fuzzy #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "Επιλογή Διακομιστή" +msgstr "Διάγραμμα τρέχουσας κυκλοφορίας" #: js/messages.php:65 server_status.php:400 msgid "Live conn./process chart" -msgstr "" +msgstr "Διάγραμμα τρέχουσας σύνδεσης/διαδικασίας" #: js/messages.php:66 server_status.php:429 -#, fuzzy #| msgid "Show query chart" msgid "Live query chart" -msgstr "Προβολή διαγράμματος ερωτήματος" +msgstr "Διάγραμμα τρέχοντος ερωτήματος" #: js/messages.php:68 msgid "Static data" -msgstr "" +msgstr "Στατικά δεδομένα" #. l10n: Total number of queries #: js/messages.php:70 libraries/build_html_for_db.lib.php:45 @@ -1085,7 +1081,7 @@ msgstr "Σύνολο" #. l10n: Other, small valued, queries #: js/messages.php:72 server_status.php:592 msgid "Other" -msgstr "" +msgstr "Άλλα" #. l10n: Thousands separator #: js/messages.php:74 libraries/common.lib.php:1375 @@ -1154,10 +1150,9 @@ msgid "Create Table" msgstr "Δημιουργία Πίνακα" #: js/messages.php:101 -#, fuzzy #| msgid "Use Tables" msgid "Insert Table" -msgstr "Χρήση Πινάκων" +msgstr "Εισαγωγή Πίνακα" #: js/messages.php:104 msgid "Searching" @@ -1851,10 +1846,9 @@ msgid "Wrong username/password. Access denied." msgstr "Λανθασμένο όνομα χρήστη/κωδικός πρόσβασης. Άρνηση πρόσβασης." #: libraries/auth/signon.auth.lib.php:87 -#, fuzzy #| msgid "Config authentication" msgid "Can not find signon authentication script:" -msgstr "Πιστοποίηση ρύθμισης" +msgstr "Αδύνατη η εύρεση του κώδικα πιστοποίησης σύνδεσης:" #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format @@ -2607,12 +2601,13 @@ msgid "" "Disable the table maintenance mass operations, like optimizing or repairing " "the selected tables of a database." msgstr "" +"Απενεργοποιεί τις λειτουργίες μαζικής συντήρησης πινάκων, όλως " +"βελτιστοποίηση ή επισκευή των επιλεγμένων πινάκων μιας βάσης δεδομένων." #: libraries/config/messages.inc.php:61 -#, fuzzy #| msgid "Table maintenance" msgid "Disable multi table maintenance" -msgstr "Συντήρηση Πίνακα" +msgstr "Απενεργοποίηση συντήρησης πολλαπλών πινάκων" #: libraries/config/messages.inc.php:62 msgid "Edit SQL queries in popup window" @@ -4992,24 +4987,22 @@ msgid "Language" msgstr "Γλώσσα" #: libraries/display_tbl.lib.php:397 -#, fuzzy #| msgid "Textarea columns" msgid "Restore column order" -msgstr "Στήλες περιοχής κειμένου (textarea)" +msgstr "Επαναφορά κατανομής στηλών" #: libraries/display_tbl.lib.php:411 msgid "Drag to reorder" -msgstr "" +msgstr "Σύρτε για ανακατανομή" #: libraries/display_tbl.lib.php:412 -#, fuzzy #| msgid "Click to select" msgid "Click to sort" -msgstr "Πατήστε για επιλογή" +msgstr "Πατήστε για ταξινόμηση" #: libraries/display_tbl.lib.php:413 msgid "Click to mark/unmark" -msgstr "" +msgstr "Πατήστε για εναλλαγή επισήμανσης" #: libraries/display_tbl.lib.php:425 #, php-format @@ -8115,10 +8108,9 @@ msgid "wildcard" msgstr "μπαλαντέρ" #: server_privileges.php:2295 -#, fuzzy #| msgid "View %s has been dropped" msgid "User has been added." -msgstr "Η προβολή %s διαγράφτηκε" +msgstr "Ο χρήστης προστέθηκε." #: server_replication.php:49 msgid "Unknown error" @@ -8377,71 +8369,62 @@ msgid "Runtime Information" msgstr "Πληροφορίες εκτέλεσης" #: server_status.php:371 -#, fuzzy #| msgid "Server Choice" msgid "Server traffic" -msgstr "Επιλογή Διακομιστή" +msgstr "Κυκλοφορία Διακομιστή" #: server_status.php:372 msgid "Query statistics" msgstr "Στατιστικά ερωτήματος" #: server_status.php:373 -#, fuzzy #| msgid "See slave status table" msgid "All status variables" -msgstr "Δείτε τον πίνακα κατάστασης δευτερεύοντος" +msgstr "Όλες οι μεταβλητές κατάστασης" #: server_status.php:383 server_status.php:416 -#, fuzzy #| msgid "Refresh" msgid "Refresh rate" -msgstr "Ανανέωση" +msgstr "Ρυθμός ανανέωσης" #: server_status.php:384 server_status.php:417 -#, fuzzy #| msgid "Second" msgid "second" -msgstr "Δευτερόλεπτο" +msgstr "δευτερόλεπτο" #: server_status.php:385 server_status.php:386 server_status.php:387 #: server_status.php:388 server_status.php:389 server_status.php:418 #: server_status.php:419 server_status.php:420 server_status.php:421 #: server_status.php:422 -#, fuzzy #| msgid "Second" msgid "seconds" -msgstr "Δευτερόλεπτο" +msgstr "δευτερόλεπτα" #: server_status.php:390 server_status.php:391 server_status.php:392 #: server_status.php:393 server_status.php:423 server_status.php:424 #: server_status.php:425 server_status.php:426 -#, fuzzy #| msgid "Minute" msgid "minutes" -msgstr "Λεπτό" +msgstr "λεπτά" #: server_status.php:446 -#, fuzzy #| msgid "Do not change the password" msgid "Containing the word:" -msgstr "Διατήρηση κωδικού πρόσβασης" +msgstr "Να περιλαμβάνει τη λέξη:" #: server_status.php:451 -#, fuzzy #| msgid "Show open tables" msgid "Show only alert values" -msgstr "Εμφάνιση ανοιχτών πινάκων" +msgstr "Εμφάνιση μόνο τιμών ειδοποίησης" #: server_status.php:455 msgid "Filter by category..." -msgstr "" +msgstr "Φιλτράρισμα ανά κατηγορία..." #: server_status.php:468 -#, fuzzy #| msgid "Related Links" msgid "Related links:" -msgstr "Σχετικοί Σύνδεσμοι" +msgstr "Σχετικοί σύνδεσμοι:" #: server_status.php:513 server_status.php:545 server_status.php:666 #: server_status.php:711 @@ -8463,12 +8446,12 @@ msgstr "Τύπος ερωτήματος" #. l10n: # = Amount of queries #: server_status.php:543 msgid "#" -msgstr "" +msgstr "#" #: server_status.php:615 #, php-format msgid "Network traffic since startup: %s" -msgstr "" +msgstr "Κυκλοφορία δικτύου από την εκκίνηση: %s" #: server_status.php:623 #, php-format @@ -8550,13 +8533,13 @@ msgstr "Διεργασίες" #: server_status.php:785 msgid "ID" -msgstr "ID" +msgstr "Κωδικός" #: server_status.php:846 -#, fuzzy #| msgid "Whether to enable SSL for connection to MySQL server." msgid "The number of failed attempts to connect to the MySQL server." -msgstr "Ενεργοποιεί/Απενεργοποιεί το SSL για σύνδεση στο διακομιστή MySQL." +msgstr "" +"Ο αριθμός των αποτυχημένων προσπαθειών για σύνδεση στο διακομιστή MySQL." #: server_status.php:847 msgid "" @@ -8578,6 +8561,8 @@ msgstr "" msgid "" "The number of connection attempts (successful or not) to the MySQL server." msgstr "" +"Ο αριθμός των προσπαθειών για σύνδεση (επιτυχημένων ή όχι) στο διακομιστή " +"MySQL." #: server_status.php:850 msgid "" @@ -9025,6 +9010,8 @@ msgid "" "The maximum number of connections that have been in use simultaneously since " "the server started." msgstr "" +"Ο μέγιστος αριθμός συνδέσεων που ήταν σε σύνδεση ταυτόχρονα από την εκκίνηση " +"του διακομιστή." #: server_status.php:921 msgid "The number of rows waiting to be written in INSERT DELAYED queues." @@ -9060,6 +9047,9 @@ msgid "" "fragmentation issues, which may be solved by issuing a FLUSH QUERY CACHE " "statement." msgstr "" +"Ο αριθμός των ελεύθερων μπλόκς στη λανθάνουσα μνήμη ερωτημάτων. Υψηλές τιμές " +"ίσως κρύβουν θέματα συγκρότησης, που μπορούν να διορθωθούν χρησιμοποιώντας " +"την εντολή FLUSH QUERY CACHE." #: server_status.php:927 msgid "The amount of free memory for query cache." @@ -9818,10 +9808,9 @@ msgid "Line" msgstr "Γραμμή" #: tbl_chart.php:88 -#, fuzzy #| msgid "Inline" msgid "Spline" -msgstr "Εσωτερικό" +msgstr "Καμπύλη γραμμή" #: tbl_chart.php:89 msgid "Pie" @@ -9832,50 +9821,43 @@ msgid "Stacked" msgstr "Σταθεροποιημένο" #: tbl_chart.php:94 -#, fuzzy #| msgid "Report title:" msgid "Chart title" -msgstr "Τίτλος αναφοράς:" +msgstr "Τίτλος διαγράμματος" #: tbl_chart.php:99 msgid "X-Axis:" -msgstr "" +msgstr "Άξονας Χ:" #: tbl_chart.php:113 -#, fuzzy #| msgid "SQL queries" msgid "Series:" -msgstr "Ερωτήματα SQL" +msgstr "Σειρές:" #: tbl_chart.php:115 -#, fuzzy #| msgid "Textarea columns" msgid "The remaining columns" -msgstr "Στήλες περιοχής κειμένου (textarea)" +msgstr "Οι απομένουσες στήλες" #: tbl_chart.php:128 -#, fuzzy #| msgid "X Axis label" msgid "X-Axis label:" -msgstr "Ετικέτα άξονα Χ" +msgstr "Ετικέτα άξονα Χ:" #: tbl_chart.php:128 -#, fuzzy #| msgid "Value" msgid "X Values" -msgstr "Τιμή" +msgstr "Τιμές Χ" #: tbl_chart.php:129 -#, fuzzy #| msgid "Y Axis label" msgid "Y-Axis label:" -msgstr "Ετικέτα άξονα Υ" +msgstr "Ετικέτα άξονα Υ:" #: tbl_chart.php:129 -#, fuzzy #| msgid "Value" msgid "Y Values" -msgstr "Τιμή" +msgstr "Τιμές Υ" #: tbl_create.php:56 #, php-format diff --git a/po/ru.po b/po/ru.po index 5da649a..283aaf1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-15 08:36-0400\n" -"PO-Revision-Date: 2011-06-09 00:25+0200\n" +"PO-Revision-Date: 2011-06-16 22:26+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.5\n" @@ -1016,10 +1016,9 @@ msgstr "Введите число!" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:51 -#, fuzzy #| msgid "Log file count" msgid "Total count" -msgstr "Количество файлов журнала" +msgstr "Общее количество" #: js/messages.php:54 msgid "The host name is empty!" @@ -1056,24 +1055,22 @@ msgid "Close" msgstr "Закрыть" #: js/messages.php:64 server_status.php:397 -#, fuzzy #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "Выбор сервера" +msgstr "Графический вывод трафика" #: js/messages.php:65 server_status.php:400 msgid "Live conn./process chart" -msgstr "" +msgstr "Графический вывод соединений и процессов" #: js/messages.php:66 server_status.php:429 -#, fuzzy #| msgid "Show query chart" msgid "Live query chart" -msgstr "Вывести график запроса" +msgstr "Графический вывод запросов" #: js/messages.php:68 msgid "Static data" -msgstr "" +msgstr "Статические данные" #. l10n: Total number of queries #: js/messages.php:70 libraries/build_html_for_db.lib.php:45 @@ -1086,7 +1083,7 @@ msgstr "Всего" #. l10n: Other, small valued, queries #: js/messages.php:72 server_status.php:592 msgid "Other" -msgstr "" +msgstr "Другое" #. l10n: Thousands separator #: js/messages.php:74 libraries/common.lib.php:1375 @@ -4982,24 +4979,22 @@ msgid "Language" msgstr "Язык" #: libraries/display_tbl.lib.php:397 -#, fuzzy #| msgid "Textarea columns" msgid "Restore column order" -msgstr "Столбцов в текстовом поле" +msgstr "Восстановить порядок столбцов" #: libraries/display_tbl.lib.php:411 msgid "Drag to reorder" -msgstr "" +msgstr "Изменить порядок перетаскиванием" #: libraries/display_tbl.lib.php:412 -#, fuzzy #| msgid "Click to select" msgid "Click to sort" -msgstr "Выделение" +msgstr "Кликнуть для сортировки" #: libraries/display_tbl.lib.php:413 msgid "Click to mark/unmark" -msgstr "" +msgstr "Кликнуть для снятия/установки отметки" #: libraries/display_tbl.lib.php:425 #, php-format @@ -8345,71 +8340,62 @@ msgid "Runtime Information" msgstr "Текущее состояние MySQL" #: server_status.php:371 -#, fuzzy #| msgid "Server Choice" msgid "Server traffic" -msgstr "Выбор сервера" +msgstr "Трафик сервера" #: server_status.php:372 msgid "Query statistics" msgstr "Статистика запросов" #: server_status.php:373 -#, fuzzy #| msgid "See slave status table" msgid "All status variables" -msgstr "Смотрите таблицу состояния подчинённого сервера" +msgstr "Все переменные состояния" #: server_status.php:383 server_status.php:416 -#, fuzzy #| msgid "Refresh" msgid "Refresh rate" -msgstr "Обновить" +msgstr "Частота обновления" #: server_status.php:384 server_status.php:417 -#, fuzzy #| msgid "Second" msgid "second" -msgstr "Секунда" +msgstr "секунда" #: server_status.php:385 server_status.php:386 server_status.php:387 #: server_status.php:388 server_status.php:389 server_status.php:418 #: server_status.php:419 server_status.php:420 server_status.php:421 #: server_status.php:422 -#, fuzzy #| msgid "Second" msgid "seconds" -msgstr "Секунда" +msgstr "секунды" #: server_status.php:390 server_status.php:391 server_status.php:392 #: server_status.php:393 server_status.php:423 server_status.php:424 #: server_status.php:425 server_status.php:426 -#, fuzzy #| msgid "Minute" msgid "minutes" -msgstr "Минута" +msgstr "минуты" #: server_status.php:446 -#, fuzzy #| msgid "Do not change the password" msgid "Containing the word:" -msgstr "Не менять пароль" +msgstr "Содержит слово:" #: server_status.php:451 -#, fuzzy #| msgid "Show open tables" msgid "Show only alert values" -msgstr "Список открытых таблиц" +msgstr "Выводить только предупреждающие значения" #: server_status.php:455 msgid "Filter by category..." -msgstr "" +msgstr "Фильтр по категории..." #: server_status.php:468 -#, fuzzy #| msgid "Related Links" msgid "Related links:" -msgstr "Дополнительные ссылки" +msgstr "Связанные ссылки:" #: server_status.php:513 server_status.php:545 server_status.php:666 #: server_status.php:711 @@ -8431,12 +8417,12 @@ msgstr "Тип запроса" #. l10n: # = Amount of queries #: server_status.php:543 msgid "#" -msgstr "" +msgstr "Кол-во" #: server_status.php:615 #, php-format msgid "Network traffic since startup: %s" -msgstr "" +msgstr "Сетевой трафик с момента запуска: %s" #: server_status.php:623 #, php-format @@ -8517,10 +8503,9 @@ msgid "ID" msgstr "ID" #: server_status.php:846 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "The number of failed attempts to connect to the MySQL server." -msgstr "Невозможно соединиться с сервером MySQL" +msgstr "Количество неудавшихся попыток соединения к серверу MySQL." #: server_status.php:847 msgid "" @@ -8539,7 +8524,7 @@ msgstr "Количество транзакций, использовавших #: server_status.php:849 msgid "" "The number of connection attempts (successful or not) to the MySQL server." -msgstr "" +msgstr "Количество попыток соединения (успешных либо нет) к серверу MySQL." #: server_status.php:850 msgid "" @@ -8973,6 +8958,8 @@ msgid "" "The maximum number of connections that have been in use simultaneously since " "the server started." msgstr "" +"Максимальное количество соединений использованных одновременно начиная с " +"запуска сервера." #: server_status.php:921 msgid "The number of rows waiting to be written in INSERT DELAYED queues." @@ -9006,6 +8993,9 @@ msgid "" "fragmentation issues, which may be solved by issuing a FLUSH QUERY CACHE " "statement." msgstr "" +"Количество свободных блоков памяти в кеше запроса. Высокое значение может " +"указывать на фрагментацию, проблема которой решается выполнением запроса " +"FLUSH QUERY CACHE." #: server_status.php:927 msgid "The amount of free memory for query cache." @@ -9764,10 +9754,9 @@ msgid "Line" msgstr "Линия" #: tbl_chart.php:88 -#, fuzzy #| msgid "Inline" msgid "Spline" -msgstr "Быстрая правка" +msgstr "Сплайн" #: tbl_chart.php:89 msgid "Pie" @@ -9778,50 +9767,43 @@ msgid "Stacked" msgstr "Уложенный" #: tbl_chart.php:94 -#, fuzzy #| msgid "Report title:" msgid "Chart title" -msgstr "Заголовок отчета:" +msgstr "Заголовок графика" #: tbl_chart.php:99 msgid "X-Axis:" -msgstr "" +msgstr "Ось-X:" #: tbl_chart.php:113 -#, fuzzy #| msgid "SQL queries" msgid "Series:" -msgstr "SQL запросы" +msgstr "Серии:" #: tbl_chart.php:115 -#, fuzzy #| msgid "Textarea columns" msgid "The remaining columns" -msgstr "Столбцов в текстовом поле" +msgstr "Оставшиеся столбцы" #: tbl_chart.php:128 -#, fuzzy #| msgid "X Axis label" msgid "X-Axis label:" -msgstr "Подпись для оси X" +msgstr "Подпись для оси X:" #: tbl_chart.php:128 -#, fuzzy #| msgid "Value" msgid "X Values" -msgstr "Значение" +msgstr "Значения X" #: tbl_chart.php:129 -#, fuzzy #| msgid "Y Axis label" msgid "Y-Axis label:" -msgstr "Подпись для оси Y" +msgstr "Подпись для оси Y:" #: tbl_chart.php:129 -#, fuzzy #| msgid "Value" msgid "Y Values" -msgstr "Значение" +msgstr "Значения Y" #: tbl_create.php:56 #, php-format diff --git a/po/sl.po b/po/sl.po index dab48e3..f1139fb 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-15 08:36-0400\n" -"PO-Revision-Date: 2011-06-10 22:40+0200\n" +"PO-Revision-Date: 2011-06-16 22:33+0200\n" "Last-Translator: Domen <dbc334(a)gmail.com>\n" "Language-Team: slovenian <sl(a)li.org>\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3);\n" "X-Generator: Pootle 2.0.5\n" #: browse_foreigners.php:35 browse_foreigners.php:53 @@ -1014,10 +1014,9 @@ msgstr "To ni število!" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:51 -#, fuzzy #| msgid "Log file count" msgid "Total count" -msgstr "Število dnevniških datotek" +msgstr "Skupno število" #: js/messages.php:54 msgid "The host name is empty!" @@ -1054,24 +1053,22 @@ msgid "Close" msgstr "Zapri" #: js/messages.php:64 server_status.php:397 -#, fuzzy #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "Izbira strežnika" +msgstr "Grafikon prometa v živo" #: js/messages.php:65 server_status.php:400 msgid "Live conn./process chart" -msgstr "" +msgstr "Grafikon povezav/procesov v živo" #: js/messages.php:66 server_status.php:429 -#, fuzzy #| msgid "Show query chart" msgid "Live query chart" -msgstr "Prikaži graf poizvedbe" +msgstr "Grafikon poizvedb v živo" #: js/messages.php:68 msgid "Static data" -msgstr "" +msgstr "Statični podatki" #. l10n: Total number of queries #: js/messages.php:70 libraries/build_html_for_db.lib.php:45 @@ -1084,7 +1081,7 @@ msgstr "Skupaj" #. l10n: Other, small valued, queries #: js/messages.php:72 server_status.php:592 msgid "Other" -msgstr "" +msgstr "Drugo" #. l10n: Thousands separator #: js/messages.php:74 libraries/common.lib.php:1375 @@ -4936,24 +4933,22 @@ msgid "Language" msgstr "Jezik" #: libraries/display_tbl.lib.php:397 -#, fuzzy #| msgid "Textarea columns" msgid "Restore column order" -msgstr "Stolpcev besedilnega polja" +msgstr "Obnovi vrstni red stolpcev" #: libraries/display_tbl.lib.php:411 msgid "Drag to reorder" -msgstr "" +msgstr "Povlecite za preureditev" #: libraries/display_tbl.lib.php:412 -#, fuzzy #| msgid "Click to select" msgid "Click to sort" -msgstr "Kliknite za označitev" +msgstr "Kliknite za razvrstitev" #: libraries/display_tbl.lib.php:413 msgid "Click to mark/unmark" -msgstr "" +msgstr "Kliknite za označitev/opustitev" #: libraries/display_tbl.lib.php:425 #, php-format @@ -8282,71 +8277,62 @@ msgid "Runtime Information" msgstr "Podatki o izvajanju" #: server_status.php:371 -#, fuzzy #| msgid "Server Choice" msgid "Server traffic" -msgstr "Izbira strežnika" +msgstr "Promet strežnika" #: server_status.php:372 msgid "Query statistics" msgstr "Statistika poizvedb" #: server_status.php:373 -#, fuzzy #| msgid "See slave status table" msgid "All status variables" -msgstr "Oglej si tabelo stanj podrejencev" +msgstr "Vse spremenljivke stanja" #: server_status.php:383 server_status.php:416 -#, fuzzy #| msgid "Refresh" msgid "Refresh rate" -msgstr "Osveži" +msgstr "Hitrost osveževanja" #: server_status.php:384 server_status.php:417 -#, fuzzy #| msgid "Second" msgid "second" -msgstr "Sekunda" +msgstr "sekunda" #: server_status.php:385 server_status.php:386 server_status.php:387 #: server_status.php:388 server_status.php:389 server_status.php:418 #: server_status.php:419 server_status.php:420 server_status.php:421 #: server_status.php:422 -#, fuzzy #| msgid "Second" msgid "seconds" -msgstr "Sekunda" +msgstr "sekund" #: server_status.php:390 server_status.php:391 server_status.php:392 #: server_status.php:393 server_status.php:423 server_status.php:424 #: server_status.php:425 server_status.php:426 -#, fuzzy #| msgid "Minute" msgid "minutes" -msgstr "Minuta" +msgstr "minut" #: server_status.php:446 -#, fuzzy #| msgid "Do not change the password" msgid "Containing the word:" -msgstr "Ne spreminjaj gesla" +msgstr "Vsebuje besedo:" #: server_status.php:451 -#, fuzzy #| msgid "Show open tables" msgid "Show only alert values" -msgstr "Pokaži odprte tabele" +msgstr "Prikaži samo opozorilne vrednosti" #: server_status.php:455 msgid "Filter by category..." -msgstr "" +msgstr "Filtriraj po kategoriji ..." #: server_status.php:468 -#, fuzzy #| msgid "Related Links" msgid "Related links:" -msgstr "Sorodne povezave" +msgstr "Sorodne povezave:" #: server_status.php:513 server_status.php:545 server_status.php:666 #: server_status.php:711 @@ -8368,12 +8354,12 @@ msgstr "Vrsta poizvedbe" #. l10n: # = Amount of queries #: server_status.php:543 msgid "#" -msgstr "" +msgstr "Št." #: server_status.php:615 #, php-format msgid "Network traffic since startup: %s" -msgstr "" +msgstr "Promet omrežja od zagona: %s" #: server_status.php:623 #, php-format @@ -8456,10 +8442,9 @@ msgid "ID" msgstr "ID" #: server_status.php:846 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "The number of failed attempts to connect to the MySQL server." -msgstr "Ne morem se povezati s strežnikom MySQL" +msgstr "Število spodletelih poskusov povezave s strežnikom MySQL." #: server_status.php:847 msgid "" @@ -8480,7 +8465,7 @@ msgstr "" #: server_status.php:849 msgid "" "The number of connection attempts (successful or not) to the MySQL server." -msgstr "" +msgstr "Število poskusov povezave (uspešnih ali ne) na strežnik MySQL." #: server_status.php:850 msgid "" @@ -8903,7 +8888,7 @@ msgstr "" msgid "" "The maximum number of connections that have been in use simultaneously since " "the server started." -msgstr "" +msgstr "Največje število sočasno uporabljenih povezav od zagona strežnika." #: server_status.php:921 msgid "The number of rows waiting to be written in INSERT DELAYED queues." @@ -8935,6 +8920,9 @@ msgid "" "fragmentation issues, which may be solved by issuing a FLUSH QUERY CACHE " "statement." msgstr "" +"Število prostih pomnilniških blokov v predpomnilniku poizvedb. Visoko " +"število lahko kaže na težave z razdrobljenostjo, kar lahko odpravite z " +"izvedbo stavka FLUSH QUERY CACHE." #: server_status.php:927 msgid "The amount of free memory for query cache." @@ -9666,10 +9654,9 @@ msgid "Line" msgstr "Črtni" #: tbl_chart.php:88 -#, fuzzy #| msgid "Inline" msgid "Spline" -msgstr "V vrstici" +msgstr "Zlepek" #: tbl_chart.php:89 msgid "Pie" @@ -9680,50 +9667,43 @@ msgid "Stacked" msgstr "Zloženi" #: tbl_chart.php:94 -#, fuzzy #| msgid "Report title:" msgid "Chart title" -msgstr "Naslov poročila:" +msgstr "Naslov grafikona" #: tbl_chart.php:99 msgid "X-Axis:" -msgstr "" +msgstr "Os x:" #: tbl_chart.php:113 -#, fuzzy #| msgid "SQL queries" msgid "Series:" -msgstr "Poizvedbe SQL" +msgstr "Serije:" #: tbl_chart.php:115 -#, fuzzy #| msgid "Textarea columns" msgid "The remaining columns" -msgstr "Stolpcev besedilnega polja" +msgstr "Preostali stolpci" #: tbl_chart.php:128 -#, fuzzy #| msgid "X Axis label" msgid "X-Axis label:" -msgstr "Oznaka osi X" +msgstr "Oznaka osi x:" #: tbl_chart.php:128 -#, fuzzy #| msgid "Value" msgid "X Values" -msgstr "Vrednost" +msgstr "Vrednosti x" #: tbl_chart.php:129 -#, fuzzy #| msgid "Y Axis label" msgid "Y-Axis label:" -msgstr "Oznaka osi Y" +msgstr "Oznaka osi y:" #: tbl_chart.php:129 -#, fuzzy #| msgid "Value" msgid "Y Values" -msgstr "Vrednost" +msgstr "Vrednosti y" #: tbl_create.php:56 #, php-format diff --git a/po/tr.po b/po/tr.po index 7972529..058b9d5 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-15 08:36-0400\n" -"PO-Revision-Date: 2011-06-08 16:30+0200\n" +"PO-Revision-Date: 2011-06-16 21:00+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n" @@ -963,7 +963,7 @@ msgstr "Bütün bir tabloyu YOK ETMEK üzeresiniz!" #: js/messages.php:33 msgid "You are about to TRUNCATE a complete table!" -msgstr "Bütün bir tabloyu KESMEK üzeresiniz!" +msgstr "Bütün bir tabloyu KESMEK üzeresiniz!" #: js/messages.php:34 msgid "Dropping Event" @@ -1006,10 +1006,9 @@ msgstr "Bu bir sayı değil!" #. l10n: Default description for the y-Axis of Charts #: js/messages.php:51 -#, fuzzy #| msgid "Log file count" msgid "Total count" -msgstr "Günlük dosyası sayısı" +msgstr "Toplam sayı" #: js/messages.php:54 msgid "The host name is empty!" @@ -1046,24 +1045,22 @@ msgid "Close" msgstr "Kapat" #: js/messages.php:64 server_status.php:397 -#, fuzzy #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "Sunucu Seçimi" +msgstr "Canlı trafik çizelgesi" #: js/messages.php:65 server_status.php:400 msgid "Live conn./process chart" -msgstr "" +msgstr "Canlı bağ./işlem çizelgesi" #: js/messages.php:66 server_status.php:429 -#, fuzzy #| msgid "Show query chart" msgid "Live query chart" -msgstr "Sorgu çizelgesini göster" +msgstr "Canlı sorgu çizelgesi" #: js/messages.php:68 msgid "Static data" -msgstr "" +msgstr "Sabit veri" #. l10n: Total number of queries #: js/messages.php:70 libraries/build_html_for_db.lib.php:45 @@ -1076,7 +1073,7 @@ msgstr "Toplam" #. l10n: Other, small valued, queries #: js/messages.php:72 server_status.php:592 msgid "Other" -msgstr "" +msgstr "Diğer" #. l10n: Thousands separator #: js/messages.php:74 libraries/common.lib.php:1375 @@ -4945,24 +4942,22 @@ msgid "Language" msgstr "Dil" #: libraries/display_tbl.lib.php:397 -#, fuzzy #| msgid "Textarea columns" msgid "Restore column order" -msgstr "Metin alanı sütunları" +msgstr "Sütun düzenini geri yükle" #: libraries/display_tbl.lib.php:411 msgid "Drag to reorder" -msgstr "" +msgstr "Yen.düzenleme için sürükle" #: libraries/display_tbl.lib.php:412 -#, fuzzy #| msgid "Click to select" msgid "Click to sort" -msgstr "Seçmek için tıklayın" +msgstr "Sıralamak için tıklayın" #: libraries/display_tbl.lib.php:413 msgid "Click to mark/unmark" -msgstr "" +msgstr "İşaretlemek/işareti kaldırmak için tıklayın" #: libraries/display_tbl.lib.php:425 #, php-format @@ -8293,71 +8288,62 @@ msgid "Runtime Information" msgstr "Çalışma Süresi Bilgisi" #: server_status.php:371 -#, fuzzy #| msgid "Server Choice" msgid "Server traffic" -msgstr "Sunucu Seçimi" +msgstr "Sunucu trafiği" #: server_status.php:372 msgid "Query statistics" msgstr "Sorgu istatistikleri" #: server_status.php:373 -#, fuzzy #| msgid "See slave status table" msgid "All status variables" -msgstr "Slave durum tablosuna bak" +msgstr "Tüm durum değişkenleri" #: server_status.php:383 server_status.php:416 -#, fuzzy #| msgid "Refresh" msgid "Refresh rate" -msgstr "Yenile" +msgstr "Oranı yenile" #: server_status.php:384 server_status.php:417 -#, fuzzy #| msgid "Second" msgid "second" -msgstr "Saniye" +msgstr "saniye" #: server_status.php:385 server_status.php:386 server_status.php:387 #: server_status.php:388 server_status.php:389 server_status.php:418 #: server_status.php:419 server_status.php:420 server_status.php:421 #: server_status.php:422 -#, fuzzy #| msgid "Second" msgid "seconds" -msgstr "Saniye" +msgstr "saniye" #: server_status.php:390 server_status.php:391 server_status.php:392 #: server_status.php:393 server_status.php:423 server_status.php:424 #: server_status.php:425 server_status.php:426 -#, fuzzy #| msgid "Minute" msgid "minutes" -msgstr "Dakika" +msgstr "dakika" #: server_status.php:446 -#, fuzzy #| msgid "Do not change the password" msgid "Containing the word:" -msgstr "Parolayı değiştirme" +msgstr "İçerdiği kelime:" #: server_status.php:451 -#, fuzzy #| msgid "Show open tables" msgid "Show only alert values" -msgstr "Açık tabloları göster" +msgstr "Sadece uyarı değerlerini göster" #: server_status.php:455 msgid "Filter by category..." -msgstr "" +msgstr "Kategoriye göre süz..." #: server_status.php:468 -#, fuzzy #| msgid "Related Links" msgid "Related links:" -msgstr "İlgili Bağlantılar" +msgstr "İlgili bağlantılar:" #: server_status.php:513 server_status.php:545 server_status.php:666 #: server_status.php:711 @@ -8379,12 +8365,12 @@ msgstr "Sorgu türü" #. l10n: # = Amount of queries #: server_status.php:543 msgid "#" -msgstr "" +msgstr "#" #: server_status.php:615 #, php-format msgid "Network traffic since startup: %s" -msgstr "" +msgstr "Başlangıçtan bu yana ağ trafiği: %s" #: server_status.php:623 #, php-format @@ -8468,10 +8454,9 @@ msgid "ID" msgstr "ID" #: server_status.php:846 -#, fuzzy #| msgid "Whether to enable SSL for connection to MySQL server." msgid "The number of failed attempts to connect to the MySQL server." -msgstr "MySQL sunucusuna bağlanmak için SSL etkinleştirmek." +msgstr "MySQL sunucusuna bağlanmak için başarısız girişim sayısı." #: server_status.php:847 msgid "" @@ -8490,7 +8475,7 @@ msgstr "Geçici binari günlüğü önbelleğinde kullanılan işlemlerin sayıs #: server_status.php:849 msgid "" "The number of connection attempts (successful or not) to the MySQL server." -msgstr "" +msgstr "MySQL sunucusuna bağlantı girişimi (başarılı ya da değil) sayısı." #: server_status.php:850 msgid "" @@ -8917,6 +8902,8 @@ msgid "" "The maximum number of connections that have been in use simultaneously since " "the server started." msgstr "" +"Sunucunun başlatılmasından bu yana kullanımda olan eşzamanlı en fazla " +"bağlantı sayısı." #: server_status.php:921 msgid "The number of rows waiting to be written in INSERT DELAYED queues." @@ -8948,6 +8935,9 @@ msgid "" "fragmentation issues, which may be solved by issuing a FLUSH QUERY CACHE " "statement." msgstr "" +"Sorgu önbelleğinde boş bellek blokları sayısıdır. Yüksek sayılar, FLUSH " +"QUERY CACHE ifadesinin çıkmasıyla çözülebilen, parçalanma sorunlarını işaret " +"edebilir." #: server_status.php:927 msgid "The amount of free memory for query cache." @@ -9680,10 +9670,9 @@ msgid "Line" msgstr "Satır" #: tbl_chart.php:88 -#, fuzzy #| msgid "Inline" msgid "Spline" -msgstr "Sıralı" +msgstr "Şerit" #: tbl_chart.php:89 msgid "Pie" @@ -9694,50 +9683,43 @@ msgid "Stacked" msgstr "İstiflendi" #: tbl_chart.php:94 -#, fuzzy #| msgid "Report title:" msgid "Chart title" -msgstr "Rapor başlığı:" +msgstr "Çizelge başlığı" #: tbl_chart.php:99 msgid "X-Axis:" -msgstr "" +msgstr "X-Ekseni:" #: tbl_chart.php:113 -#, fuzzy #| msgid "SQL queries" msgid "Series:" -msgstr "SQL sorguları" +msgstr "Dizi:" #: tbl_chart.php:115 -#, fuzzy #| msgid "Textarea columns" msgid "The remaining columns" -msgstr "Metin alanı sütunları" +msgstr "Kalan sütunlar" #: tbl_chart.php:128 -#, fuzzy #| msgid "X Axis label" msgid "X-Axis label:" -msgstr "X Ekseni etiketi" +msgstr "X-Ekseni etiketi:" #: tbl_chart.php:128 -#, fuzzy #| msgid "Value" msgid "X Values" -msgstr "Değer" +msgstr "X Değeri" #: tbl_chart.php:129 -#, fuzzy #| msgid "Y Axis label" msgid "Y-Axis label:" -msgstr "Y Ekseni etiketi" +msgstr "Y-Ekseni etiketi:" #: tbl_chart.php:129 -#, fuzzy #| msgid "Value" msgid "Y Values" -msgstr "Değer" +msgstr "Y Değeri" #: tbl_create.php:56 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. d108ed6dab411e6ea6f0c329a610c7b55cc01ba9
by Michal Čihař 17 Jun '11

17 Jun '11

The branch, master has been updated via d108ed6dab411e6ea6f0c329a610c7b55cc01ba9 (commit) via bbd815ad09a3612512f93fdf86e53b4f6c87ec46 (commit) via 77997946abbe72a37b123a70562829cd8f2a6b1a (commit) via 0e5a0659392d138d648bc394496fc213201bf282 (commit) via 11eb97869ab68321c3a49b13d5af6ed0b200ac0c (commit) via e751944c912712b1229f96e2182cb62fb435a2b2 (commit) via c02aa1ffbcf8252ac1f8adae115e5d0bb29c578e (commit) via 740bc5a99effebc0c20acc66d824dbd6ec6be7c4 (commit) via e26beaa2407d69196a8923e7dbec57754ba5d63a (commit) via 29d02320d7a22fea9fb6fa3dd0ecd0a6ffe166ab (commit) via e312a137364283aeb405444a357e3abffe128056 (commit) via 13b978b6b6934179b18305e0dcc633a233396e84 (commit) via 227fbd0dfa31abb65beec00d489bb72825115c72 (commit) via 91b4155d0e28c24e37d93b2fa849fb411039ba0c (commit) via 47420d08197c8413a55406c04225a1d862f6545c (commit) via cb27263db3714c974c12eeb24f366f5909a841d1 (commit) via 02d4d334796ff10ef5081961b249b84aa9c23e75 (commit) from c2726464132da46289b9a2fb8567122fc613750f (commit) - Log ----------------------------------------------------------------- commit d108ed6dab411e6ea6f0c329a610c7b55cc01ba9 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Jun 16 21:04:30 2011 +0200 Translation update done using Pootle. commit bbd815ad09a3612512f93fdf86e53b4f6c87ec46 Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:49:50 2011 +0200 Translation update done using Pootle. commit 77997946abbe72a37b123a70562829cd8f2a6b1a Author: Matías Bellone <matiasbellone(a)gmail.com> Date: Wed Jun 15 22:49:25 2011 +0200 Translation update done using Pootle. commit 0e5a0659392d138d648bc394496fc213201bf282 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:54:31 2011 +0200 Translation update done using Pootle. commit 11eb97869ab68321c3a49b13d5af6ed0b200ac0c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:53:23 2011 +0200 Translation update done using Pootle. commit e751944c912712b1229f96e2182cb62fb435a2b2 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:53:06 2011 +0200 Translation update done using Pootle. commit c02aa1ffbcf8252ac1f8adae115e5d0bb29c578e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:52:30 2011 +0200 Translation update done using Pootle. commit 740bc5a99effebc0c20acc66d824dbd6ec6be7c4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:52:04 2011 +0200 Translation update done using Pootle. commit e26beaa2407d69196a8923e7dbec57754ba5d63a Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:51:37 2011 +0200 Translation update done using Pootle. commit 29d02320d7a22fea9fb6fa3dd0ecd0a6ffe166ab Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:51:01 2011 +0200 Translation update done using Pootle. commit e312a137364283aeb405444a357e3abffe128056 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:49:42 2011 +0200 Translation update done using Pootle. commit 13b978b6b6934179b18305e0dcc633a233396e84 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:49:29 2011 +0200 Translation update done using Pootle. commit 227fbd0dfa31abb65beec00d489bb72825115c72 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:49:18 2011 +0200 Translation update done using Pootle. commit 91b4155d0e28c24e37d93b2fa849fb411039ba0c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:49:09 2011 +0200 Translation update done using Pootle. commit 47420d08197c8413a55406c04225a1d862f6545c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:48:59 2011 +0200 Translation update done using Pootle. commit cb27263db3714c974c12eeb24f366f5909a841d1 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:48:50 2011 +0200 Translation update done using Pootle. commit 02d4d334796ff10ef5081961b249b84aa9c23e75 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Wed Jun 15 11:47:31 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/es.po | 15 +++++------ po/ja.po | 79 ++++++++++++++++++++++++++++++++----------------------------- po/tr.po | 9 +++---- 3 files changed, 52 insertions(+), 51 deletions(-) diff --git a/po/es.po b/po/es.po index 8abc651..f8d8337 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-13 11:22+0300\n" -"PO-Revision-Date: 2011-06-09 17:30+0200\n" +"PO-Revision-Date: 2011-06-15 22:49+0200\n" "Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n" "Language-Team: none\n" "Language: es\n" @@ -3517,7 +3517,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1328 -#, fuzzy msgid "" "Name of PHP script to be sourced and executed to obtain login credentials. " "This is alternative approach to session based single signon. The script " @@ -3528,10 +3527,11 @@ msgid "" msgstr "" "Nombre del script PHP a ser cargado y ejecutado para obtener credenciales de " "inicio de sesión. Este es un enfoque alternativo para un inicio de sesión " -"único. El script necesita proveer una función <code>get_login_credentials</" -"code> que devuelva una lista de nombres de usuarios y contraseñas, aceptando " -"un sólo parámetro: el nombre de usuario actual (puede estar vacío). Revisa " -"<code>scripts/signon-script.php</code> para ver un ejemplo." +"único basado en sesiones. El script necesita proveer una función " +"<code>get_login_credentials</code> que devuelva una lista de nombres de " +"usuarios y contraseñas, aceptando un sólo parámetro: el nombre de usuario " +"actual (puede estar vacío). Revisa <code>scripts/signon-script.php</code> " +"para ver un ejemplo." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1335 @@ -9889,13 +9889,12 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3536 -#, fuzzy msgid "" "There is no reliable way to differentiate tables in CSV format. For the time " "being, you will have to break apart CSV files containing multiple tables." msgstr "" "No hay una forma confiable de diferenciar tablas en el formato CSV. Por el " -"momento necesitarás dividir los archivos CSV que contengan mas de una tabla." +"momento necesitarás dividir los archivos CSV que contengan más de una tabla." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3543 diff --git a/po/ja.po b/po/ja.po index 768b1e0..c597f42 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-13 11:21+0300\n" -"PO-Revision-Date: 2011-06-14 12:02+0200\n" +"PO-Revision-Date: 2011-06-15 11:54+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: Japan <jp(a)li.org>\n" "Language: ja\n" @@ -301,15 +301,14 @@ msgid "" "abbr>, <abbr title=\"Microsoft Excel 97-2003 and Excel 2007\">Excel</abbr> " "and L<sup>A</sup>T<sub><big>E</big></sub>X formats" msgstr "" -"さまざまなフォーマットでデータをエクスポート<a href=\"#footnote_1\"><sup>1</" -"sup></a>：<abbr title=\"Comma Separated Values\">CSV</abbr>、<abbr title=" -"\"Extensible Markup Language\">XML</abbr>、<abbr title=\"ポータブル・ドキュメ" -"ント・フォーマット\">PDF</abbr>、<abbr title=\"International Standards " -"Organisation\">ISO</abbr>/<abbr title=\"International Electrotechnical " -"Commission\">IEC</abbr> 26300 (OpenDocument テキストおよびスプレッドシート)、" -"<abbr title=\"Microsoft Word 2000\">Word</abbr>、<abbr title=\"Microsoft " -"Excel 97-2003 および Excel 2007\">Excel</abbr>、L<sup>A</sup>T<sub><big>E</" -"big></sub>X" +"さまざまなフォーマットでデータをエクスポート<a href=\"#footnote_1\"><sup>1</sup></a>：<abbr " +"title=\"カンマ区切り\">CSV</abbr>、<abbr title=\"Extensible Markup " +"Language\">XML</abbr>、<abbr title=\"ポータブル・ドキュメント・フォーマット\">PDF</abbr>、<abbr " +"title=\"International Standards Organisation\">ISO</abbr>/<abbr " +"title=\"International Electrotechnical Commission\">IEC</abbr> 26300 " +"(OpenDocument テキストおよびスプレッドシート)、<abbr title=\"Microsoft Word " +"2000\">Word</abbr>、<abbr title=\"Microsoft Excel 97-2003 および Excel " +"2007\">Excel</abbr>、L<sup>A</sup>T<sub><big>E</big></sub>X" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:123 @@ -320,11 +319,11 @@ msgid "" "\"Comma Separated Values\">CSV</abbr>, and <abbr title=\"Server Query " "Language\">SQL</abbr> files" msgstr "" -"さまざまファイルよりデータおよび構造のインポートが行えます。<abbr title=" -"\"Microsoft Excel 97-2003 および Excel 2007\">Microsoft Excel</abbr>、" -"OpenDocument スプレッドシートにとどまらず、<abbr title=\"Extensible Markup " -"Language\">XML</abbr>、<abbr title=\"Comma Separated Values\">CSV</abbr>、も" -"ちろん <abbr title=\"Server Query Language\">SQL</abbr> ファイルも。" +"さまざまファイルよりデータおよび構造のインポートが行えます。<abbr title=\"Microsoft Excel 97-2003 および Excel " +"2007\">Microsoft Excel</abbr>、OpenDocument スプレッドシートにとどまらず、<abbr " +"title=\"Extensible Markup Language\">XML</abbr>、<abbr " +"title=\"カンマ区切り\">CSV</abbr>、もちろん <abbr title=\"Server Query " +"Language\">SQL</abbr> ファイルも。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:124 @@ -447,10 +446,9 @@ msgid "" "<tt>php.ini</tt>." msgstr "" "<sup>1)</sup> phpMyAdmin は、Zlib (<tt>--with-zlib</tt>)／Bzip2 (<tt>--with-" -"bz2</tt>) をサポートした PHP を利用すると、ダンプや <abbr title=\"comma " -"separated values\">CSV</abbr> エクスポートを（Zip、GZip -RFC 1952-、Bzip2 形" -"式で）圧縮できます。これらを適切に使用するには、<tt>php.ini</tt> の変更が必要" -"な場合もあります。" +"bz2</tt>) をサポートした PHP を利用すると、ダンプや <abbr title=\"カンマ区切り\">CSV</abbr> " +"エクスポートを（Zip、GZip -RFC 1952-、Bzip2 形式で）圧縮できます。これらを適切に使用するには、<tt>php.ini</tt> " +"の変更が必要な場合もあります。" #. type: Content of: <html><body><div><h2> #: orig-docs/Documentation.html:164 @@ -3387,6 +3385,9 @@ msgid "" "<tt>SHOW</tt> commands instead), because of speed issues when many databases " "are present. Currently used in some parts of the code, more to come." msgstr "" +"情報を取得するための <tt>INFORMATION_SCHEMA</tt> の使用を無効にします（代わりに <tt>SHOW</tt> " +"コマンドを使用します）。多くのデータベースが存在している場合に、<tt>INFORMATION_SCHEMA</tt> " +"は速度的な問題があります。現在は、コードの一部でしか使われていませんが、今後増えていきます。" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1318 @@ -3700,8 +3701,8 @@ msgid "" "Path for storing session data (<a href=\"http://php.net/session_save_path" "\">session_save_path PHP parameter</a>)." msgstr "" -"セッションデータを保存のためのパス（<a href=\"http://php.net/" -"session_save_path\">session_save_path PHP パラメータ</a>）" +"セッションデータを保存のためのパス（<a href=\"http://php.net/session_save_path\">PHP パラメータの " +"session_save_path</a>）" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1408 @@ -7467,9 +7468,8 @@ msgid "" "<a href=\"#faq1_7\">1.7 How can I GZip or Bzip a dump or a <abbr title=" "\"comma separated values\">CSV</abbr> export? It does not seem to work.</a>" msgstr "" -"<a href=\"#faq1_7\">1.7 どうすればダンプや <abbr title=\"comma separated " -"values\">CSV</abbr> エクスポートを GZip ないし Bzip 圧縮できるのでしょうか？ " -"動いていないようなんですが。</a>" +"<a href=\"#faq1_7\">1.7 どうすればダンプや <abbr title=\"カンマ区切り\">CSV</abbr> エクスポートを GZip " +"ないし Bzip 圧縮できるのでしょうか？動いていないようなんですが。</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2711 @@ -10198,9 +10198,8 @@ msgid "" "row of data in a <abbr title=\"comma separated values\">CSV</abbr> exported " "file. </a>" msgstr "" -"<a href=\"#faq5_10\">5.10 Netscape 4.75 では <abbr title=\"comma separated " -"values\">CSV</abbr> エクスポートファイルの各データ行の間に空行が入ってしまい" -"ます。</a>" +"<a href=\"#faq5_10\">5.10 Netscape 4.75 では <abbr title=\"カンマ区切り\">CSV</abbr> " +"エクスポートファイルの各データ行の間に空行が入ってしまいます。</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3774 @@ -10923,9 +10922,8 @@ msgid "" "No, it's MySQL that is doing <a href=\"http://dev.mysql.com/doc/en/silent-" "column-changes.html\">silent column type changing</a>." msgstr "" -"phpMyAdmin ではありません。MySQL が <a href=\"http://dev.mysql.com/doc/" -"refman/5.1/ja/silent-column-changes.html\">カラムの暗黙的な変更</a>を行ってい" -"るのです。" +"phpMyAdmin ではありません。MySQL が<a href=\"http://dev.mysql.com/doc/refman/5.1/ja" +"/silent-column-changes.html\">カラムの暗黙的な変更</a>を行っているのです。" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:4044 @@ -11542,12 +11540,11 @@ msgid "" "href=\"#cfg_TempDir\" class=\"configrule\">$cfg['TempDir']</a> to a place " "where the web server user can write (for example <tt>'./tmp'</tt>)." msgstr "" -"MS Excel では <abbr title=\"comma separated values\">CSV</abbr> 形式を使用す" -"ることができます。これなら特に設定もなく簡単に利用できますが、MS Excel のバー" -"ジョン 97 以降の形式での直接エクスポートも phpMyAdmin はサポートしています。" -"直接エクスポートを行うためには、ウェブサーバユーザで書き込みができる場所を " -"<a href=\"#cfg_TempDir\" class=\"configrule\">$cfg['TempDir']</a> に設定する" -"必要があります (例えば <tt>'./tmp'</tt>)。" +"MS Excel では <abbr title=\"カンマ区切り\">CSV</abbr> " +"形式を使用することができます。これなら特に設定もなく簡単に利用できますが、MS Excel のバージョン 97 以降の形式での直接エクスポートも " +"phpMyAdmin はサポートしています。直接エクスポートを行うためには、ウェブサーバユーザで書き込みができる場所を <a " +"href=\"#cfg_TempDir\" class=\"configrule\">$cfg['TempDir']</a> に設定する必要があります (例えば " +"<tt>'./tmp'</tt>)。" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4290 @@ -11589,7 +11586,7 @@ msgstr "" #: orig-docs/Documentation.html:4306 msgid "" "<a href=\"#faq6_25\">6.25 How does BLOB streaming work in phpMyAdmin?</a>" -msgstr "<a href=\"#faq6_25\">6.25 どうしたら phpMyAdmin で BLOB ストリームを機能させられますか？</a" +msgstr "<a href=\"#faq6_25\">6.25 どうしたら phpMyAdmin で BLOB ストリームを機能させられますか？</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4308 @@ -12703,7 +12700,7 @@ msgstr "Korakot Chaovavanich <korakot_at_iname.com>" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4727 msgid ""insert as new row" feature" -msgstr "" +msgstr "「新しい行として挿入する」機能" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4730 @@ -12832,6 +12829,8 @@ msgid "" "Christophe Gesché from the "MySQL Form Generator for " "PHPMyAdmin" (http://sf.net/projects/phpmysqlformgen/)" msgstr "" +"Christophe Gesché "MySQL Form Generator for PHPMyAdmin" " +"(http://sf.net/projects/phpmysqlformgen/) から" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4778 @@ -13753,6 +13752,8 @@ msgid "" "<a href=\"http://www.wikipedia.org/wiki/MIME\">MIME (Multipurpose Internet " "Mail Extensions)</a> - an Internet Standard for the format of e-mail." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/MIME\">MIME (Multipurpose Internet Mail " +"Extensions)</a> - 多目的インターネットメール拡張のことで、電子メールフォーマット（書式）におけるインターネット標準。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5108 @@ -13874,6 +13875,8 @@ msgid "" "new research, innovations, and methodologies applicable to Internet " "technologies." msgstr "" +"<a href=\"http://ja.wikipedia.org/wiki/Request_for_Comments\">RFC (Request for " +"Comments)</a> - インターネット技術に適用される新しい研究、技術革新、方法論を書き連ねた文章。" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:5141 diff --git a/po/tr.po b/po/tr.po index 8d6f989..ceb64b4 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-13 11:22+0300\n" -"PO-Revision-Date: 2011-06-12 18:26+0200\n" +"PO-Revision-Date: 2011-06-16 21:04+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -3492,7 +3492,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1328 -#, fuzzy msgid "" "Name of PHP script to be sourced and executed to obtain login credentials. " "This is alternative approach to session based single signon. The script " @@ -3504,9 +3503,9 @@ msgstr "" "Kaynak olan ve oturum açma referansları sağlamak için çalıştırılan PHP " "betiğin adıdır. Bu alternatif, oturum tabanlı tek oturumu açma yaklaşımıdır. " "Betiğin, kullanıcı adı ve parola listesini döndüren, mevcut kulanıcı adının " -"(boş olabilir) tek parametresini kabul eden <code>get_login_credentials</" -"code> işlevini sağlaması gerekir. Örnek için <code>scripts/signon-script." -"php</code>'ye bakın." +"(boş olabilir) tek parametresini kabul eden " +"<code>get_login_credentials</code> işlevini sağlaması gerekir. Örnek için " +"<code>scripts/signon-script.php</code>'ye bakın." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1335 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3867-g75f916f
by Michal Čihař 17 Jun '11

17 Jun '11

The branch, master has been updated via 75f916fd3c13333b655a72427d8158ce17c3995e (commit) via 14f8664272af543a16bb78a3c72e5cd64fae64b9 (commit) via bc19b678305a6ef1d9677122f56e389ceed5cd38 (commit) via f771e68a73dfca6199030c1598b23e92de50f64c (commit) via ab5d9b278a2360fcce78dd8a5b0142a46a14fa18 (commit) via 6f4b0f88d2e4bc85980a8650b395ba3083b288b0 (commit) from 79f28d8dbbcfe0e42847d2bfa3bb5a9003f5f470 (commit) - Log ----------------------------------------------------------------- commit 75f916fd3c13333b655a72427d8158ce17c3995e Merge: 79f28d8dbbcfe0e42847d2bfa3bb5a9003f5f470 14f8664272af543a16bb78a3c72e5cd64fae64b9 Author: Michal Čihař <mcihar(a)suse.cz> Date: Fri Jun 17 09:11:36 2011 +0200 Merge remote-tracking branch 'tyron/master' Conflicts: server_status.php commit 14f8664272af543a16bb78a3c72e5cd64fae64b9 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Jun 16 15:18:24 2011 +0200 some more code formatting commit bc19b678305a6ef1d9677122f56e389ceed5cd38 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Jun 16 15:10:41 2011 +0200 forgot some css changes in original theme commit f771e68a73dfca6199030c1598b23e92de50f64c Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Jun 16 15:05:08 2011 +0200 - Fix for: If the moseout event on the row highlighting fails to get called (e.g. when having html code in the row), the toggle class will wrongly assign the hover class next time the element is being hovered over - Better formatted PMA_createChart() commit ab5d9b278a2360fcce78dd8a5b0142a46a14fa18 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Thu Jun 16 15:03:04 2011 +0200 Cleaned up code commit 6f4b0f88d2e4bc85980a8650b395ba3083b288b0 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Wed Jun 15 20:36:58 2011 +0200 - Server variables that represent bytes are convert to a byte format (e.g. 16 EiB instead of 18,446,744,073,709,551,616) - A javascript code snippet that cuts off long strings (such as the optimizer_switch variable) so the whole table stays in view without scrolling. ----------------------------------------------------------------------- Summary of changes: js/functions.js | 63 ++++++----- js/messages.php | 13 ++ js/server_status.js | 191 ++++++++++++++++++------------- js/server_variables.js | 132 +++++++++++++++------- libraries/server_variables_doc.php | 63 +++++----- server_status.php | 152 ++++++++++--------------- server_variables.php | 6 +- themes/original/css/theme_right.css.php | 19 +++ themes/pmahomme/css/theme_right.css.php | 33 +++++- 9 files changed, 401 insertions(+), 271 deletions(-) diff --git a/js/functions.js b/js/functions.js index 3418e51..e552b1a 100644 --- a/js/functions.js +++ b/js/functions.js @@ -30,7 +30,6 @@ var codemirror_editor = false; var chart_activeTimeouts = new Object(); - /** * Add a hidden field to the form to indicate that this will be an * Ajax request (only if this hidden field does not exist) @@ -658,10 +657,10 @@ $(document).ready(function() { * so that it works also for pages reached via AJAX) */ $(document).ready(function() { - $('tr.odd, tr.even').live('hover',function() { + $('tr.odd, tr.even').live('hover',function(event) { var $tr = $(this); - $tr.toggleClass('hover'); - $tr.children().toggleClass('hover'); + $tr.toggleClass('hover',event.type=='mouseover'); + $tr.children().toggleClass('hover',event.type=='mouseover'); }); }) @@ -1391,31 +1390,41 @@ function PMA_createChart(passedSettings) { events: { load: function() { var thisChart = this; - var lastValue=null, curValue=null; - var numLoadedPoints=0, otherSum=0; + var lastValue = null, curValue = null; + var numLoadedPoints = 0, otherSum = 0; var diff; // No realtime updates for graphs that are being exported, and disabled when no callback is set - if(thisChart.options.chart.forExport==true || !passedSettings.realtime || !passedSettings.realtime.callback) return; + if(thisChart.options.chart.forExport == true || + ! passedSettings.realtime || + ! passedSettings.realtime.callback) return; thisChart.options.realtime.timeoutCallBack = function() { - $.get(passedSettings.realtime.url,{ajax_request:1, chart_data:1, type:passedSettings.realtime.type},function(data) { - curValue = jQuery.parseJSON(data); - //if(lastValue==null) lastValue = curValue; - - if(lastValue==null) diff = curValue.x - thisChart.xAxis[0].getExtremes().max; - else diff = parseInt(curValue.x - lastValue.x); - - thisChart.xAxis[0].setExtremes(thisChart.xAxis[0].getExtremes().min+diff, thisChart.xAxis[0].getExtremes().max+diff, false); - - passedSettings.realtime.callback(thisChart,curValue,lastValue,numLoadedPoints); - - lastValue = curValue; - numLoadedPoints++; - - // Timeout has been cleared => don't start a new timeout - if(chart_activeTimeouts[container]==null) return; - chart_activeTimeouts[container] = setTimeout(thisChart.options.realtime.timeoutCallBack, thisChart.options.realtime.refreshRate); - + $.post(passedSettings.realtime.url, + { ajax_request: true, chart_data: 1, type: passedSettings.realtime.type }, + function(data) { + curValue = jQuery.parseJSON(data); + + if(lastValue==null) diff = curValue.x - thisChart.xAxis[0].getExtremes().max; + else diff = parseInt(curValue.x - lastValue.x); + + thisChart.xAxis[0].setExtremes( + thisChart.xAxis[0].getExtremes().min+diff, + thisChart.xAxis[0].getExtremes().max+diff, + false + ); + + passedSettings.realtime.callback(thisChart,curValue,lastValue,numLoadedPoints); + + lastValue = curValue; + numLoadedPoints++; + + // Timeout has been cleared => don't start a new timeout + if(chart_activeTimeouts[container]==null) return; + + chart_activeTimeouts[container] = setTimeout( + thisChart.options.realtime.timeoutCallBack, + thisChart.options.realtime.refreshRate + ); }); } @@ -1449,8 +1458,8 @@ function PMA_createChart(passedSettings) { }, tooltip: { formatter: function() { - return '<b>'+ this.series.name +'</b><br/>'+ - Highcharts.dateFormat('%Y-%m-%d %H:%M:%S', this.x) +'<br/>'+ + return '<b>' + this.series.name +'</b><br/>' + + Highcharts.dateFormat('%Y-%m-%d %H:%M:%S', this.x) + '<br/>' + Highcharts.numberFormat(this.y, 2); } }, diff --git a/js/messages.php b/js/messages.php index 01aede4..7ec366f 100644 --- a/js/messages.php +++ b/js/messages.php @@ -61,6 +61,8 @@ $js_messages['strRemovingSelectedUsers'] = __('Removing Selected Users'); $js_messages['strClose'] = __('Close'); /* for server_status.js */ +$js_messages['strEdit'] = __('Edit'); + $js_messages['strLiveTrafficChart'] = __('Live traffic chart'); $js_messages['strLiveConnChart'] = __('Live conn./process chart'); $js_messages['strLiveQueryChart'] = __('Live query chart'); @@ -75,6 +77,17 @@ $js_messages['strThousandsSeperator'] = __(','); /* l10n: Decimal separator */ $js_messages['strDecimalSeperator'] = __('.'); +$js_messages['strChartKBSent'] = __('kB sent since last refresh'); +$js_messages['strChartKBReceived'] = __('kB received since last refresh'); +$js_messages['strChartServerTraffic'] = __('Server traffic (in kB)'); +$js_messages['strChartConnections'] = __('Connections since last refresh'); +$js_messages['strChartProcesses'] = __('Processes'); +$js_messages['strChartConnectionsTitle'] = __('Connections / Processes'); +$js_messages['strChartIssuedQueries'] = __('Issued queries since last refresh'); +$js_messages['strChartIssuedQueriesTitle'] = __('Issued queries'); + +$js_messages['strChartQueryPie'] = __('Query statistics'); + /* For inline query editing */ $js_messages['strGo'] = __('Go'); $js_messages['strCancel'] = __('Cancel'); diff --git a/js/server_status.js b/js/server_status.js index 4413c80..08b2b43 100644 --- a/js/server_status.js +++ b/js/server_status.js @@ -21,9 +21,13 @@ $(function() { return /^[0-9]?[0-9,\.]*\s?(k|M|G|T|%)?$/.test(s); }, format: function(s) { - var num = jQuery.tablesorter.formatFloat( s.replace(PMA_messages['strThousandsSeperator'],'').replace(PMA_messages['strDecimalSeperator'],'.') ); + var num = jQuery.tablesorter.formatFloat( + s.replace(PMA_messages['strThousandsSeperator'],'') + .replace(PMA_messages['strDecimalSeperator'],'.') + ); + var factor = 1; - switch (s.charAt(s.length-1)) { + switch (s.charAt(s.length - 1)) { case '%': factor = -2; break; // Todo: Complete this list (as well as in the regexp a few lines up) case 'k': factor = 3; break; @@ -31,7 +35,8 @@ $(function() { case 'G': factor = 9; break; case 'T': factor = 12; break; } - return num*Math.pow(10,factor); + + return num * Math.pow(10,factor); }, type: "numeric" }); @@ -45,12 +50,16 @@ $(function() { var odd_row=false; var text=''; // Holds filter text var queryPieChart = null; - /* Chart configuration */ + /* Chart configuration */ // Defines what the tabs are currently displaying (realtime or data) var tabStatus = new Object(); // Holds the current chart instances for each tab var tabChart = new Object(); + + $.ajaxSetup({ + cache:false + }); // Add tabs $('#serverStatusTabs').tabs({ @@ -69,12 +78,23 @@ $(function() { tabStatus[$(this).attr('id')] = 'static'; }); + // Handles refresh rate changing $('.statuslinks select').change(function() { var chart=tabChart[$(this).parents('div.ui-tabs-panel').attr('id')]; chart.options.realtime.refreshRate = 1000*parseInt(this.value); - chart.xAxis[0].setExtremes(new Date().getTime() - chart.options.realtime.numMaxPoints * chart.options.realtime.refreshRate, chart.xAxis[0].getExtremes().max, true); + + chart.xAxis[0].setExtremes( + new Date().getTime() - chart.options.realtime.numMaxPoints * chart.options.realtime.refreshRate, + chart.xAxis[0].getExtremes().max, + true + ); + + // Clear current timeout and set timeout with the new refresh rate clearTimeout(chart_activeTimeouts[chart.options.chart.renderTo]); - chart_activeTimeouts[chart.options.chart.renderTo] = setTimeout(chart.options.realtime.timeoutCallBack, chart.options.realtime.refreshRate); + chart_activeTimeouts[chart.options.chart.renderTo] = setTimeout( + chart.options.realtime.timeoutCallBack, + chart.options.realtime.refreshRate + ); }); // Ajax refresh of variables (always the first element in each tab) @@ -107,26 +127,32 @@ $(function() { if(tabstat=='static' || tabstat=='liveconnections') { var settings = { - series: [{name:'kB sent since last refresh',data:[]},{name:'kB received since last refresh',data:[]}], - title: {text:'Server traffic (in kB)'}, - realtime:{ url:'server_status.php?'+url_query, + series: [ + { name: PMA_messages['strChartKBSent'], data: [] }, + { name: PMA_messages['strChartKBReceived'], data: [] } + ], + title: { text: PMA_messages['strChartServerTraffic'] }, + realtime: { url:'server_status.php?' + url_query, type: 'traffic', - callback: function(chartObj, curVal, lastVal,numLoadedPoints) { + callback: function(chartObj, curVal, lastVal, numLoadedPoints) { if(lastVal==null) return; chartObj.series[0].addPoint( - { x:curVal.x, y:(curVal.y_sent-lastVal.y_sent)/1024}, - false, numLoadedPoints >= chartObj.options.realtime.numMaxPoints + { x: curVal.x, y: (curVal.y_sent - lastVal.y_sent) / 1024 }, + false, + numLoadedPoints >= chartObj.options.realtime.numMaxPoints ); chartObj.series[1].addPoint( - { x:curVal.x, y:(curVal.y_received-lastVal.y_received)/1024}, - true, numLoadedPoints >= chartObj.options.realtime.numMaxPoints + { x: curVal.x, y: (curVal.y_received - lastVal.y_received) / 1024 }, + true, + numLoadedPoints >= chartObj.options.realtime.numMaxPoints ); } - } + } } setupLiveChart($tab,this,settings); - if(tabstat=='liveconnections') $tab.find('.statuslinks a.liveconnectionsLink').html(PMA_messages['strLiveConnChart']); + if(tabstat == 'liveconnections') + $tab.find('.statuslinks a.liveconnectionsLink').html(PMA_messages['strLiveConnChart']); tabStatus[$tab.attr('id')]='livetraffic'; } else { $(this).html(PMA_messages['strLiveTrafficChart']); @@ -141,28 +167,34 @@ $(function() { var $tab=$(this).parents('div.ui-tabs-panel'); var tabstat = tabStatus[$tab.attr('id')]; - if(tabstat=='static' || tabstat=='livetraffic') { + if(tabstat == 'static' || tabstat == 'livetraffic') { var settings = { - series: [{name:'Connections since last refresh', data:[]},{name:'Processes', data:[]}], - title: {text:'Connections / Processes'}, - realtime:{ url:'server_status.php?'+url_query, + series: [ + { name: PMA_messages['strChartConnections'], data: [] }, + { name: PMA_messages['strChartProcesses'], data: [] } + ], + title: { text: PMA_messages['strChartConnectionsTitle'] }, + realtime: { url:'server_status.php?'+url_query, type: 'proc', callback: function(chartObj, curVal, lastVal,numLoadedPoints) { if(lastVal==null) return; chartObj.series[0].addPoint( - { x:curVal.x, y:curVal.y_conn-lastVal.y_conn }, - false, numLoadedPoints >= chartObj.options.realtime.numMaxPoints + { x: curVal.x, y: curVal.y_conn - lastVal.y_conn }, + false, + numLoadedPoints >= chartObj.options.realtime.numMaxPoints ); chartObj.series[1].addPoint( - { x:curVal.x, y:curVal.y_proc }, - true, numLoadedPoints >= chartObj.options.realtime.numMaxPoints + { x: curVal.x, y: curVal.y_proc }, + true, + numLoadedPoints >= chartObj.options.realtime.numMaxPoints ); } - } + } }; setupLiveChart($tab,this,settings); - if(tabstat=='livetraffic') $tab.find('.statuslinks a.livetrafficLink').html(PMA_messages['strLiveTrafficChart']); + if(tabstat == 'livetraffic') + $tab.find('.statuslinks a.livetrafficLink').html(PMA_messages['strLiveTrafficChart']); tabStatus[$tab.attr('id')]='liveconnections'; } else { $(this).html(PMA_messages['strLiveConnChart']); @@ -172,62 +204,63 @@ $(function() { return false; }); - // Live query charting + // Live query statistics $('.statuslinks a.livequeriesLink').click(function() { - var $tab=$(this).parents('div.ui-tabs-panel'); - var settings=null; + var $tab = $(this).parents('div.ui-tabs-panel'); + var settings = null; - if(tabStatus[$tab.attr('id')]=='static') { + if(tabStatus[$tab.attr('id')] == 'static') { settings = { - series: [{name:'Issued queries since last refresh', data:[]}], - title: {text:'Issued queries'}, + series: [ { name: PMA_messages['strChartIssuedQueries'], data: [] } ], + title: { text: PMA_messages['strChartIssuedQueriesTitle'] }, tooltip: { formatter:function() { return this.point.name; } }, - realtime:{ url:'server_status.php?'+url_query, + realtime: { url:'server_status.php?'+url_query, type: 'queries', callback: function(chartObj, curVal, lastVal,numLoadedPoints) { - if(lastVal==null) return; + if(lastVal == null) return; chartObj.series[0].addPoint( - { x:curVal.x, y:curVal.y-lastVal.y, name:sortedQueriesPointInfo(curVal,lastVal) }, - true, numLoadedPoints >= chartObj.options.realtime.numMaxPoints + { x: curVal.x, y: curVal.y - lastVal.y, name: sortedQueriesPointInfo(curVal,lastVal) }, + true, + numLoadedPoints >= chartObj.options.realtime.numMaxPoints ); } - } + } }; } else { $(this).html(PMA_messages['strLiveQueryChart']); } setupLiveChart($tab,this,settings); - tabStatus[$tab.attr('id')]='livequeries'; + tabStatus[$tab.attr('id')] = 'livequeries'; return false; }); function setupLiveChart($tab,link,settings) { - if(settings!=null) { + if(settings != null) { // Loading a chart with existing chart => remove old chart first - if(tabStatus[$tab.attr('id')]!='static') { - clearTimeout(chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"]); - chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"]=null; + if(tabStatus[$tab.attr('id')] != 'static') { + clearTimeout(chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]); + chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"] = null; tabChart[$tab.attr('id')].destroy(); // Also reset the select list - $tab.find('.statuslinks select').get(0).selectedIndex=0; + $tab.find('.statuslinks select').get(0).selectedIndex = 0; } - if(!settings.chart) settings.chart = {}; - settings.chart.renderTo=$tab.attr('id')+"_chart_cnt"; + if(! settings.chart) settings.chart = {}; + settings.chart.renderTo = $tab.attr('id') + "_chart_cnt"; $tab.find('.tabInnerContent') .hide() - .after('<div style="clear:both; min-width:500px; height:400px; padding-bottom:80px;" id="'+$tab.attr('id')+'_chart_cnt"></div>'); - tabChart[$tab.attr('id')]=PMA_createChart(settings); + .after('<div class="liveChart" id="' + $tab.attr('id') + '_chart_cnt"></div>'); + tabChart[$tab.attr('id')] = PMA_createChart(settings); $(link).html(PMA_messages['strStaticData']); $tab.find('.statuslinks a.tabRefresh').hide(); $tab.find('.statuslinks select').show(); } else { - clearTimeout(chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"]); - chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"]=null; + clearTimeout(chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]); + chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]=null; $tab.find('.tabInnerContent').show(); - $tab.find('div#'+$tab.attr('id')+'_chart_cnt').remove(); + $tab.find('div#'+$tab.attr('id') + '_chart_cnt').remove(); tabStatus[$tab.attr('id')]='static'; tabChart[$tab.attr('id')].destroy(); $tab.find('.statuslinks a.tabRefresh').show(); @@ -243,9 +276,10 @@ $(function() { }); $('#filterText').keyup(function(e) { - if($(this).val().length==0) textFilter=null; - else textFilter = new RegExp("(^|_)"+$(this).val(),'i'); - text=$(this).val(); + if($(this).val().length == 0) textFilter = null; + else textFilter = new RegExp("(^|_)" + $(this).val(),'i'); + + text = $(this).val(); filterVariables(); }); @@ -258,11 +292,11 @@ $(function() { function initTab(tab,data) { switch(tab.attr('id')) { case 'statustabs_traffic': - if(data!=null) tab.find('.tabInnerContent').html(data); + if(data != null) tab.find('.tabInnerContent').html(data); initTooltips(); break; case 'statustabs_queries': - if(data!=null) { + if(data != null) { queryPieChart.destroy(); tab.find('.tabInnerContent').html(data); } @@ -273,10 +307,9 @@ $(function() { cdata.push([key,parseInt(value)]); }); - queryPieChart=PMA_createChart({ + queryPieChart = PMA_createChart({ chart: { renderTo: 'serverstatusquerieschart' - }, title: { text:'', @@ -284,7 +317,7 @@ $(function() { }, series: [{ type:'pie', - name: 'Query statistics', + name: PMA_messages['strChartQueryPie'], data: cdata }], plotOptions: { @@ -293,20 +326,22 @@ $(function() { cursor: 'pointer', dataLabels: { enabled: true, - formatter: function() { - return '<b>'+ this.point.name +'</b><br> '+ Highcharts.numberFormat(this.percentage, 2) +' %'; + formatter: function() { + return '<b>'+ this.point.name +'</b><br/> ' + Highcharts.numberFormat(this.percentage, 2) + ' %'; } } } }, tooltip: { - formatter: function() { return '<b>'+ this.point.name +'</b><br/>'+Highcharts.numberFormat(this.y, 2)+'<br/>('+Highcharts.numberFormat(this.percentage, 2) +' %)'; } + formatter: function() { + return '<b>' + this.point.name + '</b><br/>' + Highcharts.numberFormat(this.y, 2) + '<br/>(' + Highcharts.numberFormat(this.percentage, 2) + ' %)'; + } } }); break; case 'statustabs_allvars': - if(data!=null) { + if(data != null) { tab.find('.tabInnerContent').html(data); filterVariables(); } @@ -329,7 +364,7 @@ $(function() { }); $('#serverstatusqueriesdetails tr:first th') - .append('<img class="sortableIcon" src="'+pma_theme_image+'cleardot.gif" alt="">'); + .append('<img class="sortableIcon" src="' + pma_theme_image + 'cleardot.gif" alt="">'); break; @@ -343,7 +378,7 @@ $(function() { }); $('#serverstatusvariables tr:first th') - .append('<img class="sortableIcon" src="'+pma_theme_image+'cleardot.gif" alt="">'); + .append('<img class="sortableIcon" src="' + pma_theme_image + 'cleardot.gif" alt="">'); break; } @@ -351,14 +386,14 @@ $(function() { /* Filters the status variables by name/category/alert in the variables tab */ function filterVariables() { - var useful_links=0; + var useful_links = 0; var section = text; - if(categoryFilter.length>0) section = categoryFilter; + if(categoryFilter.length > 0) section = categoryFilter; - if(section.length>1) { + if(section.length > 1) { $('#linkSuggestions span').each(function() { - if($(this).attr('class').indexOf('status_'+section)!=-1) { + if($(this).attr('class').indexOf('status_'+section) != -1) { useful_links++; $(this).css('display',''); } else { @@ -369,16 +404,16 @@ $(function() { }); } - if(useful_links>0) + if(useful_links > 0) $('#linkSuggestions').css('display',''); else $('#linkSuggestions').css('display','none'); odd_row=false; $('#serverstatusvariables th.name').each(function() { - if((textFilter==null || textFilter.exec($(this).text())) - && (!alertFilter || $(this).next().find('span.attention').length>0) - && (categoryFilter.length==0 || $(this).parent().hasClass('s_'+categoryFilter))) { - odd_row = !odd_row; + if((textFilter == null || textFilter.exec($(this).text())) + && (! alertFilter || $(this).next().find('span.attention').length>0) + && (categoryFilter.length == 0 || $(this).parent().hasClass('s_'+categoryFilter))) { + odd_row = ! odd_row; $(this).parent().css('display',''); if(odd_row) { $(this).parent().addClass('odd'); @@ -406,22 +441,22 @@ $(function() { if(value-lastQueries.pointInfo[key] > 0) { queryKeys.push(key); queryValues.push(value-lastQueries.pointInfo[key]); - sumTotal+=value-lastQueries.pointInfo[key]; + sumTotal += value-lastQueries.pointInfo[key]; } }); var numQueries = queryKeys.length; var pointInfo = '<b>' + PMA_messages['strTotal'] + ': ' + sumTotal + '</b><br>'; while(queryKeys.length > 0) { - max=0; - for(var i=0; i<queryKeys.length; i++) { + max = 0; + for(var i=0; i < queryKeys.length; i++) { if(queryValues[i] > max) { max = queryValues[i]; maxIdx = i; } } - if(numQueries > 8 && num>=6) - sumOther+=queryValues[maxIdx]; + if(numQueries > 8 && num >= 6) + sumOther += queryValues[maxIdx]; else pointInfo += queryKeys[maxIdx].substr(4).replace('_',' ') + ': ' + queryValues[maxIdx] + '<br>'; queryKeys.splice(maxIdx,1); diff --git a/js/server_variables.js b/js/server_variables.js index 1877ce7..11be3de 100644 --- a/js/server_variables.js +++ b/js/server_variables.js @@ -1,42 +1,92 @@ -$(function() { - var textFilter=null; - var odd_row=false; - - // Filter options are invisible for disabled js users - $('fieldset#tableFilter').css('display',''); - - $('#filterText').keyup(function(e) { - if($(this).val().length==0) textFilter=null; - else textFilter = new RegExp("(^| )"+$(this).val(),'i'); - filterVariables(); - }); - - function filterVariables() { - odd_row=false; - var mark_next=false; - var firstCell; - - $('table.filteredData tbody tr').each(function() { - firstCell = $(this).children(':first'); - - if(mark_next || textFilter==null || textFilter.exec(firstCell.text())) { - // If current row is 'marked', also display next row - if($(this).hasClass('marked') && !mark_next) - mark_next=true; - else mark_next=false; - - odd_row = !odd_row; - $(this).css('display',''); - if(odd_row) { - $(this).addClass('odd'); - $(this).removeClass('even'); - } else { - $(this).addClass('even'); - $(this).removeClass('odd'); - } - } else { - $(this).css('display','none'); - } - }); - } +$(function() { + var textFilter=null; + var odd_row=false; + var testString = 'abcdefghijklmnopqrstuvwxyz0123456789,ABCEFGHIJKLMOPQRSTUVWXYZ'; + var $tmpDiv; + var charWidth; + + /*** This code snippet takes care that the table stays readable. It cuts off long strings when the window is resized ***/ + $('table.data').after($tmpDiv=$('<span>'+testString+'</span>')); + charWidth = $tmpDiv.width() / testString.length; + $tmpDiv.remove(); + + $(window).resize(limitTableWidth); + limitTableWidth(); + + function limitTableWidth() { + var fulltext; + var charDiff; + var maxTableWidth; + var $tmpTable; + + $('table.data').after($tmpTable=$('<table id="testTable" style="width:100%;"><tr><td>'+testString+'</td></tr></table>')); + maxTableWidth = $('#testTable').width(); + $tmpTable.remove(); + charDiff = ($('table.data').width()-maxTableWidth) / charWidth; + + if($('body').innerWidth() < $('table.data').width()+10 || $('body').innerWidth() > $('table.data').width()+20) { + var maxChars=0; + + $('table.data tbody tr td:nth-child(2)').each(function() { + maxChars=Math.max($(this).text().length,maxChars); + }); + + // Do not resize smaller if there's only 50 chars displayed already + if(charDiff > 0 && maxChars < 50) return; + + $('table.data tbody tr td:nth-child(2)').each(function() { + if((charDiff>0 && $(this).text().length > maxChars-charDiff) || (charDiff<0 && $(this).find('abbr.cutoff').length>0)) { + if($(this).find('abbr.cutoff').length > 0) + fulltext = $(this).find('abbr.cutoff').attr('title'); + else { + fulltext = $(this).text(); + // Do not cut off elements with html in it and hope they are not too long + if(fulltext.length != $(this).html().length) return 0; + } + + if(fulltext.length < maxChars-charDiff) + $(this).html(fulltext); + else $(this).html('<abbr class="cutoff" title="'+fulltext+'">'+fulltext.substr(0,maxChars-charDiff-3)+'...</abbr>'); + } + }); + } + } + + // Filter options are invisible for disabled js users + $('fieldset#tableFilter').css('display',''); + + $('#filterText').keyup(function(e) { + if($(this).val().length==0) textFilter=null; + else textFilter = new RegExp("(^| )"+$(this).val(),'i'); + filterVariables(); + }); + + function filterVariables() { + odd_row=false; + var mark_next=false; + var firstCell; + + $('table.filteredData tbody tr').each(function() { + firstCell = $(this).children(':first'); + + if(mark_next || textFilter==null || textFilter.exec(firstCell.text())) { + // If current row is 'marked', also display next row + if($(this).hasClass('marked') && !mark_next) + mark_next=true; + else mark_next=false; + + odd_row = !odd_row; + $(this).css('display',''); + if(odd_row) { + $(this).addClass('odd'); + $(this).removeClass('even'); + } else { + $(this).addClass('even'); + $(this).removeClass('odd'); + } + } else { + $(this).css('display','none'); + } + }); + } }); \ No newline at end of file diff --git a/libraries/server_variables_doc.php b/libraries/server_variables_doc.php index 3e8faa8..ce81e89 100644 --- a/libraries/server_variables_doc.php +++ b/libraries/server_variables_doc.php @@ -6,6 +6,7 @@ * string $anchor: anchor to the documentation page * string $chapter: chapter of "HTML, one page per chapter" documentation * string $type: type of system variable + * string $format: if set to 'byte' it will format the variable with PMA_formatByteDown() */ $VARIABLE_DOC_LINKS = array(); $VARIABLE_DOC_LINKS['auto_increment_increment'] = array('auto_increment_increment','replication-options-master','sysvar'); @@ -16,11 +17,11 @@ $VARIABLE_DOC_LINKS['back_log'] = array('back_log','server-system-variables','sy $VARIABLE_DOC_LINKS['basedir'] = array('basedir','server-options','option_mysqld'); $VARIABLE_DOC_LINKS['big_tables'] = array('big-tables','server-options','option_mysqld'); $VARIABLE_DOC_LINKS['bind_address'] = array('bind-address','server-options','option_mysqld'); -$VARIABLE_DOC_LINKS['binlog_cache_size'] = array('binlog_cache_size','replication-options-binary-log','sysvar'); +$VARIABLE_DOC_LINKS['binlog_cache_size'] = array('binlog_cache_size','replication-options-binary-log','sysvar','byte'); $VARIABLE_DOC_LINKS['binlog_direct_non_transactional_updates'] = array('binlog_direct_non_transactional_updates','replication-options-binary-log','sysvar'); $VARIABLE_DOC_LINKS['binlog_format'] = array('binlog-format','server-options','sysvar'); -$VARIABLE_DOC_LINKS['binlog_stmt_cache_size'] = array('binlog_stmt_cache_size','replication-options-binary-log','sysvar'); -$VARIABLE_DOC_LINKS['bulk_insert_buffer_size'] = array('bulk_insert_buffer_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['binlog_stmt_cache_size'] = array('binlog_stmt_cache_size','replication-options-binary-log','sysvar','byte'); +$VARIABLE_DOC_LINKS['bulk_insert_buffer_size'] = array('bulk_insert_buffer_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['character_set_client'] = array('character_set_client','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['character_set_connection'] = array('character_set_connection','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['character_set_database'] = array('character_set_database','server-system-variables','sysvar'); @@ -84,11 +85,11 @@ $VARIABLE_DOC_LINKS['init_file'] = array('init-file','server-options','option_my $VARIABLE_DOC_LINKS['init_slave'] = array('init_slave','replication-options-slave','sysvar'); $VARIABLE_DOC_LINKS['innodb_adaptive_flushing'] = array('innodb_adaptive_flushing','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_adaptive_hash_index'] = array('innodb_adaptive_hash_index','innodb-parameters','sysvar'); -$VARIABLE_DOC_LINKS['innodb_additional_mem_pool_size'] = array('innodb_additional_mem_pool_size','innodb-parameters','sysvar'); +$VARIABLE_DOC_LINKS['innodb_additional_mem_pool_size'] = array('innodb_additional_mem_pool_size','innodb-parameters','sysvar','byte'); $VARIABLE_DOC_LINKS['innodb_autoextend_increment'] = array('innodb_autoextend_increment','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_autoinc_lock_mode'] = array('innodb_autoinc_lock_mode','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_buffer_pool_instances'] = array('innodb_buffer_pool_instances','innodb-parameters','sysvar'); -$VARIABLE_DOC_LINKS['innodb_buffer_pool_size'] = array('innodb_buffer_pool_size','innodb-parameters','sysvar'); +$VARIABLE_DOC_LINKS['innodb_buffer_pool_size'] = array('innodb_buffer_pool_size','innodb-parameters','sysvar','byte'); $VARIABLE_DOC_LINKS['innodb_change_buffering'] = array('innodb_change_buffering','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_checksums'] = array('innodb_checksums','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_commit_concurrency'] = array('innodb_commit_concurrency','innodb-parameters','sysvar'); @@ -107,8 +108,8 @@ $VARIABLE_DOC_LINKS['innodb_force_recovery'] = array('innodb_force_recovery','in $VARIABLE_DOC_LINKS['innodb_io_capacity'] = array('innodb_io_capacity','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_lock_wait_timeout'] = array('innodb_lock_wait_timeout','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_locks_unsafe_for_binlog'] = array('innodb_locks_unsafe_for_binlog','innodb-parameters','sysvar'); -$VARIABLE_DOC_LINKS['innodb_log_buffer_size'] = array('innodb_log_buffer_size','innodb-parameters','sysvar'); -$VARIABLE_DOC_LINKS['innodb_log_file_size'] = array('innodb_log_file_size','innodb-parameters','sysvar'); +$VARIABLE_DOC_LINKS['innodb_log_buffer_size'] = array('innodb_log_buffer_size','innodb-parameters','sysvar','byte'); +$VARIABLE_DOC_LINKS['innodb_log_file_size'] = array('innodb_log_file_size','innodb-parameters','sysvar','byte'); $VARIABLE_DOC_LINKS['innodb_log_files_in_group'] = array('innodb_log_files_in_group','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_log_group_home_dir'] = array('innodb_log_group_home_dir','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['innodb_max_dirty_pages_pct'] = array('innodb_max_dirty_pages_pct','innodb-parameters','sysvar'); @@ -138,15 +139,15 @@ $VARIABLE_DOC_LINKS['innodb_version'] = array('innodb_version','innodb-parameter $VARIABLE_DOC_LINKS['innodb_write_io_threads'] = array('innodb_write_io_threads','innodb-parameters','sysvar'); $VARIABLE_DOC_LINKS['insert_id'] = array('insert_id','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['interactive_timeout'] = array('interactive_timeout','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['join_buffer_size'] = array('join_buffer_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['join_buffer_size'] = array('join_buffer_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['keep_files_on_create'] = array('keep_files_on_create','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['key_buffer_size'] = array('key_buffer_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['key_buffer_size'] = array('key_buffer_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['key_cache_age_threshold'] = array('key_cache_age_threshold','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['key_cache_block_size'] = array('key_cache_block_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['key_cache_block_size'] = array('key_cache_block_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['key_cache_division_limit'] = array('key_cache_division_limit','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['language'] = array('language','server-options','option_mysqld'); $VARIABLE_DOC_LINKS['large_files_support'] = array('large_files_support','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['large_page_size'] = array('large_page_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['large_page_size'] = array('large_page_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['large_pages'] = array('large-pages','server-options','option_mysqld'); $VARIABLE_DOC_LINKS['last_insert_id'] = array('last_insert_id','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['lc_messages'] = array('lc-messages','server-options','option_mysqld'); @@ -172,19 +173,19 @@ $VARIABLE_DOC_LINKS['lower_case_file_system'] = array('lower_case_file_system',' $VARIABLE_DOC_LINKS['lower_case_table_names'] = array('lower_case_table_names','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['master-bind'] = array('','replication-options',0); $VARIABLE_DOC_LINKS['max_allowed_packet'] = array('max_allowed_packet','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['max_binlog_cache_size'] = array('max_binlog_cache_size','replication-options-binary-log','sysvar'); -$VARIABLE_DOC_LINKS['max_binlog_size'] = array('max_binlog_size','replication-options-binary-log','sysvar'); -$VARIABLE_DOC_LINKS['max_binlog_stmt_cache_size'] = array('max_binlog_stmt_cache_size','replication-options-binary-log','sysvar'); +$VARIABLE_DOC_LINKS['max_binlog_cache_size'] = array('max_binlog_cache_size','replication-options-binary-log','sysvar','byte'); +$VARIABLE_DOC_LINKS['max_binlog_size'] = array('max_binlog_size','replication-options-binary-log','sysvar','byte'); +$VARIABLE_DOC_LINKS['max_binlog_stmt_cache_size'] = array('max_binlog_stmt_cache_size','replication-options-binary-log','sysvar','byte'); $VARIABLE_DOC_LINKS['max_connect_errors'] = array('max_connect_errors','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['max_connections'] = array('max_connections','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['max_delayed_threads'] = array('max_delayed_threads','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['max_error_count'] = array('max_error_count','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['max_heap_table_size'] = array('max_heap_table_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['max_heap_table_size'] = array('max_heap_table_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['max_insert_delayed_threads'] = array('max_insert_delayed_threads','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['max_join_size'] = array('max_join_size','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['max_length_for_sort_data'] = array('max_length_for_sort_data','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['max_prepared_stmt_count'] = array('max_prepared_stmt_count','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['max_relay_log_size'] = array('max_relay_log_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['max_relay_log_size'] = array('max_relay_log_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['max_seeks_for_key'] = array('max_seeks_for_key','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['max_sort_length'] = array('max_sort_length','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['max_sp_recursion_depth'] = array('max_sp_recursion_depth','server-system-variables','sysvar'); @@ -193,12 +194,12 @@ $VARIABLE_DOC_LINKS['max_user_connections'] = array('max_user_connections','serv $VARIABLE_DOC_LINKS['max_write_lock_count'] = array('max_write_lock_count','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['memlock'] = array('memlock','server-options','option_mysqld'); $VARIABLE_DOC_LINKS['min_examined_row_limit'] = array('min-examined-row-limit','server-options','option_mysqld'); -$VARIABLE_DOC_LINKS['myisam_data_pointer_size'] = array('myisam_data_pointer_size','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['myisam_max_sort_file_size'] = array('myisam_max_sort_file_size','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['myisam_mmap_size'] = array('myisam_mmap_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['myisam_data_pointer_size'] = array('myisam_data_pointer_size','server-system-variables','sysvar','byte'); +$VARIABLE_DOC_LINKS['myisam_max_sort_file_size'] = array('myisam_max_sort_file_size','server-system-variables','sysvar','byte'); +$VARIABLE_DOC_LINKS['myisam_mmap_size'] = array('myisam_mmap_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['myisam_recover_options'] = array('myisam_recover_options','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['myisam_repair_threads'] = array('myisam_repair_threads','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['myisam_sort_buffer_size'] = array('myisam_sort_buffer_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['myisam_sort_buffer_size'] = array('myisam_sort_buffer_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['myisam_stats_method'] = array('myisam_stats_method','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['myisam_use_mmap'] = array('myisam_use_mmap','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['named_pipe'] = array('named_pipe','server-system-variables','sysvar'); @@ -234,25 +235,25 @@ $VARIABLE_DOC_LINKS['performance_schema_max_thread_instances'] = array('performa $VARIABLE_DOC_LINKS['pid_file'] = array('pid-file','server-options','option_mysqld'); $VARIABLE_DOC_LINKS['plugin_dir'] = array('plugin_dir','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['port'] = array('port','server-options','option_mysqld'); -$VARIABLE_DOC_LINKS['preload_buffer_size'] = array('preload_buffer_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['preload_buffer_size'] = array('preload_buffer_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['profiling'] = array('profiling','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['profiling_history_size'] = array('profiling_history_size','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['protocol_version'] = array('protocol_version','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['proxy_user'] = array('proxy_user','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['pseudo_thread_id'] = array('pseudo_thread_id','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['query_alloc_block_size'] = array('query_alloc_block_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['query_alloc_block_size'] = array('query_alloc_block_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['query_cache_limit'] = array('query_cache_limit','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['query_cache_min_res_unit'] = array('query_cache_min_res_unit','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['query_cache_size'] = array('query_cache_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['query_cache_size'] = array('query_cache_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['query_cache_type'] = array('query_cache_type','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['query_cache_wlock_invalidate'] = array('query_cache_wlock_invalidate','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['query_prealloc_size'] = array('query_prealloc_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['query_prealloc_size'] = array('query_prealloc_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['rand_seed1'] = array('rand_seed1','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['rand_seed2'] = array('rand_seed2','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['range_alloc_block_size'] = array('range_alloc_block_size','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['read_buffer_size'] = array('read_buffer_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['range_alloc_block_size'] = array('range_alloc_block_size','server-system-variables','sysvar','byte'); +$VARIABLE_DOC_LINKS['read_buffer_size'] = array('read_buffer_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['read_only'] = array('read_only','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['read_rnd_buffer_size'] = array('read_rnd_buffer_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['read_rnd_buffer_size'] = array('read_rnd_buffer_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['relay-log-index'] = array('relay-log-index','replication-options-slave','option_mysqld'); $VARIABLE_DOC_LINKS['relay_log_index'] = array('relay_log_index','replication-options-slave','sysvar'); $VARIABLE_DOC_LINKS['relay_log_info_file'] = array('relay_log_info_file','replication-options-slave','sysvar'); @@ -291,7 +292,7 @@ $VARIABLE_DOC_LINKS['slow_launch_time'] = array('slow_launch_time','server-syste $VARIABLE_DOC_LINKS['slow_query_log'] = array('slow-query-log','server-options','server-system-variables'); $VARIABLE_DOC_LINKS['slow_query_log_file'] = array('slow_query_log_file','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['socket'] = array('socket','server-options','option_mysqld'); -$VARIABLE_DOC_LINKS['sort_buffer_size'] = array('sort_buffer_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['sort_buffer_size'] = array('sort_buffer_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['sql_auto_is_null'] = array('sql_auto_is_null','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['sql_big_selects'] = array('sql_big_selects','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['sql_big_tables'] = array('big-tables','server-options','server-system-variables'); @@ -332,10 +333,10 @@ $VARIABLE_DOC_LINKS['time_format'] = array('time_format','server-system-variable $VARIABLE_DOC_LINKS['time_zone'] = array('time_zone','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['timed_mutexes'] = array('timed_mutexes','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['timestamp'] = array('timestamp','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['tmp_table_size'] = array('tmp_table_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['tmp_table_size'] = array('tmp_table_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['tmpdir'] = array('tmpdir','server-options','option_mysqld'); -$VARIABLE_DOC_LINKS['transaction_alloc_block_size'] = array('transaction_alloc_block_size','server-system-variables','sysvar'); -$VARIABLE_DOC_LINKS['transaction_prealloc_size'] = array('transaction_prealloc_size','server-system-variables','sysvar'); +$VARIABLE_DOC_LINKS['transaction_alloc_block_size'] = array('transaction_alloc_block_size','server-system-variables','sysvar','byte'); +$VARIABLE_DOC_LINKS['transaction_prealloc_size'] = array('transaction_prealloc_size','server-system-variables','sysvar','byte'); $VARIABLE_DOC_LINKS['tx_isolation'] = array('tx_isolation','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['unique_checks'] = array('unique_checks','server-system-variables','sysvar'); $VARIABLE_DOC_LINKS['updatable_views_with_limit'] = array('updatable_views_with_limit','server-system-variables','sysvar'); diff --git a/server_status.php b/server_status.php index 2c4739f..0811558 100644 --- a/server_status.php +++ b/server_status.php @@ -15,17 +15,17 @@ if (! defined('PMA_NO_VARIABLES_IMPORT')) { define('PMA_NO_VARIABLES_IMPORT', true); } +if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) + $GLOBALS['is_header_sent'] = true; + require_once './libraries/common.inc.php'; /** * Ajax request */ -if (isset($_REQUEST['ajax_request'])) { - // Prevent ajax requests from being cached - header('Cache-Control: no-cache, must-revalidate'); // HTTP/1.1 - header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past - // Send correct charset +if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) { + // Send with correct charset header('Content-Type: text/html; charset=UTF-8'); // real-time charting data @@ -36,7 +36,12 @@ if (isset($_REQUEST['ajax_request'])) { $result = PMA_DBI_query('SHOW PROCESSLIST'); $num_procs = PMA_DBI_num_rows($result); - $ret = Array('x'=>(microtime(true)*1000),'y_proc'=>$num_procs,'y_conn'=>$c['Connections']); + $ret = array( + 'x' => microtime(true)*1000, + 'y_proc' => $num_procs, + 'y_conn' => $c['Connections'] + ); + exit(json_encode($ret)); case 'queries': $queries = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name LIKE "Com_%" AND Value>0', 0, 1); @@ -45,12 +50,22 @@ if (isset($_REQUEST['ajax_request'])) { unset($queries['Com_admin_commands']); $sum=array_sum($queries); - $ret = Array('x'=>(microtime(true)*1000),'y'=>$sum,'pointInfo'=>$queries); + $ret = array( + 'x' => microtime(true)*1000, + 'y' => $sum, + 'pointInfo' => $queries + ); + exit(json_encode($ret)); case 'traffic': $traffic = PMA_DBI_fetch_result('SHOW GLOBAL STATUS WHERE Variable_name="Bytes_received" OR Variable_name="Bytes_sent"', 0, 1); - $ret = Array('x'=>(microtime(true)*1000),'y_sent'=>$traffic['Bytes_sent'],'y_received'=>$traffic['Bytes_received']); + $ret = array( + 'x' => microtime(true)*1000, + 'y_sent' => $traffic['Bytes_sent'], + 'y_received' => $traffic['Bytes_received'] + ); + exit(json_encode($ret)); } @@ -294,17 +309,17 @@ $links['innodb']['doc'] = 'innodb'; // Variable to contain all com_ variables -$used_queries = Array(); +$used_queries = array(); // Variable to map variable names to their respective section name (used for js category filtering) -$allocationMap = Array(); +$allocationMap = array(); // sort vars into arrays foreach ($server_status as $name => $value) { foreach ($allocations as $filter => $section) { if (strpos($name, $filter) !== FALSE) { $allocationMap[$name] = $section; - if($section=='com' && $value>0) $used_queries[$name] = $value; + if($section == 'com' && $value > 0) $used_queries[$name] = $value; break; // Only exits inner loop } } @@ -453,7 +468,7 @@ echo __('Runtime Information'); <select id="filterCategory" name="filterCategory"> <option value=''><?php echo __('Filter by category...'); ?></option> <?php - foreach($sections as $section_id=>$section_name) { + foreach($sections as $section_id => $section_name) { ?> <option value='<?php echo $section_id; ?>'><?php echo $section_name; ?></option> <?php @@ -470,7 +485,7 @@ echo __('Runtime Information'); echo '<span class="status_'.$section_name.'"> '; $i=0; foreach ($section_links as $link_name => $link_url) { - if($i>0) echo ', '; + if($i > 0) echo ', '; if ('doc' == $link_name) { echo PMA_showMySQLDocu($link_url, $link_url); } else { @@ -496,30 +511,32 @@ echo __('Runtime Information'); function printQueryStatistics() { global $server_status, $used_queries, $url_query, $PMA_PHP_SELF; - $hour_factor = 3600 / $server_status['Uptime']; + $hour_factor = 3600 / $server_status['Uptime']; $total_queries = array_sum($used_queries); ?> - <h3 id="serverstatusqueries"><?php echo - //sprintf(__('<b>Query statistics</b>: Since its startup, %s queries have been sent to the server.'), - //PMA_formatNumber($server_status['Questions'], 0)); - sprintf('Queries since startup: %s',PMA_formatNumber($total_queries, 0)); - //echo PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_Questions'); + <h3 id="serverstatusqueries"> + <?php + echo sprintf('Queries since startup: %s',PMA_formatNumber($total_queries, 0)); ?> - <br> - <span style="font-size:60%; display:inline;"> - ø <?php echo __('per hour'); ?>: - <?php echo PMA_formatNumber($total_queries * $hour_factor, 0); ?><br> - - ø <?php echo __('per minute'); ?>: - <?php echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0); ?><br> + <br> + <span> + <?php + echo 'ø'.__('per hour').':'; + echo PMA_formatNumber($total_queries * $hour_factor, 0); + echo '<br>'; - <?php if($total_queries / $server_status['Uptime'] >= 1) { - ?> - ø <?php echo __('per second'); ?>: - <?php echo PMA_formatNumber( $total_queries / $server_status['Uptime'], 0); ?><br> + echo 'ø'.__('per minute').':'; + echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0); + echo '<br>'; + if($total_queries / $server_status['Uptime'] >= 1) { + echo 'ø'.__('per second').':'; + echo PMA_formatNumber( $total_queries / $server_status['Uptime'], 0); + ?> + </span><br> + </h3> <?php } @@ -527,11 +544,11 @@ function printQueryStatistics() { arsort($used_queries); $odd_row = true; - $count_displayed_rows = 0; - $perc_factor = 100 / $total_queries //(- $server_status['Connections']); + $count_displayed_rows = 0; + $perc_factor = 100 / $total_queries; //(- $server_status['Connections']); ?> - </h3> + <table id="serverstatusqueriesdetails" class="data sortable"> <col class="namecol" /> <col class="valuecol" span="3" /> @@ -548,7 +565,7 @@ function printQueryStatistics() { <tbody> <?php - $chart_json = Array(); + $chart_json = array(); $query_sum = array_sum($used_queries); $other_sum = 0; foreach ($used_queries as $name => $value) { @@ -557,7 +574,7 @@ function printQueryStatistics() { // For the percentage column, use Questions - Connections, because // the number of connections is not an item of the Query types // but is included in Questions. Then the total of the percentages is 100. - $name = str_replace(Array('Com_','_'), Array('',' '), $name); + $name = str_replace(Array('Com_', '_'), Array('', ' '), $name); if($value < $query_sum * 0.02) $other_sum += $value; @@ -577,21 +594,12 @@ function printQueryStatistics() { </tbody> </table> - <div id="serverstatusquerieschart" style="width:500px; height:350px; "> + <div id="serverstatusquerieschart"> <?php - /*// Generate the graph if this is an ajax request - if(isset($_REQUEST['ajax_request'])) { - echo createQueryChart(); - } else { - echo '<a href="'.$PMA_PHP_SELF.'?'.$url_query.'&query_chart=1#serverstatusqueries"' - .'title="' . __('Show query chart') . '">['.__('Show query chart').']</a>'; - }*/ - - if($other_sum>0) + if($other_sum > 0) $chart_json[__('Other')] = $other_sum; echo json_encode($chart_json); - ?> </div> <?php @@ -610,10 +618,11 @@ function printServerTraffic() { 'SELECT UNIX_TIMESTAMP() - ' . $server_status['Uptime']); ?> - <h3><?php /* echo __('<b>Server traffic</b>: These tables show the network traffic statistics of this MySQL server since its startup.');*/ - echo sprintf(__('Network traffic since startup: %s'), - implode(' ', PMA_formatByteDown( $server_status['Bytes_received'] + $server_status['Bytes_sent'], 3, 1)) - ); + <h3><?php + echo sprintf( + __('Network traffic since startup: %s'), + implode(' ', PMA_formatByteDown( $server_status['Bytes_received'] + $server_status['Bytes_sent'], 3, 1)) + ); ?> </h3> @@ -790,7 +799,7 @@ function printServerTraffic() { <th><?php echo __('Status'); ?></th> <th><?php echo __('SQL query'); - if (!PMA_DRIZZLE) { ?> + if (! PMA_DRIZZLE) { ?> <a href="<?php echo $full_text_link; ?>" title="<?php echo empty($full) ? __('Show Full Queries') : __('Truncate Shown Queries'); ?>"> <img src="<?php echo $GLOBALS['pmaThemeImage'] . 's_' . (empty($_REQUEST['full']) ? 'full' : 'partial'); ?>text.png" @@ -841,7 +850,7 @@ function printVariablesTable() { /** * Messages are built using the message name */ - $strShowStatus = Array( + $strShowStatus = array( 'Aborted_connects' => __('The number of failed attempts to connect to the MySQL server.'), 'Binlog_cache_disk_use' => __('The number of transactions that used the temporary binary log cache but that exceeded the value of binlog_cache_size and used a temporary file to store statements from the transaction.'), 'Binlog_cache_use' => __('The number of transactions that used the temporary binary log cache.'), @@ -1019,19 +1028,12 @@ function printVariablesTable() { <th><?php echo __('Description'); ?></th> </tr> </thead> -  <tbody> <?php $odd_row = false; foreach ($server_status as $name => $value) { $odd_row = !$odd_row; - // $allocations ?> <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; echo isset($allocationMap[$name])?' s_'.$allocationMap[$name]:''; ?>"> <th class="name"><?php echo htmlspecialchars($name) . PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_' . $name); ?> @@ -1087,38 +1089,6 @@ function printVariablesTable() { <?php } -function createQueryChart($com_vars=FALSE) { - /** - * Chart generation - */ - require_once './libraries/chart.lib.php'; - - if(!$com_vars) - $com_vars = PMA_DBI_fetch_result("SHOW GLOBAL STATUS LIKE 'Com\_%'", 0, 1); - - // admin commands are not queries (e.g. they include COM_PING, which is excluded from $server_status['Questions']) - unset($com_vars['Com_admin_commands']); - - arsort($com_vars); - - $merge_minimum = array_sum($com_vars) * 0.005; - $merged_value = 0; - - // remove zero values from the end, as well as merge together every value that is below 0.5% - // variable empty for Drizzle - if ($com_vars) { - while (($last_element=end($com_vars)) <= $merge_minimum) { - array_pop($com_vars); - $merged_value += $last_element; - } - - $com_vars['Other'] = $merged_value; - return PMA_chart_status($com_vars); - } - - return ''; -} - /** * cleanup of some deprecated values */ diff --git a/server_variables.php b/server_variables.php index 00c8a85..e538c91 100644 --- a/server_variables.php +++ b/server_variables.php @@ -86,8 +86,10 @@ foreach ($serverVars as $name => $value) { <th nowrap="nowrap"> <?php echo htmlspecialchars(str_replace('_', ' ', $name)); ?></th> <td class="value"><?php - if (strlen($value) < 16 && is_numeric($value)) { - echo PMA_formatNumber($value, 0); + if (is_numeric($value)) { + if(isset($VARIABLE_DOC_LINKS[$name][3]) && $VARIABLE_DOC_LINKS[$name][3]=='byte') + echo '<abbr title="'.PMA_formatNumber($value, 0).'">'.implode(' ',PMA_formatByteDown($value,3,3)).'</abbr>'; + else echo PMA_formatNumber($value, 0); $is_numeric = true; } else { echo htmlspecialchars($value); diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 72dec00..8f03feb 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -258,6 +258,10 @@ td.null { text-align: <?php echo $right; ?>; } +table .valueHeader { + text-align: <?php echo $right; ?>; + white-space: normal; +} table .value { text-align: <?php echo $right; ?>; white-space: normal; @@ -960,6 +964,11 @@ img.sortableIcon { background-repeat:no-repeat; } +h3#serverstatusqueries span { + font-size:60%; + display:inline; +} + table#serverstatusqueriesdetails th img.sortableIcon, table#serverstatusvariables th img.sortableIcon { background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_sortable.png); } @@ -990,6 +999,8 @@ div#serverstatus table caption a.top { div#serverstatusquerieschart { float:<?php echo $right; ?>; + width:500px; + height:350px; } div#serverstatus table#serverstatusqueriesdetails { @@ -1035,6 +1046,14 @@ div#serverstatus table tbody td.descr a:after, div#serverstatus table .tblFooters a:after { content: ']'; } + +div.liveChart { + clear:both; + min-width:500px; + height:400px; + padding-bottom:80px; +} + /* end serverstatus */ /* querywindow */ diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 3c9d951..e55caad 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -432,6 +432,10 @@ td.null { text-align: <?php echo $right; ?>; } +table .valueHeader { + text-align: <?php echo $right; ?>; + white-space: normal; +} table .value { text-align: <?php echo $right; ?>; white-space: normal; @@ -1166,6 +1170,11 @@ img.sortableIcon { background-repeat:no-repeat; } +h3#serverstatusqueries span { + font-size:60%; + display:inline; +} + table#serverstatusqueriesdetails th.headerSortUp img.sortableIcon, table#serverstatusvariables th.headerSortUp img.sortableIcon { background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asc.png); } @@ -1175,7 +1184,7 @@ table#serverstatusqueriesdetails th.headerSortDown img.sortableIcon, table#serve .statuslinks { float: <?php echo $right; ?>; - white-space: nowrap; + white-space: nowrap; } /* Also used for the variables page */ @@ -1193,6 +1202,8 @@ div#serverstatus table caption a.top { div#serverstatusquerieschart { float:<?php echo $right; ?>; + width:500px; + height:350px; } div#serverstatus table#serverstatusqueriesdetails { @@ -1225,8 +1236,28 @@ div#serverstatus table tbody td.descr a, div#serverstatus table .tblFooters a { white-space: nowrap; } + +div.liveChart { + clear:both; + min-width:500px; + height:400px; + padding-bottom:80px; +} /* end serverstatus */ +/* server variables */ + +a.editIcon { + float: <?php echo $left; ?>; + font-family:sans-serif; +} + +table#serverVariables td { + height:18px; +} + +/* end server variables */ + /* querywindow */ body#bodyquerywindow { margin: 0; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3861-g79f28d8
by Marc Delisle 16 Jun '11

16 Jun '11

The branch, master has been updated via 79f28d8dbbcfe0e42847d2bfa3bb5a9003f5f470 (commit) via d90bad9a8b324e4a9ae8cc0c6f401a74a488604b (commit) from 4338b70d9fdec523d93af791ba34817431e20154 (commit) - Log ----------------------------------------------------------------- commit 79f28d8dbbcfe0e42847d2bfa3bb5a9003f5f470 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jun 16 16:16:09 2011 -0400 ChangeLog entry for patch commit d90bad9a8b324e4a9ae8cc0c6f401a74a488604b Author: Rouslan Placella <rouslan(a)placella.com> Date: Thu Jun 16 16:15:12 2011 -0400 Patch #3316969 PMA_ajaxShowMessage() does not respect timeout ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/functions.js | 96 ++++++++++++++++++++++--------------------------------- 2 files changed, 39 insertions(+), 58 deletions(-) diff --git a/ChangeLog b/ChangeLog index b69dd20..edbb3ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog + rfe #939233 [interface] Flexible column width + [interface] Mouse-based column reordering in query results + AJAX for Insert to a table from database Structure page +- Patch #3316969 PMA_ajaxShowMessage() does not respect timeout 3.4.3.0 (not yet released) - bug #3311170 [sync] Missing helper icons in Synchronize diff --git a/js/functions.js b/js/functions.js index 1b09f63..3418e51 100644 --- a/js/functions.js +++ b/js/functions.js @@ -15,10 +15,9 @@ var sql_box_locked = false; var only_once_elements = new Array(); /** - * @var ajax_message_init boolean boolean that stores status of - * notification for PMA_ajaxShowNotification + * @var int ajax_message_count Number of AJAX messages shown since page load */ -var ajax_message_init = false; +var ajax_message_count = 0; /** * @var codemirror_editor object containing CodeMirror editor @@ -1244,83 +1243,64 @@ $(document).ready(function(){ * optional, defaults to 'Loading...' * @param var timeout number of milliseconds for the message to be visible * optional, defaults to 5000 - * @return jQuery object jQuery Element that holds the message div + * @return jQuery object jQuery Element that holds the message div */ - function PMA_ajaxShowMessage(message, timeout) { - //Handle the case when a empty data.message is passed. We don't want the empty message - if(message == '') { + //Handle the case when a empty data.message is passed. We don't want the empty message + if (message == '') { return true; + } else if (! message) { + // If the message is undefined, show the default + message = PMA_messages['strLoading']; } /** - * @var msg String containing the message that has to be displayed - * @default PMA_messages['strLoading'] + * @var timeout Number of milliseconds for which the message will be visible + * @default 5000 ms */ - if(!message) { - var msg = PMA_messages['strLoading']; + if (! timeout) { + timeout = 5000; } - else { - var msg = message; + + // Create a parent element for the AJAX messages, if necessary + if ($('#loading_parent').length == 0) { + $('<div id="loading_parent"></div>') + .insertBefore("#serverinfo"); } + // Update message count to create distinct message elements every time + ajax_message_count++; + + // Remove all old messages, if any + $(".ajax_notification[id^=ajax_message_num]").remove(); + /** - * @var timeout Number of milliseconds for which {@link msg} will be visible - * @default 5000 ms + * @var $retval a jQuery object containing the reference + * to the created AJAX message */ - if(!timeout) { - var to = 5000; - } - else { - var to = timeout; - } - - if( !ajax_message_init) { - //For the first time this function is called, append a new div - $(function(){ - $('<div id="loading_parent"></div>') - .insertBefore("#serverinfo"); - - $('<span id="loading" class="ajax_notification"></span>') - .appendTo("#loading_parent") - .html(msg) - .fadeIn('medium') - .delay(to) - .fadeOut('medium', function(){ - $(this) - .html("") //Clear the message - .hide(); - }); - }, 'top.frame_content'); - ajax_message_init = true; - } - else { - //Otherwise, just show the div again after inserting the message - $("#loading") - .stop(true, true) - .html(msg) + var $retval = $('<span class="ajax_notification" id="ajax_message_num_' + ajax_message_count + '"></span>') + .hide() + .appendTo("#loading_parent") + .html(message) .fadeIn('medium') - .delay(to) + .delay(timeout) .fadeOut('medium', function() { - $(this) - .html("") - .hide(); - }) - } + $(this).remove(); + }); - return $("#loading"); + return $retval; } /** * Removes the message shown for an Ajax operation when it's completed */ function PMA_ajaxRemoveMessage($this_msgbox) { - $this_msgbox - .stop(true, true) - .fadeOut('medium', function() { - $this_msgbox.hide(); - }); + if ($this_msgbox != 'undefined' && $this_msgbox instanceof jQuery) { + $this_msgbox + .stop(true, true) + .fadeOut('medium'); + } } /** hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3859-g4338b70
by Madhura Jayaratne 16 Jun '11

16 Jun '11

The branch, master has been updated via 4338b70d9fdec523d93af791ba34817431e20154 (commit) via 9d2269d297cdc04dfe19d29025afb28b87a83f66 (commit) from 51af35ee1409256c70ed2ea226dd984582ed830f (commit) - Log ----------------------------------------------------------------- commit 4338b70d9fdec523d93af791ba34817431e20154 Merge: 51af35ee1409256c70ed2ea226dd984582ed830f 9d2269d297cdc04dfe19d29025afb28b87a83f66 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jun 16 21:23:12 2011 +0530 Merge branch 'QA_3_4' Conflicts: js/sql.js ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 042bf04..b69dd20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ phpMyAdmin - ChangeLog - bug #3315720 [search] Fix search in non unicode tables - bug #3315741 [display] Inline query edit broken - patch #3317206 [privileges] Generate password option missing on new accounts +- bug #3317293 [edit] Inline edit places HTML line breaks in edit area 3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/sql.js b/js/sql.js index dfe05da..bc252a5 100644 --- a/js/sql.js +++ b/js/sql.js @@ -712,8 +712,10 @@ $(document).ready(function() { // and store the current value in a hidden span if($this_field.is(':not(.truncated, .transformed, .relation, .enum, .set, .null)')) { // handle non-truncated, non-transformed, non-relation values + + value = data_value.replace("<br>", "\n"); // We don't need to get any more data, just wrap the value - $this_field_span.append('<textarea>'+data_value+'</textarea>'); + $this_field_span.append('<textarea>' + value + '</textarea>'); $this_field.data('original_data', data_value); } else if($this_field.is('.truncated, .transformed')) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2-24-g9d2269d
by Madhura Jayaratne 16 Jun '11

16 Jun '11

The branch, QA_3_4 has been updated via 9d2269d297cdc04dfe19d29025afb28b87a83f66 (commit) from 99bae4acb9a94c93ca31c8d49eb9a771f34aad54 (commit) - Log ----------------------------------------------------------------- commit 9d2269d297cdc04dfe19d29025afb28b87a83f66 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Thu Jun 16 21:05:54 2011 +0530 bug #3317293 [edit] Inline edit places HTML line breaks in edit area ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ae3c2e..cc6ce50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog - bug #3315720 [search] Fix search in non unicode tables - bug #3315741 [display] Inline query edit broken - patch #3317206 [privileges] Generate password option missing on new accounts +- bug #3317293 [edit] Inline edit places HTML line breaks in edit area 3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/sql.js b/js/sql.js index 26075d4..e871c74 100644 --- a/js/sql.js +++ b/js/sql.js @@ -678,8 +678,10 @@ $(document).ready(function() { // and store the current value in a hidden span if($this_field.is(':not(.truncated, .transformed, .relation, .enum, .set, .null)')) { // handle non-truncated, non-transformed, non-relation values + + value = data_value.replace("<br>", "\n"); // We don't need to get any more data, just wrap the value - $this_field.append('<textarea>'+data_value+'</textarea>'); + $this_field.append('<textarea>' + value + '</textarea>'); $this_field.data('original_data', data_value); } else if($this_field.is('.truncated, .transformed')) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3857-g51af35e
by Marc Delisle 16 Jun '11

16 Jun '11

The branch, master has been updated via 51af35ee1409256c70ed2ea226dd984582ed830f (commit) via 99bae4acb9a94c93ca31c8d49eb9a771f34aad54 (commit) from 6f305d40814a5383e739f86a8f68ae19118c03bf (commit) - Log ----------------------------------------------------------------- commit 51af35ee1409256c70ed2ea226dd984582ed830f Merge: 6f305d40814a5383e739f86a8f68ae19118c03bf 99bae4acb9a94c93ca31c8d49eb9a771f34aad54 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Jun 16 07:57:54 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_privileges.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f30beea..042bf04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ phpMyAdmin - ChangeLog - patch #3313326 [interface] Some tooltips do not disappear - bug #3315720 [search] Fix search in non unicode tables - bug #3315741 [display] Inline query edit broken +- patch #3317206 [privileges] Generate password option missing on new accounts 3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/server_privileges.php b/server_privileges.php index b5f7031..cedbcef 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1698,7 +1698,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs unset ($row); echo ' <fieldset id="fieldset_add_user">' . "\n" - . ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&adduser=1">' . "\n" + . ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&adduser=1" class="' . $conditional_class . '">' . "\n" . PMA_getIcon('b_usradd.png') . ' ' . __('Add user') . '</a>' . "\n" . ' </fieldset>' . "\n"; hooks/post-receive -- phpMyAdmin

1 0