The branch, master has been updated via f49fe427f534350e029f0b08627e6ce565368de8 (commit) via bd0ad7377e92325d92d1de40ba52b8e89bc19664 (commit) via db6cd4b5f1a6392bba65e9671e0ca2bc29d877b7 (commit) via 06ef08de195ea10c4e4b94ba1c03f8a6210421cf (commit) via 3884a20bbbbd50b89787dc6280c088fd4f13abcf (commit) via 5f4c3baeb86b7421c0eed45080ac89157a483e8c (commit) via f3a3be27078d5429116f9346f274f78e799a084f (commit) via 7887b102d233aca0e3ee25a72426a13719c1fcb8 (commit) via e8f2e54e372cddbfb7a73b17283b2ad35670e915 (commit) via 2f4a6f7887a985cda85283f807f175b651251b5e (commit) via f2cd5949691ea3046e836d8b9509a81339d3def4 (commit) via 58336172827d40d914f6000a67f13349e766cdc0 (commit) via 0b93849064935459483368e0f47ad14e6dad0afe (commit) via 2436413b7627f699ff16ed2f833b8d0a28d0e572 (commit) via 83b67b5b83272ef4d4e518d43909b1f5fbfb43e0 (commit) via 319d52a920ce6e5fb56e461e2f6a9979ebd2452c (commit) via ab4461ffc11b2a0db36e4777a4790e8eff68e6c8 (commit) via eb0eb9f314c7934fe10a9cf9d1aca4f0155c63ea (commit) via 50501884b126fd92bcc111c9b4c64a44d446fb36 (commit) via 1935157590dfeafb08644e06ca126cd8c85071b6 (commit) via c049f54e5cb1b4b62ea299abb91eb3e3804c23e0 (commit) via f93638f47acfceb081c624ef3c0264989fb0b897 (commit) via 4f919c28a2a99812ec4908036723fc104aab0d59 (commit) via 2dfd1dca1490959f4ee594eb7de9e3e996fd6b4c (commit) via efc03d8c8cfa354f703c7a40780035efa93235a4 (commit) from 44fb8024eef8abac296b139beb5f9b7f7c66e5d3 (commit)
- Log ----------------------------------------------------------------- commit f49fe427f534350e029f0b08627e6ce565368de8 Merge: db6cd4b bd0ad73 Author: Michal Čihař mcihar@suse.cz Date: Thu Nov 10 14:54:08 2011 +0100
Merge remote-tracking branch 'origin/QA_3_4'
commit db6cd4b5f1a6392bba65e9671e0ca2bc29d877b7 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Nov 10 15:44:06 2011 +0200
Translation update done using Pootle.
commit 06ef08de195ea10c4e4b94ba1c03f8a6210421cf Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Nov 10 15:43:31 2011 +0200
Translation update done using Pootle.
commit 3884a20bbbbd50b89787dc6280c088fd4f13abcf Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Nov 10 15:42:56 2011 +0200
Translation update done using Pootle.
commit 5f4c3baeb86b7421c0eed45080ac89157a483e8c Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Nov 10 15:40:54 2011 +0200
Translation update done using Pootle.
commit f3a3be27078d5429116f9346f274f78e799a084f Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Nov 10 15:37:33 2011 +0200
Translation update done using Pootle.
commit 7887b102d233aca0e3ee25a72426a13719c1fcb8 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Nov 10 15:36:47 2011 +0200
Translation update done using Pootle.
commit e8f2e54e372cddbfb7a73b17283b2ad35670e915 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Nov 10 15:35:52 2011 +0200
Translation update done using Pootle.
commit 2f4a6f7887a985cda85283f807f175b651251b5e Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Nov 10 15:34:31 2011 +0200
Translation update done using Pootle.
commit f2cd5949691ea3046e836d8b9509a81339d3def4 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Nov 10 15:34:01 2011 +0200
Translation update done using Pootle.
commit 58336172827d40d914f6000a67f13349e766cdc0 Author: Victor Volkov hanut@php-myadmin.ru Date: Thu Nov 10 15:33:07 2011 +0200
Translation update done using Pootle.
commit 0b93849064935459483368e0f47ad14e6dad0afe Author: Michal Čihař michal@cihar.com Date: Thu Nov 10 12:24:49 2011 +0200
Translation update done using Pootle.
commit 2436413b7627f699ff16ed2f833b8d0a28d0e572 Author: Michal Čihař michal@cihar.com Date: Thu Nov 10 12:24:07 2011 +0200
Translation update done using Pootle.
commit 83b67b5b83272ef4d4e518d43909b1f5fbfb43e0 Author: Michal Čihař michal@cihar.com Date: Thu Nov 10 12:23:47 2011 +0200
Translation update done using Pootle.
commit 319d52a920ce6e5fb56e461e2f6a9979ebd2452c Author: Michal Čihař michal@cihar.com Date: Thu Nov 10 12:23:29 2011 +0200
Translation update done using Pootle.
commit ab4461ffc11b2a0db36e4777a4790e8eff68e6c8 Author: Michal Čihař michal@cihar.com Date: Thu Nov 10 12:22:48 2011 +0200
Translation update done using Pootle.
commit eb0eb9f314c7934fe10a9cf9d1aca4f0155c63ea Author: Michal Čihař michal@cihar.com Date: Thu Nov 10 12:22:36 2011 +0200
Translation update done using Pootle.
commit 50501884b126fd92bcc111c9b4c64a44d446fb36 Author: Michal Čihař michal@cihar.com Date: Thu Nov 10 12:22:21 2011 +0200
Translation update done using Pootle.
commit 1935157590dfeafb08644e06ca126cd8c85071b6 Author: Michal Čihař michal@cihar.com Date: Thu Nov 10 12:22:12 2011 +0200
Translation update done using Pootle.
commit c049f54e5cb1b4b62ea299abb91eb3e3804c23e0 Author: Michal Čihař michal@cihar.com Date: Thu Nov 10 12:21:44 2011 +0200
Translation update done using Pootle.
commit f93638f47acfceb081c624ef3c0264989fb0b897 Author: Michal Čihař michal@cihar.com Date: Thu Nov 10 12:21:07 2011 +0200
Translation update done using Pootle.
commit 4f919c28a2a99812ec4908036723fc104aab0d59 Author: Michal Čihař michal@cihar.com Date: Thu Nov 10 12:20:28 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: Documentation.html | 3 +-- po/cs.po | 28 +++++++++++++--------------- po/ru.po | 27 +++++++++++++++------------ 3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/Documentation.html b/Documentation.html index ad67696..c31706a 100644 --- a/Documentation.html +++ b/Documentation.html @@ -3589,8 +3589,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension group under which Apache runs. </li> <li> - You should use PHP safe mode, to protect from other users that try - to include your <i>config.inc.php</i> in their scripts. + Follow security recommendations for PHP and your webserver. </li> </ul>
diff --git a/po/cs.po b/po/cs.po index c4b5ca3..46f5509 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-09 14:34+0100\n" -"PO-Revision-Date: 2011-11-01 14:49+0200\n" +"PO-Revision-Date: 2011-11-10 12:24+0200\n" "Last-Translator: Michal Čihař michal@cihar.com\n" "Language-Team: czech cs@li.org\n" "Language: cs\n" @@ -11797,6 +11797,7 @@ msgstr "" #, php-format msgid "The slow query rate should be below 5%%, your value is %s%%." msgstr "" +"Četnost pomalých dotazů by měla být pod 5%%, ale na tomto serveru je %s%%."
#: po/advisory_rules.php:20 msgid "Slow query rate" @@ -11805,7 +11806,7 @@ msgstr "Četnost pomalých dotazů" #: po/advisory_rules.php:21 msgid "" "There is a high percentage of slow queries compared to the server uptime." -msgstr "" +msgstr "Server provádí mnoho pomalých dotazů v porovnání s dobou běhu."
#: po/advisory_rules.php:23 #, php-format @@ -11813,6 +11814,8 @@ msgid "" "You have a slow query rate of %s per hour, you should have less than 1%% per " "hour." msgstr "" +"Četnost pomalých dotazů na tomto serveru je %s za hodinu, měla by být pod 1%" +"%."
#: po/advisory_rules.php:25 msgid "Long query time" @@ -11836,16 +11839,14 @@ msgid "long_query_time is currently set to %ds." msgstr "long_query_time je nastaven na %d sekund."
#: po/advisory_rules.php:30 -#, fuzzy #| msgid "Show query box" msgid "Slow query logging" -msgstr "Zobrazit pole pro dotaz" +msgstr "Zaznamenávání pomalých dotazů"
#: po/advisory_rules.php:31 -#, fuzzy #| msgid "slow_query_log is enabled." msgid "The slow query log is disabled." -msgstr "slow_query_log je povolen." +msgstr "Zaznamenávání pomalých dotazů je vypnuto."
#: po/advisory_rules.php:32 msgid "" @@ -11858,14 +11859,13 @@ msgid "log_slow_queries is set to 'OFF'" msgstr ""
#: po/advisory_rules.php:35 -#, fuzzy #| msgid "Clear series" msgid "Release Series" -msgstr "Odstranit série" +msgstr "Vydání"
#: po/advisory_rules.php:36 msgid "The MySQL server version less then 5.1." -msgstr "" +msgstr "MySQL server je starší než 5.1."
#: po/advisory_rules.php:37 msgid "" @@ -11886,7 +11886,7 @@ msgstr "Verze"
#: po/advisory_rules.php:41 msgid "Version less than 5.1.30 (the first GA release of 5.1)." -msgstr "" +msgstr "Verze staší než 5.1.30 (první GA vydání 5.1)."
#: po/advisory_rules.php:42 msgid "" @@ -11896,13 +11896,12 @@ msgstr ""
#: po/advisory_rules.php:46 msgid "Version less than 5.5.8 (the first GA release of 5.5)." -msgstr "" +msgstr "Verze staší než 5.5.8 (první GA vydání 5.5)."
#: po/advisory_rules.php:47 -#, fuzzy #| msgid "You should upgrade to %s %s or later." msgid "You should upgrade, to a stable version of MySQL 5.5" -msgstr "Měli byste aktualizovat %s na verzi %s nebo vyšší." +msgstr "Měli byste aktualizovat na stabilní verzi MySQL 5.5."
#: po/advisory_rules.php:50 po/advisory_rules.php:55 po/advisory_rules.php:60 msgid "Distribution" @@ -11971,10 +11970,9 @@ msgid "Query cache disabled" msgstr "Vyrovnávací paměť dotazů je vypnutá"
#: po/advisory_rules.php:71 -#, fuzzy #| msgid "The server is not responding" msgid "The query cache is not enabled." -msgstr "Server neodpovídá" +msgstr "Vyrovnávací paměť není povolena."
#: po/advisory_rules.php:72 msgid "" diff --git a/po/ru.po b/po/ru.po index 3e6e4fa..7f6263f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-11-09 14:34+0100\n" -"PO-Revision-Date: 2011-11-09 22:22+0200\n" +"PO-Revision-Date: 2011-11-10 15:43+0200\n" "Last-Translator: Victor Volkov hanut@php-myadmin.ru\n" "Language-Team: russian ru@li.org\n" "Language: ru\n" @@ -12895,54 +12895,57 @@ msgid "The thread cache is set to 0" msgstr "Кеш потока установлен в 0"
#: po/advisory_rules.php:210 -#, fuzzy, php-format +#, php-format #| msgid "Tracking is not active." msgid "Thread cache hit rate %%" -msgstr "Слежение выключено." +msgstr "%% соотношение обращений в кеш потока"
#: po/advisory_rules.php:211 -#, fuzzy #| msgid "Tracking is not active." msgid "Thread cache is not efficient." -msgstr "Слежение выключено." +msgstr "Кеш потока действует не эффективно."
#: po/advisory_rules.php:212 msgid "Increase {thread_cache_size}." -msgstr "" +msgstr "Увеличьте {thread_cache_size}."
#: po/advisory_rules.php:213 #, php-format msgid "Thread cache hitrate: %s%%, this value should be above 80%%" msgstr "" +"Частота успешных обращений в кеш потока: %s%%, данное значение должно быть " +"выше 80%%"
#: po/advisory_rules.php:215 msgid "Threads that are slow to launch" -msgstr "" +msgstr "Потоки с медленным запуском"
#: po/advisory_rules.php:216 -#, fuzzy #| msgid "The number of threads that are not sleeping." msgid "There are too many threads that are slow to launch." -msgstr "Количество процессов, находящихся в активном состоянии." +msgstr "Обнаружено большое количество потоков с медленным запуском."
#: po/advisory_rules.php:217 msgid "" "This generally happens in case of general system overload as it is pretty " "simple operations. You might want to monitor your system load carefully." msgstr "" +"По большей части, это может происходить из-за перегрузки основной системы, " +"так как сами операции достаточно просты. Обратите особое внимание на " +"загрузку вашей системы."
#: po/advisory_rules.php:218 #, php-format msgid "%s thread(s) took longer than %s seconds to start, it should be 0" -msgstr "" +msgstr "Запуск %s потока(ов) занял более %s секунд, должно быть 0"
#: po/advisory_rules.php:220 msgid "Slow launch time" -msgstr "" +msgstr "Время медленного запуска"
#: po/advisory_rules.php:221 msgid "Slow_launch_threads is above 2s" -msgstr "" +msgstr "Slow_launch_threads выше 2 сек."
#: po/advisory_rules.php:222 msgid ""
hooks/post-receive
-
Michal Čihař