August 2011 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13789-g98f9a70
by Michal Čihař 09 Aug '11

09 Aug '11

The branch, master has been updated via 98f9a70ed92690167e498eba9ab7de2480dca694 (commit) via a87e7ffb1011722a24afa478dcb6ba8b2e4ec67c (commit) via b4032e3ca3251ab760299e4eddfffdb455105f2c (commit) via c4b69d65d0cf2429f7402f426de1efbbbd59e853 (commit) via e2efb95b06d437a95c4ad62e797a70afa80532cd (commit) via 9428656f9443db71065e6e8ceb82986e6d97748f (commit) via 01fac6264f156d59fd589ca36429cf25b0a51de4 (commit) via 3687808e53f33e86752e89f8ab2a5911485721b5 (commit) via 7d8130e9b7e9110bcbb0e3ca11be61d5a43f9492 (commit) via 8e9b6103b7eccafc2dbf62b7d5f136cc35948f75 (commit) via 15fa0e7fb50f43eb094bdaef1dfea6459b441aeb (commit) via 8a564bb725a1ba0aa443dfa719288b33608b758d (commit) via c9b0dfdd30da82d1536cdc3911d121f1ab8548c5 (commit) via 02ead19e6605c4c3b4b0d9a289d70f321b8a6d66 (commit) via 7ef067719248a02aa7d0bd75794f5fcb76d81d84 (commit) via d94f6d366c99599293d2b794ab124a9c99f11159 (commit) via 1eadc64855cf19c62a93ff22bc31d1de5b0c7f1e (commit) from db84b2005243f66934d8ae10d9459022e17f46de (commit) - Log ----------------------------------------------------------------- commit 98f9a70ed92690167e498eba9ab7de2480dca694 Merge: a87e7ff db84b20 Author: Pootle server <pootle(a)cihar.com> Date: Tue Aug 9 10:40:06 2011 +0200 Merge remote-tracking branch 'origin/master' commit a87e7ffb1011722a24afa478dcb6ba8b2e4ec67c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 09:37:50 2011 +0200 Translation update done using Pootle. commit b4032e3ca3251ab760299e4eddfffdb455105f2c Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 09:37:26 2011 +0200 Translation update done using Pootle. commit c4b69d65d0cf2429f7402f426de1efbbbd59e853 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 09:37:05 2011 +0200 Translation update done using Pootle. commit e2efb95b06d437a95c4ad62e797a70afa80532cd Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:52:53 2011 +0200 Translation update done using Pootle. commit 9428656f9443db71065e6e8ceb82986e6d97748f Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:49:59 2011 +0200 Translation update done using Pootle. commit 01fac6264f156d59fd589ca36429cf25b0a51de4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:44:54 2011 +0200 Translation update done using Pootle. commit 3687808e53f33e86752e89f8ab2a5911485721b5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:44:32 2011 +0200 Translation update done using Pootle. commit 7d8130e9b7e9110bcbb0e3ca11be61d5a43f9492 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:44:22 2011 +0200 Translation update done using Pootle. commit 8e9b6103b7eccafc2dbf62b7d5f136cc35948f75 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:44:11 2011 +0200 Translation update done using Pootle. commit 15fa0e7fb50f43eb094bdaef1dfea6459b441aeb Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:43:24 2011 +0200 Translation update done using Pootle. commit 8a564bb725a1ba0aa443dfa719288b33608b758d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:43:00 2011 +0200 Translation update done using Pootle. commit c9b0dfdd30da82d1536cdc3911d121f1ab8548c5 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:42:41 2011 +0200 Translation update done using Pootle. commit 02ead19e6605c4c3b4b0d9a289d70f321b8a6d66 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:42:34 2011 +0200 Translation update done using Pootle. commit 7ef067719248a02aa7d0bd75794f5fcb76d81d84 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:41:27 2011 +0200 Translation update done using Pootle. commit d94f6d366c99599293d2b794ab124a9c99f11159 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:41:19 2011 +0200 Translation update done using Pootle. commit 1eadc64855cf19c62a93ff22bc31d1de5b0c7f1e Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:40:58 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/zh_CN.po | 43 +++++++++++++++++++++---------------------- 1 files changed, 21 insertions(+), 22 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 58319e8..23a47e8 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,7 +4,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-08-08 16:05+0200\n" -"PO-Revision-Date: 2011-08-09 08:37+0200\n" +"PO-Revision-Date: 2011-08-09 09:37+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" "Language: zh_CN\n" @@ -1276,68 +1276,67 @@ msgid "" "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, " "depending on your system." msgstr "" +"slow_query_log 已启用，但服务器仅记录查询时间超过 %d 秒的查询。请根据您的系统适当设置 long_query_time 为 0-2 " +"秒。" #: js/messages.php:137 #, php-format msgid "long_query_time is set to %d second(s)." -msgstr "" +msgstr "long_query_time 已设为 %d 秒。" #: js/messages.php:138 msgid "" "Following settings will be applied globally and reset to default on server " "restart:" -msgstr "" +msgstr "下列设置将被应用到整个服务器直到服务器重新启动:" #. l10n: %s is FILE or TABLE #: js/messages.php:140 -#, fuzzy, php-format +#, php-format #| msgid "Save output to a file" msgid "Set log_output to %s" -msgstr "保存为文件" +msgstr "设置 log_output 为 %s" #. l10n: Enable in this context means setting a status variable to ON #: js/messages.php:142 -#, fuzzy, php-format +#, php-format #| msgid "Enabled" msgid "Enable %s" -msgstr "已启用" +msgstr "启用 %s" #. l10n: Disable in this context means setting a status variable to OFF #: js/messages.php:144 -#, fuzzy, php-format +#, php-format #| msgid "Disabled" msgid "Disable %s" -msgstr "已禁用" +msgstr "禁用 %s" #. l10n: %d seconds #: js/messages.php:146 #, php-format msgid "Set long_query_time to %ds" -msgstr "" +msgstr "设置 long_query_time 为 %d 秒" #: js/messages.php:147 msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." -msgstr "" +msgstr "无法修改这些变量。请以 root 登录或联系数据库管理员。" #: js/messages.php:148 -#, fuzzy #| msgid "Manage your settings" msgid "Change settings" -msgstr "管理我的设置" +msgstr "修改设置" #: js/messages.php:149 -#, fuzzy #| msgid "More settings" msgid "Current settings" -msgstr "更多设置" +msgstr "当前设置" #: js/messages.php:151 server_status.php:1472 -#, fuzzy #| msgid "Report title:" msgid "Chart Title" -msgstr "报告标题：" +msgstr "图表标题" #. l10n: As in differential values #: js/messages.php:153 @@ -1431,14 +1430,14 @@ msgstr "正在加载" #: js/messages.php:176 msgid "Monitor refresh failed" -msgstr "" +msgstr "监控刷新失败" #: js/messages.php:177 msgid "" "While requesting new chart data the server returned an invalid response. " "This is most likely because your session expired. Reloading the page and " "reentering your credentials should help." -msgstr "" +msgstr "请求新图表数据时服务器返回了无效数据。这可能是因为会话过期。请尝试重新加载页面。" #: js/messages.php:178 #, fuzzy @@ -1966,7 +1965,7 @@ msgstr "字号" #: libraries/File.class.php:220 msgid "File was not an uploaded file." -msgstr "" +msgstr "文件不是上传的文件。" #: libraries/File.class.php:259 libraries/File.class.php:388 #, fuzzy @@ -2014,11 +2013,11 @@ msgstr "" #: libraries/File.class.php:507 msgid "Error while moving uploaded file." -msgstr "" +msgstr "移动上传的文件时发生错误。" #: libraries/File.class.php:515 msgid "Cannot read (moved) upload file." -msgstr "" +msgstr "无法读取移动后的上传文件。" #: libraries/Index.class.php:418 tbl_relation.php:526 msgid "No index defined!" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13772-gdb84b20
by Michal Čihař 09 Aug '11

09 Aug '11

The branch, master has been updated via db84b2005243f66934d8ae10d9459022e17f46de (commit) from c54b04037dbf8920733cc9fffee4fe585310a1ae (commit) - Log ----------------------------------------------------------------- commit db84b2005243f66934d8ae10d9459022e17f46de Author: Michal Čihař <michal(a)cihar.com> Date: Tue Aug 9 08:53:56 2011 +0200 Explain reason for escaping # after digging in git history ----------------------------------------------------------------------- Summary of changes: libraries/js_escape.lib.php | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/js_escape.lib.php b/libraries/js_escape.lib.php index 25b832f..656794f 100644 --- a/libraries/js_escape.lib.php +++ b/libraries/js_escape.lib.php @@ -25,9 +25,8 @@ function PMA_jsFormat($a_string = '', $add_backquotes = true) if (is_string($a_string)) { $a_string = htmlspecialchars($a_string); $a_string = PMA_escapeJsString($a_string); - /** - * @todo what is this good for? - */ + // Needed for inline javascript to prevent some browsers + // treating it as a anchor $a_string = str_replace('#', '\\#', $a_string); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13771-gc54b040
by Michal Čihař 09 Aug '11

09 Aug '11

The branch, master has been updated via c54b04037dbf8920733cc9fffee4fe585310a1ae (commit) via 1cd48e7962e549e3419339148d8493a88a1f3a2a (commit) via 786fc85aee2bed0650e62e1074ca47b7b6da68ec (commit) via 04d2649e38bcd0826e7252832db08b2c23eab70b (commit) via 01047b353253e859b5d3f0845cf81eeb57b742f9 (commit) via be8e32305fc11f9853e6cb36b1f3229ab31a61e6 (commit) via 0b3951d59beb5b0ee4b36f2c5407ab9dbcd1814d (commit) via c61f87ae08dad69f1998210c31002028c856560c (commit) via 5558e10a3d125c804c087c323bcc56475d6d0bad (commit) via db50c8cf0980ad70671bb0ab78fa4783077c2e7e (commit) via 159205458a6ba8be822fb154a09a7440d6bd0fcd (commit) via b08a3aa2d0970d2cd65760bb04d82652a6044f15 (commit) via 4c5e976088b8ee89d70b989c078f467de9ec5ade (commit) via 049e03892a6ddd8c2d9eb6d7f97ef03800e30a60 (commit) via 6bce2f19775d22247b3e4dc427563bbc7940bfcc (commit) via 59febd005885e2e3fde5792430a5723aace8cf74 (commit) via 8f00cbb6f0fc8434ffb0ecc30b34c7803fd5f91a (commit) via c57b0b8d60a1497948da11d3c0a9ff09e78ef257 (commit) via a7cfb1af4c09a0040910eb048e7c5fbebd0a1307 (commit) via d994f162b7e4154396ddc6a57b1f836b0f267139 (commit) via d3fdee7dfbfb92b07faf7c52c07940687a9b0666 (commit) via 6f09edce18f690f031ceb7eb5b9bd361ab42a7ce (commit) via 948545545015c3b3c8cef159664524e38a8d34a4 (commit) via 671b50c71b51e7c8c1ef1aafc0a848e9abeb161d (commit) via 31bc64273e14e535caf1227dbcaac7edb9f7acdd (commit) via 55c989e699e3e3041e1af8d3de4833c8264c7737 (commit) from 390632084437d6e9835aaf66c7b0c45959196bc6 (commit) - Log ----------------------------------------------------------------- commit c54b04037dbf8920733cc9fffee4fe585310a1ae Merge: c61f87a 1cd48e7 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Aug 9 08:38:15 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 1cd48e7962e549e3419339148d8493a88a1f3a2a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:37:55 2011 +0200 Translation update done using Pootle. commit 786fc85aee2bed0650e62e1074ca47b7b6da68ec Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:37:33 2011 +0200 Translation update done using Pootle. commit 04d2649e38bcd0826e7252832db08b2c23eab70b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:37:27 2011 +0200 Translation update done using Pootle. commit 01047b353253e859b5d3f0845cf81eeb57b742f9 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:37:18 2011 +0200 Translation update done using Pootle. commit be8e32305fc11f9853e6cb36b1f3229ab31a61e6 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:36:58 2011 +0200 Translation update done using Pootle. commit 0b3951d59beb5b0ee4b36f2c5407ab9dbcd1814d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:36:52 2011 +0200 Translation update done using Pootle. commit c61f87ae08dad69f1998210c31002028c856560c Author: Michal Čihař <michal(a)cihar.com> Date: Tue Aug 9 08:36:01 2011 +0200 Remove unused variables commit 5558e10a3d125c804c087c323bcc56475d6d0bad Author: Michal Čihař <michal(a)cihar.com> Date: Tue Aug 9 08:35:00 2011 +0200 Remove unused variables commit db50c8cf0980ad70671bb0ab78fa4783077c2e7e Author: Michal Čihař <michal(a)cihar.com> Date: Tue Aug 9 08:33:50 2011 +0200 Remove unused variables commit 159205458a6ba8be822fb154a09a7440d6bd0fcd Author: Michal Čihař <michal(a)cihar.com> Date: Tue Aug 9 08:32:27 2011 +0200 Unused variable commit b08a3aa2d0970d2cd65760bb04d82652a6044f15 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:28:32 2011 +0200 Translation update done using Pootle. commit 4c5e976088b8ee89d70b989c078f467de9ec5ade Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:27:49 2011 +0200 Translation update done using Pootle. commit 049e03892a6ddd8c2d9eb6d7f97ef03800e30a60 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:27:29 2011 +0200 Translation update done using Pootle. commit 6bce2f19775d22247b3e4dc427563bbc7940bfcc Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:27:19 2011 +0200 Translation update done using Pootle. commit 59febd005885e2e3fde5792430a5723aace8cf74 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:25:04 2011 +0200 Translation update done using Pootle. commit 8f00cbb6f0fc8434ffb0ecc30b34c7803fd5f91a Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:24:39 2011 +0200 Translation update done using Pootle. commit c57b0b8d60a1497948da11d3c0a9ff09e78ef257 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:23:59 2011 +0200 Translation update done using Pootle. commit a7cfb1af4c09a0040910eb048e7c5fbebd0a1307 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:23:40 2011 +0200 Translation update done using Pootle. commit d994f162b7e4154396ddc6a57b1f836b0f267139 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:23:18 2011 +0200 Translation update done using Pootle. commit d3fdee7dfbfb92b07faf7c52c07940687a9b0666 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:18:22 2011 +0200 Translation update done using Pootle. commit 6f09edce18f690f031ceb7eb5b9bd361ab42a7ce Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:14:54 2011 +0200 Translation update done using Pootle. commit 948545545015c3b3c8cef159664524e38a8d34a4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:11:17 2011 +0200 Translation update done using Pootle. commit 671b50c71b51e7c8c1ef1aafc0a848e9abeb161d Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:11:08 2011 +0200 Translation update done using Pootle. commit 31bc64273e14e535caf1227dbcaac7edb9f7acdd Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:10:19 2011 +0200 Translation update done using Pootle. commit 55c989e699e3e3041e1af8d3de4833c8264c7737 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Tue Aug 9 08:05:51 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: db_search.php | 6 ---- libraries/Config.class.php | 2 +- libraries/File.class.php | 2 - libraries/List_Database.class.php | 3 +- po/zh_CN.po | 49 ++++++++++++++++-------------------- 5 files changed, 24 insertions(+), 38 deletions(-) diff --git a/db_search.php b/db_search.php index acbe0cb..c0f2c08 100644 --- a/db_search.php +++ b/db_search.php @@ -120,14 +120,9 @@ if (isset($_REQUEST['submit_search'])) { * 3 -> exact string, 4 -> regexp) * * @return array 3 SQL querys (for count, display and delete results) - * - * @global string the url to return to in case of errors - * @global string charset connection */ function PMA_getSearchSqls($table, $field, $search_str, $search_option) { - global $err_url; - // Statement types $sqlstr_select = 'SELECT'; $sqlstr_delete = 'DELETE'; @@ -140,7 +135,6 @@ if (isset($_REQUEST['submit_search'])) { $sqlstr_from = ' FROM ' . PMA_backquote($GLOBALS['db']) . '.' . PMA_backquote($table); $search_words = (($search_option > 2) ? array($search_str) : explode(' ', $search_str)); - $search_wds_cnt = count($search_words); $like_or_regex = (($search_option == 4) ? 'REGEXP' : 'LIKE'); $automatic_wildcard = (($search_option < 3) ? '%' : ''); diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 9822807..803e0c0 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -284,7 +284,7 @@ class PMA_Config $match = array(); if (! preg_match('@([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2})@', phpversion(), $match)) { - $result = preg_match('@([0-9]{1,2}).([0-9]{1,2})@', + preg_match('@([0-9]{1,2}).([0-9]{1,2})@', phpversion(), $match); } if (isset($match) && ! empty($match[1])) { diff --git a/libraries/File.class.php b/libraries/File.class.php index bad9bca..5a6d59f 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -679,8 +679,6 @@ class PMA_File function advanceFilePointer($length) { while ($length > 0) { - // Disable read progresivity, otherwise we eat all memory! - $read_multiply = 1; // required? $this->getNextChunk($length); $length -= $this->getChunkSize(); } diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index 259bbf8..a890773 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -226,7 +226,6 @@ require_once './libraries/List.class.php'; public function getGroupedDetails($offset, $count) { $dbgroups = array(); - $parts = array(); if ($GLOBALS['cfg']['ShowTooltip'] && $GLOBALS['cfgRelation']['commwork']) { @@ -243,7 +242,7 @@ require_once './libraries/List.class.php'; $separators = array(); } - foreach ($this->getLimitedItems($offset, $count) as $key => $db) { + foreach ($this->getLimitedItems($offset, $count) as $db) { // Get comments from PMA comments table $db_tooltip = ''; diff --git a/po/zh_CN.po b/po/zh_CN.po index 8907ab3..58319e8 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,7 +4,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-08-08 16:05+0200\n" -"PO-Revision-Date: 2011-08-08 08:33+0200\n" +"PO-Revision-Date: 2011-08-09 08:37+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" "Language: zh_CN\n" @@ -983,10 +983,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!" @@ -1031,24 +1030,22 @@ msgid "Edit" msgstr "编辑" #: js/messages.php:66 server_status.php:667 -#, fuzzy #| msgid "Server Choice" msgid "Live traffic chart" -msgstr "选择服务器" +msgstr "实时流量图" #: js/messages.php:67 server_status.php:670 msgid "Live conn./process chart" -msgstr "" +msgstr "实时连接/进程图" #: js/messages.php:68 server_status.php:688 -#, fuzzy #| msgid "Show query chart" msgid "Live query chart" -msgstr "显示查询图表" +msgstr "实时查询图" #: js/messages.php:70 msgid "Static data" -msgstr "" +msgstr "静态数据" #. l10n: Total number of queries #: js/messages.php:72 libraries/build_html_for_db.lib.php:46 @@ -1061,7 +1058,7 @@ msgstr "总计" #. l10n: Other, small valued, queries #: js/messages.php:74 server_status.php:873 msgid "Other" -msgstr "" +msgstr "其它" #. l10n: Thousands separator #: js/messages.php:76 libraries/common.lib.php:1356 @@ -1075,31 +1072,29 @@ msgstr "." #: js/messages.php:80 msgid "KiB sent since last refresh" -msgstr "" +msgstr "自上次刷新起发送的数据 [单位: KB]" #: js/messages.php:81 msgid "KiB received since last refresh" -msgstr "" +msgstr "自上次刷新起接收的数据 [单位: KB]" #: js/messages.php:82 -#, fuzzy #| msgid "Server Choice" msgid "Server traffic (in KiB)" -msgstr "选择服务器" +msgstr "服务器流量 (单位: KB)" #: js/messages.php:83 msgid "Connections since last refresh" -msgstr "" +msgstr "自上次刷新起的连接数" #: js/messages.php:84 js/messages.php:115 server_status.php:1068 msgid "Processes" msgstr "进程" #: js/messages.php:85 -#, fuzzy #| msgid "Connections" msgid "Connections / Processes" -msgstr "连接" +msgstr "连接 / 进程" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:87 @@ -1117,15 +1112,15 @@ msgstr "查询统计" #: js/messages.php:94 msgid "System CPU Usage" -msgstr "" +msgstr "系统 CPU 使用" #: js/messages.php:95 msgid "System memory" -msgstr "" +msgstr "系统内存" #: js/messages.php:96 msgid "System swap" -msgstr "" +msgstr "系统交换空间" #. l10n: shortcuts for Megabyte #: js/messages.php:97 libraries/common.lib.php:1306 server_status.php:1512 @@ -1139,7 +1134,7 @@ msgstr "KB" #: js/messages.php:100 msgid "Average load" -msgstr "" +msgstr "平均负载" #: js/messages.php:101 #, fuzzy @@ -1244,27 +1239,27 @@ msgstr "无" #: js/messages.php:127 msgid "Resume monitor" -msgstr "" +msgstr "继续监控" #: js/messages.php:128 msgid "Pause monitor" -msgstr "" +msgstr "暂停监控" #: js/messages.php:130 msgid "general_log and slow_query_log are enabled." -msgstr "" +msgstr "general_log 和 slow_query_log 已启用。" #: js/messages.php:131 msgid "general_log is enabled." -msgstr "" +msgstr "general_log 已启用。" #: js/messages.php:132 msgid "slow_query_log is enabled." -msgstr "" +msgstr "slow_query_log 已启用。" #: js/messages.php:133 msgid "slow_query_log and general_log are disabled." -msgstr "" +msgstr "slow_query_log 和 general_log 已禁用。" #: js/messages.php:134 msgid "log_output is not set to TABLE." hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13745-g3906320
by Michal Čihař 09 Aug '11

09 Aug '11

The branch, master has been updated via 390632084437d6e9835aaf66c7b0c45959196bc6 (commit) via d6a0741cf8ecdad3eb0ba588c6ab4a5bbd283277 (commit) via f08d2ded46658fcd67ffe4b3ab26d2bc405ffeb1 (commit) from 4976a5fa5caab47a221598dd4b43182fb36eea11 (commit) - Log ----------------------------------------------------------------- commit 390632084437d6e9835aaf66c7b0c45959196bc6 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Aug 9 07:37:24 2011 +0200 Unused variable commit d6a0741cf8ecdad3eb0ba588c6ab4a5bbd283277 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Aug 9 07:37:08 2011 +0200 Check for correct variable commit f08d2ded46658fcd67ffe4b3ab26d2bc405ffeb1 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Aug 9 07:36:11 2011 +0200 Unused variable ----------------------------------------------------------------------- Summary of changes: libraries/Theme_Manager.class.php | 1 - libraries/sqlparser.lib.php | 3 +-- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index eac54ef..174c031 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -284,7 +284,6 @@ class PMA_Theme_Manager $select_box .= PMA_generate_common_hidden_inputs(); } - $theme_selected = false; $theme_preview_path= './themes.php'; $theme_preview_href = '<a href="' . $theme_preview_path . '" target="themes" class="themeselect">'; $select_box .= $theme_preview_href . __('Theme') . '</a>:' . "\n"; diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 10c7547..bde23e3 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -221,7 +221,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { } // Create local hashtables - if (!isset($PMA_SQPdata_column_attrib_cnt)) { + if (!isset($PMA_SQPdata_column_attrib)) { $PMA_SQPdata_column_attrib = array_flip( $GLOBALS['PMA_SQPdata_column_attrib'] ); @@ -348,7 +348,6 @@ if (! defined('PMA_MINIMUM_COMMON')) { $quotetype = $c; $count2++; $escaped = false; - $escaped_escaped = false; $pos = $count2; $oldpos = 0; do { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13742-g4976a5f
by Michal Čihař 09 Aug '11

09 Aug '11

The branch, master has been updated via 4976a5fa5caab47a221598dd4b43182fb36eea11 (commit) via 4d51108b3971367bdb481874f8cc27a850ffebb4 (commit) via b2ad3a4472087183f51e970cfa0dabd6c7e9f98b (commit) via c5effdb7b2d63af198bb98f968c5be2a9dda4bc4 (commit) via 802bce5b23df37038f45bbfdfa1540ec535dc27c (commit) via 05ae814449e5cadad54988e597003527347ceb82 (commit) via de6da67d5e1648b37d4d4ef47596a707dcf1daad (commit) via 534a32e2638a6d3d46d48cc29a58c6bde0ac4fbe (commit) via aea1911f1ec591532ccfc95692e811d579006dfd (commit) via 86f6ce780cdd846a56c49600fdf513f533a7e5c2 (commit) via b2cb398596e8e177f917808b1be52d0c5af6aad2 (commit) via 7e4dc15ad29fd0ebb91e56d18a29b4c98891c152 (commit) via 370abf6333988ac27cdc96ca4048275727a225f9 (commit) via 7a8c721ca7a9e56905ddd8d574f8a81aee3df234 (commit) via c2666ec836950e2981f45ce4e6aee66dc3cec54e (commit) via 306fd51e845e2accf5e06cd65f3076a9ec47b4eb (commit) via 5064224a69bbd562a338bd04b23603988e0173ca (commit) via 47002c30f5aa643f1e0798cee05bcf78c619a9f9 (commit) from 630cdd991531377f195eb131859172cf2303402e (commit) - Log ----------------------------------------------------------------- commit 4976a5fa5caab47a221598dd4b43182fb36eea11 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Aug 8 19:21:27 2011 +0200 Translation update done using Pootle. commit 4d51108b3971367bdb481874f8cc27a850ffebb4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Aug 8 19:21:09 2011 +0200 Translation update done using Pootle. commit b2ad3a4472087183f51e970cfa0dabd6c7e9f98b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Aug 8 19:20:42 2011 +0200 Translation update done using Pootle. commit c5effdb7b2d63af198bb98f968c5be2a9dda4bc4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Mon Aug 8 19:20:22 2011 +0200 Translation update done using Pootle. commit 802bce5b23df37038f45bbfdfa1540ec535dc27c Merge: 05ae814 630cdd9 Author: Pootle server <pootle(a)cihar.com> Date: Mon Aug 8 18:40:06 2011 +0200 Merge remote-tracking branch 'origin/master' commit 05ae814449e5cadad54988e597003527347ceb82 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 18:05:41 2011 +0200 Translation update done using Pootle. commit de6da67d5e1648b37d4d4ef47596a707dcf1daad Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 18:05:33 2011 +0200 Translation update done using Pootle. commit 534a32e2638a6d3d46d48cc29a58c6bde0ac4fbe Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 18:04:14 2011 +0200 Translation update done using Pootle. commit aea1911f1ec591532ccfc95692e811d579006dfd Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 18:03:51 2011 +0200 Translation update done using Pootle. commit 86f6ce780cdd846a56c49600fdf513f533a7e5c2 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 18:03:31 2011 +0200 Translation update done using Pootle. commit b2cb398596e8e177f917808b1be52d0c5af6aad2 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 18:03:00 2011 +0200 Translation update done using Pootle. commit 7e4dc15ad29fd0ebb91e56d18a29b4c98891c152 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 18:02:53 2011 +0200 Translation update done using Pootle. commit 370abf6333988ac27cdc96ca4048275727a225f9 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 18:02:46 2011 +0200 Translation update done using Pootle. commit 7a8c721ca7a9e56905ddd8d574f8a81aee3df234 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 18:02:38 2011 +0200 Translation update done using Pootle. commit c2666ec836950e2981f45ce4e6aee66dc3cec54e Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 18:02:11 2011 +0200 Translation update done using Pootle. commit 306fd51e845e2accf5e06cd65f3076a9ec47b4eb Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 18:02:01 2011 +0200 Translation update done using Pootle. commit 5064224a69bbd562a338bd04b23603988e0173ca Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 18:01:43 2011 +0200 Translation update done using Pootle. commit 47002c30f5aa643f1e0798cee05bcf78c619a9f9 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 18:01:34 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/lt.po | 37 +++++++++++++------------------------ po/tr.po | 12 ++++-------- 2 files changed, 17 insertions(+), 32 deletions(-) diff --git a/po/lt.po b/po/lt.po index 840bfde..e751af0 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4,7 +4,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-08-08 16:05+0200\n" -"PO-Revision-Date: 2011-08-08 18:00+0200\n" +"PO-Revision-Date: 2011-08-08 18:05+0200\n" "Last-Translator: Kęstutis <forkik(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" "Language: lt\n" @@ -10990,31 +10990,28 @@ msgid "Add primary key" msgstr "Pridėti pirminį raktą" #: tbl_structure.php:170 tbl_structure.php:171 -#, fuzzy #| msgid "Apply index(s)" msgid "Add index" -msgstr "Keisti žurnalą(us) (indeksą)" +msgstr "Pridėti indeksą" #: tbl_structure.php:172 tbl_structure.php:173 msgid "Add unique index" -msgstr "" +msgstr "Pridėti unikalų indeksą" #: tbl_structure.php:174 tbl_structure.php:175 -#, fuzzy #| msgid "Apply index(s)" msgid "Add SPATIAL index" -msgstr "Keisti žurnalą(us) (indeksą)" +msgstr "Pridėti SPATIAL indeksą" #: tbl_structure.php:176 tbl_structure.php:177 msgid "Add FULLTEXT index" -msgstr "" +msgstr "Pridėti FULLTEXT indeksą" #: tbl_structure.php:358 -#, fuzzy #| msgid "None" msgctxt "None for default" msgid "None" -msgstr "Nėra" +msgstr "Jokio" #: tbl_structure.php:371 #, php-format @@ -11034,16 +11031,14 @@ msgid "An index has been added on %s" msgstr "Indeksas sukurtas %s stulpeliui" #: tbl_structure.php:464 -#, fuzzy #| msgid "Show versions" msgid "Show more actions" -msgstr "Rodyti versijas" +msgstr "Rodyti daugiau veiksmų" #: tbl_structure.php:603 -#, fuzzy #| msgid "Print view" msgid "Edit view" -msgstr "Spausdinti struktūrą" +msgstr "Keisti rodinį" #: tbl_structure.php:620 msgid "Relation view" @@ -11054,10 +11049,9 @@ msgid "Propose table structure" msgstr "Analizuoti lentelės struktūrą" #: tbl_structure.php:645 -#, fuzzy #| msgid "Add column(s)" msgid "Add column" -msgstr "Pridėti stulpelį(-ius)" +msgstr "Pridėti stulpelį" #: tbl_structure.php:659 msgid "At End of Table" @@ -11129,10 +11123,9 @@ msgid "Tracking data definition successfully deleted" msgstr "" #: tbl_tracking.php:375 tbl_tracking.php:392 -#, fuzzy #| msgid "Gather errors" msgid "Query error" -msgstr "Rinkti klaidas" +msgstr "Užklausos klaida" #: tbl_tracking.php:390 msgid "Tracking data manipulation successfully deleted" @@ -11148,16 +11141,14 @@ msgid "Show %s with dates from %s to %s by user %s %s" msgstr "" #: tbl_tracking.php:423 -#, fuzzy #| msgid "Delete tracking data for this table" msgid "Delete tracking data row from report" -msgstr "Ištrinti šios lentelės sekimo duomenis" +msgstr "Ištrinti sekimo duomenis iš ataskaitos" #: tbl_tracking.php:434 -#, fuzzy #| msgid "No databases" msgid "No data" -msgstr "Nėra duomenų bazių" +msgstr "Nėra duomenų" #: tbl_tracking.php:444 tbl_tracking.php:501 msgid "Date" @@ -11255,7 +11246,6 @@ msgid "Available transformations" msgstr "Galimos transformacijos" #: transformation_overview.php:47 -#, fuzzy #| msgid "Description" msgctxt "for MIME transformation" msgid "Description" @@ -11274,9 +11264,8 @@ msgid "VIEW name" msgstr "VIEW pavadinimas" #: view_operations.php:91 -#, fuzzy msgid "Rename view to" -msgstr "Pervadinti lentelę į" +msgstr "Pervadinti rodinį į" #~ msgid "" #~ "No themes support; please check your configuration and/or your themes in " diff --git a/po/tr.po b/po/tr.po index 76d7c4a..32983f8 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,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-08-08 16:05+0200\n" -"PO-Revision-Date: 2011-08-06 11:10+0200\n" +"PO-Revision-Date: 2011-08-08 19:21+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -1855,7 +1855,6 @@ msgstr "Cumartesi" #. l10n: Short week day name #: js/messages.php:353 -#, fuzzy #| msgctxt "Short week day name" #| msgid "Sun" msgid "Sun" @@ -2115,10 +2114,9 @@ msgid "This MySQL server does not support the %s storage engine." msgstr "Bu MySQL sunucusu %s depolama motorunu desteklemez." #: libraries/Table.class.php:303 -#, fuzzy #| msgid "Show slave status" msgid "unknown table status: " -msgstr "Slave durumunu göster" +msgstr "bilinmeyen tablo durumu: " #: libraries/Table.class.php:1034 msgid "Invalid database" @@ -10264,10 +10262,9 @@ msgid "Target database has been synchronized with source database" msgstr "Hedef veritabanı kaynak veritabanı ile eşitlendi" #: server_synchronize.php:951 -#, fuzzy #| msgid "Issued queries" msgid "Executed queries" -msgstr "Sonuçlanmış sorgular" +msgstr "Yürütülmüş sorgular" #: server_synchronize.php:1076 msgid "Enter manually" @@ -11130,10 +11127,9 @@ msgid "Show more actions" msgstr "Daha fazla eylem göster" #: tbl_structure.php:603 -#, fuzzy #| msgid "Print view" msgid "Edit view" -msgstr "Baskı görünümü" +msgstr "Düzenleme görünümü" #: tbl_structure.php:620 msgid "Relation view" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13724-g630cdd9
by Marc Delisle 08 Aug '11

08 Aug '11

The branch, master has been updated via 630cdd991531377f195eb131859172cf2303402e (commit) from 678f7d21d88770faaf1f14581742f8222a9a8232 (commit) - Log ----------------------------------------------------------------- commit 630cdd991531377f195eb131859172cf2303402e Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Aug 8 12:31:49 2011 -0400 Missing docblock ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 84e13b7..6912e38 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1810,6 +1810,12 @@ function PMA_linkOrButton($url, $message, $tag_params = array(), } // end of the 'PMA_linkOrButton()' function +/** + * Splits a URL string by parameter + * + * @param string $url the URL + * @return array the parameter/value pairs, for example [0] db=sakila + */ function PMA_splitURLQuery($url) { // decode encoded url separators $separator = PMA_get_arg_separator(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13723-g678f7d2
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 678f7d21d88770faaf1f14581742f8222a9a8232 (commit) via 97d37747992a8f0e50a18da6c022c3a4c67d5011 (commit) via 8390920f9a12ccd945bb6b0da5c75c26312853d3 (commit) via 1c53a43451ee515961b499fff6f9b233801083fb (commit) via ecb50ebc61701e69eea17a837c67f37ca8753e7e (commit) via 3f2569516f988f5c68e5d4260ed4b9274e5096c6 (commit) via dd5c53a58bd263b5cd032afbeafbe108e9bfff76 (commit) via 9a981b5d152d81b7eeace8c9425af4220217c904 (commit) via b67d1787ae37a3223b46d61c18246e40615d9b19 (commit) via b3f2791cf54dbdfcead8bfed9d2b37dd90c08a78 (commit) via c43c049074fb44f6bc8da750c5228f52f1c0b2da (commit) via 4603e699126fb6e7afc5b32ec38d5eefa22ff872 (commit) via c8197458908f0e3a0388cbd0b2a2f352496f10ab (commit) via 94199aa43854ba3f506a3efc49ad31d847af00c9 (commit) via 1c22760d5247d346058afafdb332033fd808f22e (commit) via 92aa0cedd40c7b634b4f3b0faf2f7c0d3e3316cd (commit) via de3784595e100d798eba43887dd373e915468a9b (commit) via 9046ab988e6f6c201a78bdca20e566b4c9eb6d47 (commit) via cce0bff0be7a76ca854131fe3925bde462dcd56a (commit) via d94ca0d1b32b1b3e3b42be7894b5f2950cd79b87 (commit) via df54dc696934bf43715d8c681a6dec13d9b8739f (commit) via 885a1ac59d8b0994c45934d874275ef1b03a6e1d (commit) via 04e226bcc5dbe05e896cf3eec30cd1593f33481d (commit) via a5385ed1374866a495bbff32f9d7ea6946ffe98d (commit) via 76d2fbf1ecc796edebd7ba0ceed645f73061a2cd (commit) via e2db97efe1c33990c310d4bd596aec071161455f (commit) via 64d39cb407b100286b4cb73dd1b49e719d47777d (commit) via 05f2114dae88ea448ab8fbe30923525a0d2672dc (commit) via 4a61c32ae484fe7ac487adaec122aa50001b9747 (commit) via e5a6921306caabdb29addcb7e56ca0df362a55c5 (commit) via f8115aa4bdda7dc23ae0ad89a3b91fff0a0c520a (commit) via b8137a0e707ca916d84ea370bfdf21c30d19f7e6 (commit) via e416d104a8268e42b3044f0ba95be63b8afdd37a (commit) via 0f218f1cae91d8eceaa3988bb369af657e1eae13 (commit) via e37d9def6ab105367a51ac4236f5291dfc2617db (commit) via 86249be98fb04d03dffe4da446b89dd4055839ef (commit) via ede73f87bf276aaf6789165d4bb872286831b3b1 (commit) via b662bcabe4fe3118911a642c59ed550cf5e7627e (commit) via 4c54b723718a0ffa484211d6a76bf759229639b6 (commit) via fd6d13b259a7d5a9abdb514c1233f5ee187a09f7 (commit) via b997a2e1a82bc25553d3b7ba0e0dad799df83f46 (commit) via 9c9108f1326c06fad758e3cccbe5e8f0879fadce (commit) via e50328d5dc110eac848205f374886e0965dac8fa (commit) via be028097b7f975f3d1029689affc4cfff49ba71d (commit) via 1c647c1420de3ef2095c5a7da307788e603db6ef (commit) via a818ba2e8e1616503b4affd3a910f725cb4bd3bc (commit) via 4cb6d77fe241b1002978380298e4a0225862363b (commit) via 5969616f6c861de5438651ca8da3cca54585119a (commit) via cc098406a9de0d0a83fc893fae40c4be2c837a7f (commit) via 7860c82ba8ec0bd2f86088a8a9d2b320e1a47b0d (commit) via 8f9b7d7b2a1ccf3b82d96dc9dd3b3cd12a60564b (commit) via 6fe6b218567aad7056d63b2cf62884addc8df2cc (commit) via b9bca475fec11f2299688374afd23f149ef3ab50 (commit) via 57ae51a31382948dab8a482e19e06cd38fd565aa (commit) via a5ae34d4f4cc191727584fe026a1fcc35f72b88a (commit) via 38a7f1c8efdbe7f0d3ceb294140f6c2e9dd41706 (commit) via c54068cdfdfab17f06084dd1245c41b9cf83ad07 (commit) via 0df59ea1ff8ba5495d768d4970fe9e36784af3d0 (commit) via 912d7e17c166764da53843c762cd56d0d547da40 (commit) via d801a8351bb5bc5215d2f4e3fd8bf6c2c25bc7d7 (commit) via 1c41c6a13d0a09203cfc992ceed0559102fe26e8 (commit) via 1bc9626d353e3c139a264e98ce3eca553d40c53a (commit) via b1ac821e03dbe44e5d0b9ba475c1cbd9e50202eb (commit) via b2f76acacf478dbdeedfdf48376bd4a647993736 (commit) via 4fb168c85e95629df429aefb96308f2f16a197fa (commit) via 349098122e9dbd799b1eda319439c97cfa6820ac (commit) via 195827b2accef2c0bff8bc4eef9128e7c2b1fe2c (commit) via 80e36c701b13197254df5559675e6a605db914ce (commit) via 2b4871d68c4bcf8104f1a88bc538c7a62534f00e (commit) via bd4e6f73a9b52c5a6e0e614d0e695c972f0b1aab (commit) via ea276de9374fc0e474a83cc4c391bdbb1bff983a (commit) via 9c3556f9332e3312f1a54f9758847358385f1098 (commit) via 256089081ae69edb82c391440f4be6b165ebc2b3 (commit) via 1e5f13bfde30cd68706bdee74341c199224f1189 (commit) via a889bb1266ce01051ec76a8cb8fe22fe710bb682 (commit) via a48b56f433ecaaca26365bcbb82993c191fa9e42 (commit) via 40185d9b974383f95d6b48caad35db36970b412e (commit) via 49fe97cb614b09dc193c5ad2b5c062ffa04aa77d (commit) via 962482b8d775294c22b9008c0a390e7b4ab64322 (commit) via 919a3c5ff2b59709fcdeb0e34950437e5d8e3493 (commit) via fdcedf728c7efaa5b8ed9c41e6e3b2d12b5e39dd (commit) via 0bb7d4398a95f599981e8ddbeddf391f972d21a6 (commit) via 7f731b3c5370b76f5039f69f520982874021dca9 (commit) via 6ebad89d8f7fd1ca39c88da0addd84de2ea635fc (commit) via c2bf6c446bda5bd72714d3c23146c4a4e562c4cc (commit) via d92a9ab9caaeb2f180ac30569d0fd4eb32708d4b (commit) via d8a9c74a6f9ee7cc38ea950164b26822826fa9ef (commit) via 14739d706c0aede1ab28a15eabad3b8614bdc765 (commit) from 9204ae8594fe4d0e96bc18e20aecb5d0ea3cdef0 (commit) - Log ----------------------------------------------------------------- commit 678f7d21d88770faaf1f14581742f8222a9a8232 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 18:01:52 2011 +0200 Mark fuzzy translations with missing format string commit 97d37747992a8f0e50a18da6c022c3a4c67d5011 Merge: 9204ae8594fe4d0e96bc18e20aecb5d0ea3cdef0 8390920f9a12ccd945bb6b0da5c75c26312853d3 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 18:01:06 2011 +0200 Merge remote-tracking branch 'pootle/master' commit 8390920f9a12ccd945bb6b0da5c75c26312853d3 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 18:00:24 2011 +0200 Translation update done using Pootle. commit 1c53a43451ee515961b499fff6f9b233801083fb Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 18:00:08 2011 +0200 Translation update done using Pootle. commit ecb50ebc61701e69eea17a837c67f37ca8753e7e Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:59:43 2011 +0200 Translation update done using Pootle. commit 3f2569516f988f5c68e5d4260ed4b9274e5096c6 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:59:34 2011 +0200 Translation update done using Pootle. commit dd5c53a58bd263b5cd032afbeafbe108e9bfff76 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:58:40 2011 +0200 Translation update done using Pootle. commit 9a981b5d152d81b7eeace8c9425af4220217c904 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:58:31 2011 +0200 Translation update done using Pootle. commit b67d1787ae37a3223b46d61c18246e40615d9b19 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:58:15 2011 +0200 Translation update done using Pootle. commit b3f2791cf54dbdfcead8bfed9d2b37dd90c08a78 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:57:56 2011 +0200 Translation update done using Pootle. commit c43c049074fb44f6bc8da750c5228f52f1c0b2da Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:57:38 2011 +0200 Translation update done using Pootle. commit 4603e699126fb6e7afc5b32ec38d5eefa22ff872 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:57:32 2011 +0200 Translation update done using Pootle. commit c8197458908f0e3a0388cbd0b2a2f352496f10ab Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:57:13 2011 +0200 Translation update done using Pootle. commit 94199aa43854ba3f506a3efc49ad31d847af00c9 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:57:00 2011 +0200 Translation update done using Pootle. commit 1c22760d5247d346058afafdb332033fd808f22e Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:56:51 2011 +0200 Translation update done using Pootle. commit 92aa0cedd40c7b634b4f3b0faf2f7c0d3e3316cd Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:56:41 2011 +0200 Translation update done using Pootle. commit de3784595e100d798eba43887dd373e915468a9b Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:56:35 2011 +0200 Translation update done using Pootle. commit 9046ab988e6f6c201a78bdca20e566b4c9eb6d47 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:56:22 2011 +0200 Translation update done using Pootle. commit cce0bff0be7a76ca854131fe3925bde462dcd56a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:56:14 2011 +0200 Translation update done using Pootle. commit d94ca0d1b32b1b3e3b42be7894b5f2950cd79b87 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:56:02 2011 +0200 Translation update done using Pootle. commit df54dc696934bf43715d8c681a6dec13d9b8739f Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:55:57 2011 +0200 Translation update done using Pootle. commit 885a1ac59d8b0994c45934d874275ef1b03a6e1d Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:55:52 2011 +0200 Translation update done using Pootle. commit 04e226bcc5dbe05e896cf3eec30cd1593f33481d Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:55:38 2011 +0200 Translation update done using Pootle. commit a5385ed1374866a495bbff32f9d7ea6946ffe98d Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:55:32 2011 +0200 Translation update done using Pootle. commit 76d2fbf1ecc796edebd7ba0ceed645f73061a2cd Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:55:16 2011 +0200 Translation update done using Pootle. commit e2db97efe1c33990c310d4bd596aec071161455f Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:54:41 2011 +0200 Translation update done using Pootle. commit 64d39cb407b100286b4cb73dd1b49e719d47777d Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:54:00 2011 +0200 Translation update done using Pootle. commit 05f2114dae88ea448ab8fbe30923525a0d2672dc Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:53:35 2011 +0200 Translation update done using Pootle. commit 4a61c32ae484fe7ac487adaec122aa50001b9747 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:52:35 2011 +0200 Translation update done using Pootle. commit e5a6921306caabdb29addcb7e56ca0df362a55c5 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:52:05 2011 +0200 Translation update done using Pootle. commit f8115aa4bdda7dc23ae0ad89a3b91fff0a0c520a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:51:09 2011 +0200 Translation update done using Pootle. commit b8137a0e707ca916d84ea370bfdf21c30d19f7e6 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:50:14 2011 +0200 Translation update done using Pootle. commit e416d104a8268e42b3044f0ba95be63b8afdd37a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:50:04 2011 +0200 Translation update done using Pootle. commit 0f218f1cae91d8eceaa3988bb369af657e1eae13 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:49:54 2011 +0200 Translation update done using Pootle. commit e37d9def6ab105367a51ac4236f5291dfc2617db Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:49:36 2011 +0200 Translation update done using Pootle. commit 86249be98fb04d03dffe4da446b89dd4055839ef Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:49:25 2011 +0200 Translation update done using Pootle. commit ede73f87bf276aaf6789165d4bb872286831b3b1 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:48:24 2011 +0200 Translation update done using Pootle. commit b662bcabe4fe3118911a642c59ed550cf5e7627e Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:47:53 2011 +0200 Translation update done using Pootle. commit 4c54b723718a0ffa484211d6a76bf759229639b6 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:47:45 2011 +0200 Translation update done using Pootle. commit fd6d13b259a7d5a9abdb514c1233f5ee187a09f7 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:47:13 2011 +0200 Translation update done using Pootle. commit b997a2e1a82bc25553d3b7ba0e0dad799df83f46 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:46:59 2011 +0200 Translation update done using Pootle. commit 9c9108f1326c06fad758e3cccbe5e8f0879fadce Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:46:46 2011 +0200 Translation update done using Pootle. commit e50328d5dc110eac848205f374886e0965dac8fa Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:46:29 2011 +0200 Translation update done using Pootle. commit be028097b7f975f3d1029689affc4cfff49ba71d Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:46:12 2011 +0200 Translation update done using Pootle. commit 1c647c1420de3ef2095c5a7da307788e603db6ef Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:45:45 2011 +0200 Translation update done using Pootle. commit a818ba2e8e1616503b4affd3a910f725cb4bd3bc Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:45:28 2011 +0200 Translation update done using Pootle. commit 4cb6d77fe241b1002978380298e4a0225862363b Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:45:11 2011 +0200 Translation update done using Pootle. commit 5969616f6c861de5438651ca8da3cca54585119a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:44:57 2011 +0200 Translation update done using Pootle. commit cc098406a9de0d0a83fc893fae40c4be2c837a7f Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:44:51 2011 +0200 Translation update done using Pootle. commit 7860c82ba8ec0bd2f86088a8a9d2b320e1a47b0d Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:44:43 2011 +0200 Translation update done using Pootle. commit 8f9b7d7b2a1ccf3b82d96dc9dd3b3cd12a60564b Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:44:27 2011 +0200 Translation update done using Pootle. commit 6fe6b218567aad7056d63b2cf62884addc8df2cc Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:43:47 2011 +0200 Translation update done using Pootle. commit b9bca475fec11f2299688374afd23f149ef3ab50 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:43:33 2011 +0200 Translation update done using Pootle. commit 57ae51a31382948dab8a482e19e06cd38fd565aa Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:43:15 2011 +0200 Translation update done using Pootle. commit a5ae34d4f4cc191727584fe026a1fcc35f72b88a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:43:00 2011 +0200 Translation update done using Pootle. commit 38a7f1c8efdbe7f0d3ceb294140f6c2e9dd41706 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:42:45 2011 +0200 Translation update done using Pootle. commit c54068cdfdfab17f06084dd1245c41b9cf83ad07 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:42:27 2011 +0200 Translation update done using Pootle. commit 0df59ea1ff8ba5495d768d4970fe9e36784af3d0 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:42:17 2011 +0200 Translation update done using Pootle. commit 912d7e17c166764da53843c762cd56d0d547da40 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:41:56 2011 +0200 Translation update done using Pootle. commit d801a8351bb5bc5215d2f4e3fd8bf6c2c25bc7d7 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:40:52 2011 +0200 Translation update done using Pootle. commit 1c41c6a13d0a09203cfc992ceed0559102fe26e8 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:40:03 2011 +0200 Translation update done using Pootle. commit 1bc9626d353e3c139a264e98ce3eca553d40c53a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:39:21 2011 +0200 Translation update done using Pootle. commit b1ac821e03dbe44e5d0b9ba475c1cbd9e50202eb Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:38:47 2011 +0200 Translation update done using Pootle. commit b2f76acacf478dbdeedfdf48376bd4a647993736 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:38:21 2011 +0200 Translation update done using Pootle. commit 4fb168c85e95629df429aefb96308f2f16a197fa Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:37:52 2011 +0200 Translation update done using Pootle. commit 349098122e9dbd799b1eda319439c97cfa6820ac Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:37:00 2011 +0200 Translation update done using Pootle. commit 195827b2accef2c0bff8bc4eef9128e7c2b1fe2c Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:30:52 2011 +0200 Translation update done using Pootle. commit 80e36c701b13197254df5559675e6a605db914ce Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:30:36 2011 +0200 Translation update done using Pootle. commit 2b4871d68c4bcf8104f1a88bc538c7a62534f00e Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:30:12 2011 +0200 Translation update done using Pootle. commit bd4e6f73a9b52c5a6e0e614d0e695c972f0b1aab Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:29:38 2011 +0200 Translation update done using Pootle. commit ea276de9374fc0e474a83cc4c391bdbb1bff983a Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:29:05 2011 +0200 Translation update done using Pootle. commit 9c3556f9332e3312f1a54f9758847358385f1098 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:28:39 2011 +0200 Translation update done using Pootle. commit 256089081ae69edb82c391440f4be6b165ebc2b3 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:27:07 2011 +0200 Translation update done using Pootle. commit 1e5f13bfde30cd68706bdee74341c199224f1189 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:26:59 2011 +0200 Translation update done using Pootle. commit a889bb1266ce01051ec76a8cb8fe22fe710bb682 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:26:16 2011 +0200 Translation update done using Pootle. commit a48b56f433ecaaca26365bcbb82993c191fa9e42 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:25:53 2011 +0200 Translation update done using Pootle. commit 40185d9b974383f95d6b48caad35db36970b412e Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:24:26 2011 +0200 Translation update done using Pootle. commit 49fe97cb614b09dc193c5ad2b5c062ffa04aa77d Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:23:34 2011 +0200 Translation update done using Pootle. commit 962482b8d775294c22b9008c0a390e7b4ab64322 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:23:07 2011 +0200 Translation update done using Pootle. commit 919a3c5ff2b59709fcdeb0e34950437e5d8e3493 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:22:54 2011 +0200 Translation update done using Pootle. commit fdcedf728c7efaa5b8ed9c41e6e3b2d12b5e39dd Merge: 0bb7d4398a95f599981e8ddbeddf391f972d21a6 d6873470c2cccb26cbc9c674c98cce8c9ebe963c Author: Pootle server <pootle(a)cihar.com> Date: Mon Aug 8 17:22:21 2011 +0200 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 0bb7d4398a95f599981e8ddbeddf391f972d21a6 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:22:01 2011 +0200 Translation update done using Pootle. commit 7f731b3c5370b76f5039f69f520982874021dca9 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:21:51 2011 +0200 Translation update done using Pootle. commit 6ebad89d8f7fd1ca39c88da0addd84de2ea635fc Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:21:43 2011 +0200 Translation update done using Pootle. commit c2bf6c446bda5bd72714d3c23146c4a4e562c4cc Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:21:32 2011 +0200 Translation update done using Pootle. commit d92a9ab9caaeb2f180ac30569d0fd4eb32708d4b Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:21:03 2011 +0200 Translation update done using Pootle. commit d8a9c74a6f9ee7cc38ea950164b26822826fa9ef Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:20:31 2011 +0200 Translation update done using Pootle. commit 14739d706c0aede1ab28a15eabad3b8614bdc765 Author: Kęstutis <forkik(a)gmail.com> Date: Mon Aug 8 17:20:04 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/lt.po | 243 +++++++++++++++++++++++--------------------------------------- 1 files changed, 90 insertions(+), 153 deletions(-) diff --git a/po/lt.po b/po/lt.po index 00546cc..840bfde 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4,7 +4,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-08-08 16:05+0200\n" -"PO-Revision-Date: 2011-08-08 17:19+0200\n" +"PO-Revision-Date: 2011-08-08 18:00+0200\n" "Last-Translator: Kęstutis <forkik(a)gmail.com>\n" "Language-Team: lithuanian <lt(a)li.org>\n" "Language: lt\n" @@ -9100,9 +9100,8 @@ msgid "Temporary data" msgstr "Laikini duomenys" #: server_status.php:499 -#, fuzzy msgid "Delayed inserts" -msgstr "Naudoti užlaikytus įterpimus" +msgstr "Užlaikyti įterpimai" #: server_status.php:500 #, fuzzy @@ -9115,7 +9114,7 @@ msgstr "" #: server_status.php:503 msgid "Sorting" -msgstr "Rūšiavimas" +msgstr "Rikiavimas" #: server_status.php:505 msgid "Transaction coordinator" @@ -9146,10 +9145,9 @@ msgid "Runtime Information" msgstr "Veikimo informacija" #: server_status.php:650 -#, fuzzy #| msgid "See slave status table" msgid "All status variables" -msgstr "Peržiūrėti pavaldžiojo serverio būklės lentelę" +msgstr "Visi būsenos kintamieji" #: server_status.php:651 msgid "Monitor" @@ -9160,38 +9158,33 @@ msgid "Advisor" msgstr "" #: server_status.php:662 server_status.php:684 -#, fuzzy #| msgid "Refresh" msgid "Refresh rate: " -msgstr "Atnaujinti" +msgstr "Atnaujinimo dažnis:" #: server_status.php:705 -#, fuzzy #| msgid "Do not change the password" msgid "Containing the word:" -msgstr "Nekeisti slaptažodžio" +msgstr "Turintys žodį:" #: server_status.php:710 -#, fuzzy #| msgid "Show open tables" msgid "Show only alert values" -msgstr "Rodyti atidarytas lenteles" +msgstr "" #: server_status.php:714 msgid "Filter by category..." -msgstr "" +msgstr "Filtruoti pagal kategoriją..." #: server_status.php:727 -#, fuzzy #| msgid "Show open tables" msgid "Show unformatted values" -msgstr "Rodyti atidarytas lenteles" +msgstr "Rodyti nesuformatuotas reikšmes" #: server_status.php:731 -#, fuzzy #| msgid "Relations" msgid "Related links:" -msgstr "Sąryšiai" +msgstr "Susijusios nuorodos:" #: server_status.php:765 msgid "" @@ -9235,7 +9228,7 @@ msgstr "Parametrai" #. l10n: # = Amount of queries #: server_status.php:830 msgid "#" -msgstr "" +msgstr "#" #: server_status.php:898 #, php-format @@ -9321,10 +9314,9 @@ msgid "" msgstr "" #: server_status.php:1144 -#, fuzzy #| msgid "Could not connect to MySQL server" msgid "The number of failed attempts to connect to the MySQL server." -msgstr "Nepavyko prisijungti prie MySQL serverio" +msgstr "Skaičius nepavykusių bandymų prisijungti prie MySQL serverio." #: server_status.php:1145 msgid "" @@ -9443,29 +9435,27 @@ msgstr "Vidinių ROLLBACK užklausų skaičius." #: server_status.php:1165 msgid "The number of requests to update a row in a table." -msgstr "" +msgstr "Skaičius užklausų, kad atnaujinti eilutę lentelėje." #: server_status.php:1166 msgid "The number of requests to insert a row in a table." -msgstr "" +msgstr "Skaičius užklausų, kad įtraukti eilutę lentelėje." #: server_status.php:1167 msgid "The number of pages containing data (dirty or clean)." msgstr "" #: server_status.php:1168 -#, fuzzy msgid "The number of pages currently dirty." -msgstr "Duomenų nuskaitymų skaičius." +msgstr "" #: server_status.php:1169 msgid "The number of buffer pool pages that have been requested to be flushed." msgstr "" #: server_status.php:1170 -#, fuzzy msgid "The number of free pages." -msgstr "Įkeltų eilučių skaičius" +msgstr "Tuščių puslapių skaičius." #: server_status.php:1171 msgid "" @@ -9526,19 +9516,16 @@ msgid "The number of fsync() operations so far." msgstr "" #: server_status.php:1181 -#, fuzzy msgid "The current number of pending fsync() operations." -msgstr "Duomenų nuskaitymų skaičius." +msgstr "Esamu momentu laukiančių fsync() operacijų skaičius." #: server_status.php:1182 -#, fuzzy msgid "The current number of pending reads." -msgstr "Duomenų nuskaitymų skaičius." +msgstr "Esamu momentu laukiančių skaitymų skaičius." #: server_status.php:1183 -#, fuzzy msgid "The current number of pending writes." -msgstr "Duomenų įrašymų skaičius." +msgstr "Esamu momentu laukiančių rašymų skaičius." #: server_status.php:1184 msgid "The amount of data read so far, in bytes." @@ -9571,9 +9558,8 @@ msgid "" msgstr "" #: server_status.php:1191 -#, fuzzy msgid "The number of log write requests." -msgstr "Įkeltų eilučių skaičius" +msgstr "" #: server_status.php:1192 msgid "The number of physical writes to the log file." @@ -9596,9 +9582,8 @@ msgid "The number of bytes written to the log file." msgstr "" #: server_status.php:1197 -#, fuzzy msgid "The number of pages created." -msgstr "Duomenų nuskaitymų skaičius." +msgstr "Sukurtų puslapių skaičius." #: server_status.php:1198 msgid "" @@ -9607,14 +9592,12 @@ msgid "" msgstr "" #: server_status.php:1199 -#, fuzzy msgid "The number of pages read." -msgstr "Duomenų nuskaitymų skaičius." +msgstr "Puslapių skaitymų skaičius." #: server_status.php:1200 -#, fuzzy msgid "The number of pages written." -msgstr "Duomenų įrašymų skaičius." +msgstr "Įrašytų puslapių skaičius." #: server_status.php:1201 msgid "The number of row locks currently being waited for." @@ -9714,18 +9697,16 @@ msgid "" msgstr "" #: server_status.php:1221 -#, fuzzy msgid "The number of files that are open." -msgstr "Duomenų įrašymų skaičius." +msgstr "Failų kurie yra atidaryti skaičius." #: server_status.php:1222 msgid "The number of streams that are open (used mainly for logging)." msgstr "" #: server_status.php:1223 -#, fuzzy msgid "The number of tables that are open." -msgstr "Duomenų įrašymų skaičius." +msgstr "Lentelių kurios yra atidarytos skaičius." #: server_status.php:1224 msgid "" @@ -9739,9 +9720,8 @@ msgid "The amount of free memory for query cache." msgstr "" #: server_status.php:1226 -#, fuzzy msgid "The number of cache hits." -msgstr "Įkeltų eilučių skaičius" +msgstr "Podėlio kreipimųsi skaičius." #: server_status.php:1227 msgid "The number of queries added to the cache." @@ -9836,13 +9816,12 @@ msgid "The number of sorts that were done with ranges." msgstr "" #: server_status.php:1245 -#, fuzzy msgid "The number of sorted rows." -msgstr "Įkeltų eilučių skaičius" +msgstr "Surikiuotų eilučių skaičius." #: server_status.php:1246 msgid "The number of sorts that were done by scanning the table." -msgstr "" +msgstr "Rikiavimų kurie buvo atlikti skenuojant lentelę skaičius." #: server_status.php:1247 msgid "The number of times that a table lock was acquired immediately." @@ -9880,47 +9859,41 @@ msgid "The number of threads that are not sleeping." msgstr "" #: server_status.php:1392 -#, fuzzy #| msgid "Startup" msgid "Start Monitor" -msgstr "Paleidimas" +msgstr "Paleisti Monitor" #: server_status.php:1400 -#, fuzzy #| msgid "Introduction" msgid "Instructions/Setup" -msgstr "Įvadas" +msgstr "Instrukcijos/Diegimas" #: server_status.php:1404 msgid "Done rearranging/editing charts" msgstr "" #: server_status.php:1411 -#, fuzzy #| msgid "Apply index(s)" msgid "Add chart" -msgstr "Keisti žurnalą(us) (indeksą)" +msgstr "Pridėti diagramą" #: server_status.php:1413 msgid "Rearrange/edit charts" msgstr "" #: server_status.php:1416 -#, fuzzy msgid "Refresh rate" -msgstr "Atnaujinti" +msgstr "Naujinimo dažnis" #: server_status.php:1419 -#, fuzzy #| msgid "Textarea columns" msgid "Chart columns" -msgstr "Textarea laukeliai" +msgstr "Diagramos stulpeliai" #: server_status.php:1435 -#, fuzzy #| msgid "Error management:" msgid "Chart arrangement" -msgstr "Klaidų valdymas:" +msgstr "Diagramos išdėstymas" #: server_status.php:1435 msgid "" @@ -9929,16 +9902,14 @@ msgid "" msgstr "" #: server_status.php:1436 -#, fuzzy #| msgid "Restore default value" msgid "Reset to default" msgstr "Atstatyti numatytąsias reikšmes" #: server_status.php:1440 -#, fuzzy #| msgid "Introduction" msgid "Monitor Instructions" -msgstr "Įvadas" +msgstr "Monitor instrukcijos" #: server_status.php:1441 msgid "" @@ -9979,42 +9950,37 @@ msgid "" msgstr "" #: server_status.php:1475 -#, fuzzy #| msgid "Usage" msgid "CPU Usage" -msgstr "Išnaudota" +msgstr "CPU naudojimas" #: server_status.php:1478 msgid "Memory Usage" -msgstr "" +msgstr "Atminties naudojimas" #: server_status.php:1481 -#, fuzzy #| msgid "Usage" msgid "Swap Usage" -msgstr "Išnaudota" +msgstr "Swap naudojimas" #: server_status.php:1484 -#, fuzzy #| msgid "See slave status table" msgid "Status variable(s)" -msgstr "Peržiūrėti pavaldžiojo serverio būklės lentelę" +msgstr "Būsenos kintamasis(ieji)" #: server_status.php:1486 -#, fuzzy #| msgid "Select Tables" msgid "Select series:" -msgstr "Pasirinkite lenteles" +msgstr "Pasirinkite eiles:" #: server_status.php:1488 msgid "Commonly monitored" msgstr "" #: server_status.php:1503 -#, fuzzy #| msgid "Invalid table name" msgid "or type variable name:" -msgstr "Neteisingas lentelės vardas" +msgstr "arba įveskite kintamojo vardą:" #: server_status.php:1507 msgid "Display as differential value" @@ -10029,32 +9995,28 @@ msgid "Append unit to data values" msgstr "" #: server_status.php:1522 -#, fuzzy #| msgid "Add a new server" msgid "Add this series" -msgstr "Pridėti naują serverį" +msgstr "Pridėti šią eilę" #: server_status.php:1524 msgid "Clear series" msgstr "" #: server_status.php:1527 -#, fuzzy #| msgid "SQL queries" msgid "Series in Chart:" -msgstr "SQL užklausos" +msgstr "Eilės diagramoje:" #: server_status.php:1539 -#, fuzzy #| msgid "Show statistics" msgid "Log statistics" -msgstr "Rodyti statistika" +msgstr "Registruoti statistiką" #: server_status.php:1540 -#, fuzzy #| msgid "Select page" msgid "Selected time range:" -msgstr "Pasirinkite puslapį" +msgstr "Pasirinktas laiko tarpas:" #: server_status.php:1545 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements" @@ -10071,38 +10033,35 @@ msgid "" msgstr "" #: server_status.php:1556 -#, fuzzy #| msgid "Query type" msgid "Query analyzer" -msgstr "Užklausos tipas" +msgstr "Užklausos analizatorius" #: server_status.php:1593 -#, fuzzy, php-format +#, php-format, fuzzy #| msgid "Second" msgid "%d second" msgid_plural "%d seconds" -msgstr[0] "Sekundės" +msgstr[0] "Sekundė" msgstr[1] "Sekundės" -msgstr[2] "Sekundės" +msgstr[2] "Sekundžių" #: server_status.php:1595 -#, fuzzy, php-format +#, php-format, fuzzy #| msgid "Minute" msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "Minutė" msgstr[1] "Minutė" -msgstr[2] "Minutė" +msgstr[2] "Minučių" #: server_synchronize.php:92 -#, fuzzy msgid "Could not connect to the source" -msgstr "Nepavyko prisijungti prie MySQL serverio" +msgstr "Nepavyko prisijungti prie šaltinio (angl. source)" #: server_synchronize.php:95 -#, fuzzy msgid "Could not connect to the target" -msgstr "Nepavyko prisijungti prie MySQL serverio" +msgstr "Nepavyko prisijungti prie adresato (angl. target)" #: server_synchronize.php:120 server_synchronize.php:123 tbl_create.php:50 #: tbl_get_field.php:19 @@ -10179,9 +10138,8 @@ msgid "Target database has been synchronized with source database" msgstr "" #: server_synchronize.php:951 -#, fuzzy msgid "Executed queries" -msgstr "SQL užklausos" +msgstr "Įvykdytos užklausos" #: server_synchronize.php:1076 msgid "Enter manually" @@ -10266,10 +10224,9 @@ msgid "Insecure connection" msgstr "Nesaugus susijungimas" #: setup/frames/index.inc.php:93 -#, fuzzy #| msgid "Configuration storage" msgid "Configuration saved." -msgstr "Konfigūracijos laikmena" +msgstr "Konfigūracija išsaugota." #: setup/frames/index.inc.php:94 msgid "" @@ -10303,7 +10260,7 @@ msgstr "leisti vartotojui pasirinkti" #: setup/frames/index.inc.php:207 msgid "- none -" -msgstr "" +msgstr "- tuščia -" #: setup/frames/index.inc.php:210 msgid "Default server" @@ -10412,7 +10369,7 @@ msgstr "" "sugeneruotas. Jis naudojamas užšifruoti slapukus; jums nereikia jo atsiminti." #: setup/lib/index.lib.php:277 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Import_export]Bzip2 compression " #| "and decompression[/a] requires functions (%s) which are unavailable on " @@ -10421,8 +10378,8 @@ msgid "" "%sBzip2 compression and decompression%s requires functions (%s) which are " "unavailable on this system." msgstr "" -"[a@?page=form&formset=features#tab_Import_export]Bzip2 glaudinimas ir " -"išskleidimas[/a] reikalauja funkcijų (%s) kurios nėra galima Jūsų sistemoje." +"%sBzip2 glaudinimas ir išskleidimas%s reikalauja funkcijų (%s) kurios nėra " +"galimos Jūsų sistemoje." #: setup/lib/index.lib.php:279 msgid "" @@ -10431,14 +10388,13 @@ msgid "" msgstr "" #: setup/lib/index.lib.php:280 -#, fuzzy, php-format +#, php-format #| msgid "You should use SSL connections if your web server supports it" msgid "This %soption%s should be enabled if your web server supports it." -msgstr "" -"Jūs turėtumėte naudoti SSL prisijungimus jeigu Jūsų serveris juos palaiko" +msgstr "Šis %snustatymas%s turėtų būti įjungtas jeigu Jūsų serveris jį palaiko." #: setup/lib/index.lib.php:282 -#, fuzzy, php-format +#, php-format #| msgid "" #| "[a@?page=form&formset=features#tab_Import_export]GZip compression and " #| "decompression[/a] requires functions (%s) which are unavailable on this " @@ -10447,8 +10403,8 @@ msgid "" "%sGZip compression and decompression%s requires functions (%s) which are " "unavailable on this system." msgstr "" -"[a@?page=form&formset=features#tab_Import_export]GZip suspaudimui ir " -"išspaudimui[/a] reikalingos funkcijos (%s) neprieinamos šioje sistemoje." +"%sGZip suspaudimui ir išspaudimui%s reikalingos funkcijos (%s) neprieinamos " +"šioje sistemoje." #: setup/lib/index.lib.php:284 #, php-format @@ -10537,33 +10493,30 @@ msgstr "" "reikalauja funkcijų (%s) kurių nėra Jūsų sistemoje." #: setup/lib/index.lib.php:323 -#, fuzzy #| msgid "You should use SSL connections if your web server supports it" msgid "You should use SSL connections if your web server supports it." -msgstr "" -"Jūs turėtumėte naudoti SSL prisijungimus jeigu Jūsų serveris juos palaiko" +msgstr "Naudokite SSL prisijungimus, jei Jūsų serveris juos palaiko." #: setup/lib/index.lib.php:336 -#, fuzzy #| msgid "You should use mysqli for performance reasons" msgid "You should use mysqli for performance reasons." -msgstr "Jūs turėtumėte naudoti mysqli dėl našumo (efektyvumo) priežasčių" +msgstr "Turėtumėte naudoti mysqli dėl našumo (efektyvumo) priežasčių." #: setup/lib/index.lib.php:367 msgid "You allow for connecting to the server without a password." msgstr "Jūs leidžiate prisijungti prie serverio be slaptažodžio." #: setup/lib/index.lib.php:389 -#, fuzzy #| msgid "Key is too short, it should have at least 8 characters" msgid "Key is too short, it should have at least 8 characters." -msgstr "Raktas per daug trumpas, jis turėtų turėti bent 8 simbolius" +msgstr "Raktas per trumpas, jis privalo turėti bent 8 simbolius." #: setup/lib/index.lib.php:396 -#, fuzzy #| msgid "Key should contain letters, numbers [em]and[/em] special characters" msgid "Key should contain letters, numbers [em]and[/em] special characters." -msgstr "Raktas turi turėti raidžių, skaičių [em]ir[/em] specialiųjų ženklų" +msgstr "" +"Raktas turėtų būti sudarytas iš raidžių, skaičių [em]ir[/em] specialiųjų " +"ženklų." #: sql.php:95 tbl_change.php:257 tbl_select.php:28 tbl_select.php:29 #: tbl_select.php:32 tbl_select.php:35 @@ -10589,10 +10542,9 @@ msgid "Showing SQL query" msgstr "Rodoma SQL užklausa" #: sql.php:683 -#, fuzzy #| msgid "Validate SQL" msgid "Validated SQL" -msgstr "Patikrinti SQL užklausą" +msgstr "Patikrintas SQL" #: sql.php:990 #, php-format @@ -10676,10 +10628,9 @@ msgid "Line" msgstr "Linijinė" #: tbl_chart.php:88 -#, fuzzy #| msgid "Inline" msgid "Spline" -msgstr "Redaguoti čia" +msgstr "" #: tbl_chart.php:89 msgid "Pie" @@ -10692,50 +10643,43 @@ msgid "Stacked" msgstr "Suspausta" #: tbl_chart.php:94 -#, fuzzy #| msgid "Report title:" msgid "Chart title" -msgstr "Ataskaitos antraštė:" +msgstr "Diagramos antraštė:" #: tbl_chart.php:100 msgid "X-Axis:" -msgstr "" +msgstr "X-ašis:" #: tbl_chart.php:114 -#, fuzzy #| msgid "SQL queries" msgid "Series:" -msgstr "SQL užklausos" +msgstr "" #: tbl_chart.php:116 -#, fuzzy #| msgid "Textarea columns" msgid "The remaining columns" -msgstr "Textarea laukeliai" +msgstr "" #: tbl_chart.php:129 -#, fuzzy #| msgid "X Axis label" msgid "X-Axis label:" -msgstr "X ašies etiketė" +msgstr "X ašies etiketė:" #: tbl_chart.php:130 -#, fuzzy #| msgid "Value" msgid "X Values" -msgstr "Reikšmė" +msgstr "X Reikšmės" #: tbl_chart.php:131 -#, fuzzy #| msgid "Y Axis label" msgid "Y-Axis label:" -msgstr "Y ašies etiketė" +msgstr "Y ašies etiketė:" #: tbl_chart.php:131 -#, fuzzy #| msgid "Value" msgid "Y Values" -msgstr "Reikšmė" +msgstr "Y Reikšmės" #: tbl_create.php:30 #, php-format @@ -10752,10 +10696,9 @@ msgid "View dump (schema) of table" msgstr "Peržiūrėti lentelės struktūros atvaizdį" #: tbl_gis_visualization.php:111 -#, fuzzy #| msgid "Display servers selection" msgid "Display GIS Visualization" -msgstr "Rodyti serverių pasirinkimą" +msgstr "Rodyti GIS vizualizaciją" #: tbl_gis_visualization.php:157 msgid "Width" @@ -10766,40 +10709,36 @@ msgid "Height" msgstr "Aukštis" #: tbl_gis_visualization.php:165 -#, fuzzy #| msgid "Textarea columns" msgid "Label column" -msgstr "Textarea laukeliai" +msgstr "Etiketės stulpelis" #: tbl_gis_visualization.php:167 msgid "-- None --" -msgstr "" +msgstr "-- Tuščia --" #: tbl_gis_visualization.php:180 -#, fuzzy #| msgid "Total" msgid "Spatial column" -msgstr "Iš viso" +msgstr "" #: tbl_gis_visualization.php:201 msgid "Use OpenStreetMaps as Base Layer" -msgstr "" +msgstr "Naudoti OpenStreetMaps kaip pagrindinį sluoksnį" #: tbl_gis_visualization.php:204 msgid "Redraw" msgstr "Perpiešti" #: tbl_gis_visualization.php:206 -#, fuzzy #| msgid "Save as file" msgid "Save to file" -msgstr "Išsaugoti į failą" +msgstr "Įrašyti į failą" #: tbl_gis_visualization.php:207 -#, fuzzy #| msgid "Table name" msgid "File name" -msgstr "Lentelės vardas" +msgstr "Failo pavadinimas" #: tbl_indexes.php:66 msgid "The name of the primary key must be \"PRIMARY\"!" @@ -11018,13 +10957,12 @@ msgstr "" #: tbl_select.php:111 msgid "Do a \"query by example\" (wildcard: \"%\")" -msgstr "Vykdyti \"užklausą pagal pavyzdį\" (pakaitos simbolis: \"%\")" +msgstr "Vykdyti „užklausą pagal pavyzdį“ (pakaitos simbolis: „%“)" #: tbl_select.php:261 -#, fuzzy #| msgid "Select fields (at least one):" msgid "Select columns (at least one):" -msgstr "Pasirinkite laukus (nors vieną)" +msgstr "Pasirinkite stulpelius (bent vieną):" #: tbl_select.php:279 msgid "Add search conditions (body of the \"where\" clause):" @@ -11047,10 +10985,9 @@ msgid "Browse distinct values" msgstr "Peržiūrėti skirtingas reikšmes" #: tbl_structure.php:168 tbl_structure.php:169 -#, fuzzy #| msgid "Adding Primary Key" msgid "Add primary key" -msgstr "Pridedamas pirminis raktas" +msgstr "Pridėti pirminį raktą" #: tbl_structure.php:170 tbl_structure.php:171 #, fuzzy hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13635-g9204ae8
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 9204ae8594fe4d0e96bc18e20aecb5d0ea3cdef0 (commit) via 71f627307a391cb0f838bf9a8aba34a44696cadf (commit) via 94a9f4555a4ce71be71c9c8f367241a7ba2b65f9 (commit) from 96be56ea40007aff24f47d8d517eff5fd0bb7220 (commit) - Log ----------------------------------------------------------------- commit 9204ae8594fe4d0e96bc18e20aecb5d0ea3cdef0 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:55:20 2011 +0200 Adjust calling indentation commit 71f627307a391cb0f838bf9a8aba34a44696cadf Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:55:15 2011 +0200 This really should be private commit 94a9f4555a4ce71be71c9c8f367241a7ba2b65f9 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:53:40 2011 +0200 Adjust calling indentation ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 27 ++++++++++++++------------- libraries/Theme_Manager.class.php | 16 +++++++++++----- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index c31d74c..1a81504 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -59,16 +59,16 @@ if (is_array($foreignData['disp_row'])) { if ($foreignData['the_total'] > $GLOBALS['cfg']['MaxRows']) { $gotopage = PMA_pageselector( - $session_max_rows, - $pageNow, - $nbTotalPage, - 200, - 5, - 5, - 20, - 10, - __('Page number:') - ); + $session_max_rows, + $pageNow, + $nbTotalPage, + 200, + 5, + 5, + 20, + 10, + __('Page number:') + ); } } ?> @@ -220,9 +220,10 @@ if (is_array($foreignData['disp_row'])) { } else { $val_ordered_current_val_title = htmlspecialchars($val_ordered_current_val); - $val_ordered_current_val = - htmlspecialchars(PMA_substr($val_ordered_current_val, 0, - $cfg['LimitChars']) . '...'); + $val_ordered_current_val = htmlspecialchars( + PMA_substr($val_ordered_current_val, 0, $cfg['LimitChars']) + . '...' + ); } if (PMA_strlen($key_ordered_current_val) <= $cfg['LimitChars']) { $key_ordered_current_val = htmlspecialchars($key_ordered_current_val); diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index d6c4ea0..eac54ef 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -106,9 +106,12 @@ class PMA_Theme_Manager if (! $this->checkTheme($GLOBALS['cfg']['ThemeDefault'])) { trigger_error( - sprintf(__('Default theme %s not found!'), - htmlspecialchars($GLOBALS['cfg']['ThemeDefault'])), - E_USER_ERROR); + sprintf( + __('Default theme %s not found!'), + htmlspecialchars($GLOBALS['cfg']['ThemeDefault']) + ), + E_USER_ERROR + ); $GLOBALS['cfg']['ThemeDefault'] = false; } @@ -144,7 +147,10 @@ class PMA_Theme_Manager { if (! $this->checkTheme($theme)) { trigger_error( - sprintf(__('Theme %s not found!'), htmlspecialchars($theme)), + sprintf( + __('Theme %s not found!'), + htmlspecialchars($theme) + ), E_USER_ERROR); return false; } @@ -203,7 +209,7 @@ class PMA_Theme_Manager * @param string $folder * @return boolean */ - /*private*/ function _checkThemeFolder($folder) + private function _checkThemeFolder($folder) { if (! is_dir($folder)) { trigger_error( hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13632-g96be56e
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 96be56ea40007aff24f47d8d517eff5fd0bb7220 (commit) from 90e7b7518981cefbd2e6386b2a69b24cfb37a04a (commit) - Log ----------------------------------------------------------------- commit 96be56ea40007aff24f47d8d517eff5fd0bb7220 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:41:09 2011 +0200 Adjust switch blocks to PEAR coding standards ----------------------------------------------------------------------- Summary of changes: libraries/select_lang.lib.php | 256 ++++++++++++++++++++-------------------- 1 files changed, 128 insertions(+), 128 deletions(-) diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index a3627b1..7fb65f6 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -186,134 +186,134 @@ function PMA_langDetect($str, $envType) function PMA_langDetails($lang) { switch ($lang) { - case 'af': - return array('af|afrikaans', 'af', ''); - case 'ar': - return array('ar|arabic', 'ar', 'العربية'); - case 'az': - return array('az|azerbaijani', 'az', 'Azərbaycanca'); - case 'bn': - return array('bn|bangla', 'bn', 'বাংলা'); - case 'be': - return array('be|belarusian', 'be', 'Беларуская'); - case 'be@latin': - return array('be[-_]lat|belarusian latin', 'be-lat', 'Biełaruskaja'); - case 'bg': - return array('bg|bulgarian', 'bg', 'Български'); - case 'bs': - return array('bs|bosnian', 'bs', 'Bosanski'); - case 'br': - return array('br|breton', 'br', 'Brezhoneg'); - case 'ca': - return array('ca|catalan', 'ca', 'Català'); - case 'cs': - return array('cs|czech', 'cs', 'Čeština'); - case 'cy': - return array('cy|welsh', 'cy', 'Cymraeg'); - case 'da': - return array('da|danish', 'da', 'Dansk'); - case 'de': - return array('de|german', 'de', 'Deutsch'); - case 'el': - return array('el|greek', 'el', 'Ελληνικά'); - case 'en': - return array('en|english', 'en', ''); - case 'en_GB': - return array('en[_-]gb|english (United Kingdom)', 'en-gb', ''); - case 'es': - return array('es|spanish', 'es', 'Español'); - case 'et': - return array('et|estonian', 'et', 'Eesti'); - case 'eu': - return array('eu|basque', 'eu', 'Euskara'); - case 'fa': - return array('fa|persian', 'fa', 'فارسی'); - case 'fi': - return array('fi|finnish', 'fi', 'Suomi'); - case 'fr': - return array('fr|french', 'fr', 'Français'); - case 'gl': - return array('gl|galician', 'gl', 'Galego'); - case 'he': - return array('he|hebrew', 'he', 'עברית'); - case 'hi': - return array('hi|hindi', 'hi', 'हिन्दी'); - case 'hr': - return array('hr|croatian', 'hr', 'Hrvatski'); - case 'hu': - return array('hu|hungarian', 'hu', 'Magyar'); - case 'id': - return array('id|indonesian', 'id', 'Bahasa Indonesia'); - case 'it': - return array('it|italian', 'it', 'Italiano'); - case 'ja': - return array('ja|japanese', 'ja', '日本語'); - case 'ko': - return array('ko|korean', 'ko', '한국어'); - case 'ka': - return array('ka|georgian', 'ka', 'ქართული'); - case 'lt': - return array('lt|lithuanian', 'lt', 'Lietuvių'); - case 'lv': - return array('lv|latvian', 'lv', 'Latvie&scaron;u'); - case 'mk': - return array('mk|macedonian', 'mk', 'Macedonian'); - case 'mn': - return array('mn|mongolian', 'mn', 'Монгол'); - case 'ms': - return array('ms|malay', 'ms', 'Bahasa Melayu'); - case 'nl': - return array('nl|dutch', 'nl', 'Nederlands'); - case 'nb': - return array('nb|norwegian', 'nb', 'Norsk'); - case 'pl': - return array('pl|polish', 'pl', 'Polski'); - case 'pt_BR': - return array('pt[-_]br|brazilian portuguese', 'pt-BR', 'Português'); - case 'pt': - return array('pt|portuguese', 'pt', 'Português'); - case 'ro': - return array('ro|romanian', 'ro', 'Română'); - case 'ru': - return array('ru|russian', 'ru', 'Русский'); - case 'si': - return array('si|sinhala', 'si', 'සිංහල'); - case 'sk': - return array('sk|slovak', 'sk', 'Slovenčina'); - case 'sl': - return array('sl|slovenian', 'sl', 'Sloven&scaron;čina'); - case 'sq': - return array('sq|albanian', 'sq', 'Shqip'); - case 'sr@latin': - return array('sr[-_]lat|serbian latin', 'sr-lat', 'Srpski'); - case 'sr': - return array('sr|serbian', 'sr', 'Српски'); - case 'sv': - return array('sv|swedish', 'sv', 'Svenska'); - case 'ta': - return array('ta|tamil', 'ta', 'தமிழ்'); - case 'te': - return array('te|telugu', 'te', 'తెలుగు'); - case 'th': - return array('th|thai', 'th', 'ภาษาไทย'); - case 'tr': - return array('tr|turkish', 'tr', 'Türkçe'); - case 'tt': - return array('tt|tatarish', 'tt', 'Tatarça'); - case 'ug': - return array('ug|uyghur', 'ug', 'ئۇيغۇرچە'); - case 'uk': - return array('uk|ukrainian', 'uk', 'Українська'); - case 'ur': - return array('ur|urdu', 'ur', 'اُردوُ'); - case 'uz@latin': - return array('uz[-_]lat|uzbek-latin', 'uz-lat', 'O‘zbekcha'); - case 'uz': - return array('uz[-_]cyr|uzbek-cyrillic', 'uz-cyr', 'Ўзбекча'); - case 'zh_TW': - return array('zh[-_](tw|hk)|chinese traditional', 'zh-TW', '中文'); - case 'zh_CN': - return array('zh|chinese simplified', 'zh', '中文'); + case 'af': + return array('af|afrikaans', 'af', ''); + case 'ar': + return array('ar|arabic', 'ar', 'العربية'); + case 'az': + return array('az|azerbaijani', 'az', 'Azərbaycanca'); + case 'bn': + return array('bn|bangla', 'bn', 'বাংলা'); + case 'be': + return array('be|belarusian', 'be', 'Беларуская'); + case 'be@latin': + return array('be[-_]lat|belarusian latin', 'be-lat', 'Biełaruskaja'); + case 'bg': + return array('bg|bulgarian', 'bg', 'Български'); + case 'bs': + return array('bs|bosnian', 'bs', 'Bosanski'); + case 'br': + return array('br|breton', 'br', 'Brezhoneg'); + case 'ca': + return array('ca|catalan', 'ca', 'Català'); + case 'cs': + return array('cs|czech', 'cs', 'Čeština'); + case 'cy': + return array('cy|welsh', 'cy', 'Cymraeg'); + case 'da': + return array('da|danish', 'da', 'Dansk'); + case 'de': + return array('de|german', 'de', 'Deutsch'); + case 'el': + return array('el|greek', 'el', 'Ελληνικά'); + case 'en': + return array('en|english', 'en', ''); + case 'en_GB': + return array('en[_-]gb|english (United Kingdom)', 'en-gb', ''); + case 'es': + return array('es|spanish', 'es', 'Español'); + case 'et': + return array('et|estonian', 'et', 'Eesti'); + case 'eu': + return array('eu|basque', 'eu', 'Euskara'); + case 'fa': + return array('fa|persian', 'fa', 'فارسی'); + case 'fi': + return array('fi|finnish', 'fi', 'Suomi'); + case 'fr': + return array('fr|french', 'fr', 'Français'); + case 'gl': + return array('gl|galician', 'gl', 'Galego'); + case 'he': + return array('he|hebrew', 'he', 'עברית'); + case 'hi': + return array('hi|hindi', 'hi', 'हिन्दी'); + case 'hr': + return array('hr|croatian', 'hr', 'Hrvatski'); + case 'hu': + return array('hu|hungarian', 'hu', 'Magyar'); + case 'id': + return array('id|indonesian', 'id', 'Bahasa Indonesia'); + case 'it': + return array('it|italian', 'it', 'Italiano'); + case 'ja': + return array('ja|japanese', 'ja', '日本語'); + case 'ko': + return array('ko|korean', 'ko', '한국어'); + case 'ka': + return array('ka|georgian', 'ka', 'ქართული'); + case 'lt': + return array('lt|lithuanian', 'lt', 'Lietuvių'); + case 'lv': + return array('lv|latvian', 'lv', 'Latvie&scaron;u'); + case 'mk': + return array('mk|macedonian', 'mk', 'Macedonian'); + case 'mn': + return array('mn|mongolian', 'mn', 'Монгол'); + case 'ms': + return array('ms|malay', 'ms', 'Bahasa Melayu'); + case 'nl': + return array('nl|dutch', 'nl', 'Nederlands'); + case 'nb': + return array('nb|norwegian', 'nb', 'Norsk'); + case 'pl': + return array('pl|polish', 'pl', 'Polski'); + case 'pt_BR': + return array('pt[-_]br|brazilian portuguese', 'pt-BR', 'Português'); + case 'pt': + return array('pt|portuguese', 'pt', 'Português'); + case 'ro': + return array('ro|romanian', 'ro', 'Română'); + case 'ru': + return array('ru|russian', 'ru', 'Русский'); + case 'si': + return array('si|sinhala', 'si', 'සිංහල'); + case 'sk': + return array('sk|slovak', 'sk', 'Slovenčina'); + case 'sl': + return array('sl|slovenian', 'sl', 'Sloven&scaron;čina'); + case 'sq': + return array('sq|albanian', 'sq', 'Shqip'); + case 'sr@latin': + return array('sr[-_]lat|serbian latin', 'sr-lat', 'Srpski'); + case 'sr': + return array('sr|serbian', 'sr', 'Српски'); + case 'sv': + return array('sv|swedish', 'sv', 'Svenska'); + case 'ta': + return array('ta|tamil', 'ta', 'தமிழ்'); + case 'te': + return array('te|telugu', 'te', 'తెలుగు'); + case 'th': + return array('th|thai', 'th', 'ภาษาไทย'); + case 'tr': + return array('tr|turkish', 'tr', 'Türkçe'); + case 'tt': + return array('tt|tatarish', 'tt', 'Tatarça'); + case 'ug': + return array('ug|uyghur', 'ug', 'ئۇيغۇرچە'); + case 'uk': + return array('uk|ukrainian', 'uk', 'Українська'); + case 'ur': + return array('ur|urdu', 'ur', 'اُردوُ'); + case 'uz@latin': + return array('uz[-_]lat|uzbek-latin', 'uz-lat', 'O‘zbekcha'); + case 'uz': + return array('uz[-_]cyr|uzbek-cyrillic', 'uz-cyr', 'Ўзбекча'); + case 'zh_TW': + return array('zh[-_](tw|hk)|chinese traditional', 'zh-TW', '中文'); + case 'zh_CN': + return array('zh|chinese simplified', 'zh', '中文'); } return array("$lang|$lang", $lang, $lang); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13631-g90e7b75
by Michal Čihař 08 Aug '11

08 Aug '11

The branch, master has been updated via 90e7b7518981cefbd2e6386b2a69b24cfb37a04a (commit) via 9317162dcc44a392a4528fcb3567ae9f801a6787 (commit) via f7d85630ed4f0ee01a77c1ec1ca34c8cc46afca2 (commit) via bc17e5eeddcfeb08b2b8e534fe8a43280771175e (commit) via 617f6f5c241470a16a102eafdcb7de0bdbc39330 (commit) via 747ab57391145c855f81efb89cd98d1c0e5b3c4a (commit) via fae95bd225f63551445f51bb4645bd8c1ea6d065 (commit) from ed1519ee76a572306bfa668e0cb72ce8e2d1bf0d (commit) - Log ----------------------------------------------------------------- commit 90e7b7518981cefbd2e6386b2a69b24cfb37a04a Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:40:00 2011 +0200 Fix indentation commit 9317162dcc44a392a4528fcb3567ae9f801a6787 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:39:19 2011 +0200 Fix indentation commit f7d85630ed4f0ee01a77c1ec1ca34c8cc46afca2 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:38:26 2011 +0200 Improve coding style commit bc17e5eeddcfeb08b2b8e534fe8a43280771175e Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:36:31 2011 +0200 Fix indentation commit 617f6f5c241470a16a102eafdcb7de0bdbc39330 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:36:16 2011 +0200 Adjust switch blocks to PEAR coding standards commit 747ab57391145c855f81efb89cd98d1c0e5b3c4a Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:35:03 2011 +0200 Adjust switch blocks to PEAR coding standards commit fae95bd225f63551445f51bb4645bd8c1ea6d065 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Aug 8 17:33:54 2011 +0200 Fix indentation of some code blocks ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 254 ++++++++++++++-------------- libraries/mysql_charsets.lib.php | 348 +++++++++++++++++++------------------- tbl_printview.php | 8 +- 3 files changed, 306 insertions(+), 304 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index b03e5dc..84e13b7 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -50,21 +50,21 @@ function PMA_pow($base, $exp, $use_function = false) return false; } switch ($use_function) { - case 'bcpow' : - // bcscale() needed for testing PMA_pow() with base values < 1 - bcscale(10); - $pow = bcpow($base, $exp); - break; - case 'gmp_pow' : - $pow = gmp_strval(gmp_pow($base, $exp)); - break; - case 'pow' : - $base = (float) $base; - $exp = (int) $exp; - $pow = pow($base, $exp); - break; - default: - $pow = $use_function($base, $exp); + case 'bcpow' : + // bcscale() needed for testing PMA_pow() with base values < 1 + bcscale(10); + $pow = bcpow($base, $exp); + break; + case 'gmp_pow' : + $pow = gmp_strval(gmp_pow($base, $exp)); + break; + case 'pow' : + $base = (float) $base; + $exp = (int) $exp; + $pow = pow($base, $exp); + break; + default: + $pow = $use_function($base, $exp); } return $pow; @@ -301,23 +301,23 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '') $formatted_sql = ''; switch ($cfg['SQP']['fmtType']) { - case 'none': - if ($unparsed_sql != '') { - $formatted_sql = '<span class="inner_sql"><pre>' . "\n" - . PMA_SQP_formatNone(array('raw' => $unparsed_sql)) . "\n" - . '</pre></span>'; - } else { - $formatted_sql = PMA_SQP_formatNone($parsed_sql); - } - break; - case 'html': - $formatted_sql = PMA_SQP_formatHtml($parsed_sql, 'color'); - break; - case 'text': - $formatted_sql = PMA_SQP_formatHtml($parsed_sql, 'text'); - break; - default: - break; + case 'none': + if ($unparsed_sql != '') { + $formatted_sql = '<span class="inner_sql"><pre>' . "\n" + . PMA_SQP_formatNone(array('raw' => $unparsed_sql)) . "\n" + . '</pre></span>'; + } else { + $formatted_sql = PMA_SQP_formatNone($parsed_sql); + } + break; + case 'html': + $formatted_sql = PMA_SQP_formatHtml($parsed_sql, 'color'); + break; + case 'text': + $formatted_sql = PMA_SQP_formatHtml($parsed_sql, 'text'); + break; + default: + break; } // end switch return $formatted_sql; @@ -350,57 +350,57 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju $link = str_replace('_', '-', strtolower($link)); switch ($cfg['MySQLManualType']) { - case 'chapters': - if (empty($chapter)) { - $chapter = 'index'; - } - if (empty($anchor)) { - $anchor = $link; - } - $url = $cfg['MySQLManualBase'] . '/' . $chapter . '.html#' . $anchor; - break; - case 'big': - if (empty($anchor)) { - $anchor = $link; - } - $url = $cfg['MySQLManualBase'] . '#' . $anchor; - break; - case 'searchable': - if (empty($link)) { - $link = 'index'; - } - $url = $cfg['MySQLManualBase'] . '/' . $link . '.html'; - if (!empty($anchor)) { - $url .= '#' . $anchor; - } - break; - case 'viewable': - default: - if (empty($link)) { - $link = 'index'; - } - $mysql = '5.0'; - $lang = 'en'; - if (defined('PMA_MYSQL_INT_VERSION')) { - if (PMA_MYSQL_INT_VERSION >= 50500) { - $mysql = '5.5'; - /* l10n: Language to use for MySQL 5.5 documentation, please use only languages which do exist in official documentation. */ - $lang = _pgettext('MySQL 5.5 documentation language', 'en'); - } else if (PMA_MYSQL_INT_VERSION >= 50100) { - $mysql = '5.1'; - /* l10n: Language to use for MySQL 5.1 documentation, please use only languages which do exist in official documentation. */ - $lang = _pgettext('MySQL 5.1 documentation language', 'en'); - } else { - $mysql = '5.0'; - /* l10n: Language to use for MySQL 5.0 documentation, please use only languages which do exist in official documentation. */ - $lang = _pgettext('MySQL 5.0 documentation language', 'en'); - } - } - $url = $cfg['MySQLManualBase'] . '/' . $mysql . '/' . $lang . '/' . $link . '.html'; - if (!empty($anchor)) { - $url .= '#' . $anchor; + case 'chapters': + if (empty($chapter)) { + $chapter = 'index'; + } + if (empty($anchor)) { + $anchor = $link; + } + $url = $cfg['MySQLManualBase'] . '/' . $chapter . '.html#' . $anchor; + break; + case 'big': + if (empty($anchor)) { + $anchor = $link; + } + $url = $cfg['MySQLManualBase'] . '#' . $anchor; + break; + case 'searchable': + if (empty($link)) { + $link = 'index'; + } + $url = $cfg['MySQLManualBase'] . '/' . $link . '.html'; + if (!empty($anchor)) { + $url .= '#' . $anchor; + } + break; + case 'viewable': + default: + if (empty($link)) { + $link = 'index'; + } + $mysql = '5.0'; + $lang = 'en'; + if (defined('PMA_MYSQL_INT_VERSION')) { + if (PMA_MYSQL_INT_VERSION >= 50500) { + $mysql = '5.5'; + /* l10n: Language to use for MySQL 5.5 documentation, please use only languages which do exist in official documentation. */ + $lang = _pgettext('MySQL 5.5 documentation language', 'en'); + } else if (PMA_MYSQL_INT_VERSION >= 50100) { + $mysql = '5.1'; + /* l10n: Language to use for MySQL 5.1 documentation, please use only languages which do exist in official documentation. */ + $lang = _pgettext('MySQL 5.1 documentation language', 'en'); + } else { + $mysql = '5.0'; + /* l10n: Language to use for MySQL 5.0 documentation, please use only languages which do exist in official documentation. */ + $lang = _pgettext('MySQL 5.0 documentation language', 'en'); } - break; + } + $url = $cfg['MySQLManualBase'] . '/' . $mysql . '/' . $lang . '/' . $link . '.html'; + if (!empty($anchor)) { + $url .= '#' . $anchor; + } + break; } $open_link = '<a href="' . PMA_linkURL($url) . '" target="mysql_doc">'; @@ -615,14 +615,14 @@ function PMA_mysqlDie($error_message = '', $the_query = '', $_SESSION['Import_message']['message'] = $error_msg_output; if ($exit) { - /** - * If in an Ajax request - * - avoid displaying a Back link - * - use PMA_ajaxResponse() to transmit the message and exit - */ - if ($GLOBALS['is_ajax_request'] == true) { - PMA_ajaxResponse($error_msg_output, false); - } + /** + * If in an Ajax request + * - avoid displaying a Back link + * - use PMA_ajaxResponse() to transmit the message and exit + */ + if ($GLOBALS['is_ajax_request'] == true) { + PMA_ajaxResponse($error_msg_output, false); + } if (! empty($back_url)) { if (strstr($back_url, '?')) { $back_url .= '&no_history=true'; @@ -635,13 +635,13 @@ function PMA_mysqlDie($error_message = '', $the_query = '', $error_msg_output .= '<fieldset class="tblFooters">'; $error_msg_output .= '[ <a href="' . $back_url . '">' . __('Back') . '</a> ]'; $error_msg_output .= '</fieldset>' . "\n\n"; - } + } - echo $error_msg_output; - /** - * display footer and exit - */ - require './libraries/footer.inc.php'; + echo $error_msg_output; + /** + * display footer and exit + */ + require './libraries/footer.inc.php'; } else { echo $error_msg_output; } @@ -855,8 +855,9 @@ function PMA_reloadNavigation($jsonly=false) unset($_SESSION['tmp_user_values']['table_limit_offset']); echo "\n"; $reload_url = './navigation.php?' . PMA_generate_common_url($GLOBALS['db'], '', '&'); - if (!$jsonly) - echo '<script type="text/javascript">' . PHP_EOL; + if (!$jsonly) { + echo '<script type="text/javascript">' . PHP_EOL; + } ?> //<![CDATA[ if (typeof(window.parent) != 'undefined' @@ -866,8 +867,9 @@ if (typeof(window.parent) != 'undefined' } //]]> <?php -if (!$jsonly) - echo '</script>' . PHP_EOL; + if (!$jsonly) { + echo '</script>' . PHP_EOL; + } unset($GLOBALS['reload']); } @@ -1204,8 +1206,8 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // mode because 1) it currently does not work and 2) we would // have two similar mechanisms on the page for the same goal if ($is_select || $GLOBALS['is_ajax_request'] === false && ! $query_too_big) { - // see in js/functions.js the jQuery code attached to id inline_edit - // document.write conflicts with jQuery, hence used $().append() + // see in js/functions.js the jQuery code attached to id inline_edit + // document.write conflicts with jQuery, hence used $().append() echo "<script type=\"text/javascript\">\n" . "//<![CDATA[\n" . "$('.tools form').last().after('[<a href=\"#\" title=\"" . @@ -1497,44 +1499,44 @@ function PMA_extractValueFromFormattedSize($formatted_size) function PMA_localisedDate($timestamp = -1, $format = '') { $month = array( -/* l10n: Short month name */ + /* l10n: Short month name */ __('Jan'), -/* l10n: Short month name */ + /* l10n: Short month name */ __('Feb'), -/* l10n: Short month name */ + /* l10n: Short month name */ __('Mar'), -/* l10n: Short month name */ + /* l10n: Short month name */ __('Apr'), -/* l10n: Short month name */ + /* l10n: Short month name */ _pgettext('Short month name', 'May'), -/* l10n: Short month name */ + /* l10n: Short month name */ __('Jun'), -/* l10n: Short month name */ + /* l10n: Short month name */ __('Jul'), -/* l10n: Short month name */ + /* l10n: Short month name */ __('Aug'), -/* l10n: Short month name */ + /* l10n: Short month name */ __('Sep'), -/* l10n: Short month name */ + /* l10n: Short month name */ __('Oct'), -/* l10n: Short month name */ + /* l10n: Short month name */ __('Nov'), -/* l10n: Short month name */ + /* l10n: Short month name */ __('Dec')); $day_of_week = array( -/* l10n: Short week day name */ + /* l10n: Short week day name */ _pgettext('Short week day name', 'Sun'), -/* l10n: Short week day name */ + /* l10n: Short week day name */ __('Mon'), -/* l10n: Short week day name */ + /* l10n: Short week day name */ __('Tue'), -/* l10n: Short week day name */ + /* l10n: Short week day name */ __('Wed'), -/* l10n: Short week day name */ + /* l10n: Short week day name */ __('Thu'), -/* l10n: Short week day name */ + /* l10n: Short week day name */ __('Fri'), -/* l10n: Short week day name */ + /* l10n: Short week day name */ __('Sat')); if ($format == '') { @@ -2700,13 +2702,13 @@ function PMA_extractFieldSpec($fieldspec) if (! $in_string) { $in_string = true; $working = ""; - // Otherwise, it may be either an end of a string, or a 'double quote' which can be handled as-is } else { - // Check out the next character (if possible) + // Otherwise, it may be either an end of a string, or a 'double quote' which can be handled as-is + // Check out the next character (if possible) $has_next = isset($fieldspec[$index + 1]); $next = $has_next ? $fieldspec[$index + 1] : null; - // If we have reached the end of our 'working' string (because there are no more chars, or the next char is not another quote) + // If we have reached the end of our 'working' string (because there are no more chars, or the next char is not another quote) if (! $has_next || $next != "'") { $enum_set_values[] = $working; $in_string = false; @@ -2718,12 +2720,12 @@ function PMA_extractFieldSpec($fieldspec) $index++; } } - // escaping of a quote? } elseif ('\\' == $char && isset($fieldspec[$index + 1]) && "'" == $fieldspec[$index + 1]) { + // escaping of a quote? $working .= "'"; $index++; - // Otherwise, add it to our working string like normal } else { + // Otherwise, add it to our working string like normal $working .= $char; } // Increment character index diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 45f9255..05a5c3b 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -210,200 +210,200 @@ function PMA_getCollationDescr($collation) } $descr = ''; switch ($parts[1]) { - case 'bulgarian': - $descr = __('Bulgarian'); - break; - case 'chinese': - if ($parts[0] == 'gb2312' || $parts[0] == 'gbk') { - $descr = __('Simplified Chinese'); - } elseif ($parts[0] == 'big5') { - $descr = __('Traditional Chinese'); - } - break; - case 'ci': - $descr = __('case-insensitive'); - break; - case 'cs': - $descr = __('case-sensitive'); - break; - case 'croatian': - $descr = __('Croatian'); - break; - case 'czech': - $descr = __('Czech'); - break; - case 'danish': - $descr = __('Danish'); - break; - case 'english': - $descr = __('English'); - break; - case 'esperanto': - $descr = __('Esperanto'); - break; - case 'estonian': - $descr = __('Estonian'); - break; - case 'german1': - $descr = __('German') . ' (' . __('dictionary') . ')'; + case 'bulgarian': + $descr = __('Bulgarian'); + break; + case 'chinese': + if ($parts[0] == 'gb2312' || $parts[0] == 'gbk') { + $descr = __('Simplified Chinese'); + } elseif ($parts[0] == 'big5') { + $descr = __('Traditional Chinese'); + } + break; + case 'ci': + $descr = __('case-insensitive'); + break; + case 'cs': + $descr = __('case-sensitive'); + break; + case 'croatian': + $descr = __('Croatian'); + break; + case 'czech': + $descr = __('Czech'); + break; + case 'danish': + $descr = __('Danish'); + break; + case 'english': + $descr = __('English'); + break; + case 'esperanto': + $descr = __('Esperanto'); + break; + case 'estonian': + $descr = __('Estonian'); + break; + case 'german1': + $descr = __('German') . ' (' . __('dictionary') . ')'; + break; + case 'german2': + $descr = __('German') . ' (' . __('phone book') . ')'; + break; + case 'hungarian': + $descr = __('Hungarian'); + break; + case 'icelandic': + $descr = __('Icelandic'); + break; + case 'japanese': + $descr = __('Japanese'); + break; + case 'latvian': + $descr = __('Latvian'); + break; + case 'lithuanian': + $descr = __('Lithuanian'); + break; + case 'korean': + $descr = __('Korean'); + break; + case 'persian': + $descr = __('Persian'); + break; + case 'polish': + $descr = __('Polish'); + break; + case 'roman': + $descr = __('West European'); + break; + case 'romanian': + $descr = __('Romanian'); + break; + case 'slovak': + $descr = __('Slovak'); + break; + case 'slovenian': + $descr = __('Slovenian'); + break; + case 'spanish': + $descr = __('Spanish'); + break; + case 'spanish2': + $descr = __('Traditional Spanish'); + break; + case 'swedish': + $descr = __('Swedish'); + break; + case 'thai': + $descr = __('Thai'); + break; + case 'turkish': + $descr = __('Turkish'); + break; + case 'ukrainian': + $descr = __('Ukrainian'); + break; + case 'unicode': + $descr = __('Unicode') . ' (' . __('multilingual') . ')'; + break; + case 'bin': + $is_bin = true; + case 'general': + switch ($parts[0]) { + // Unicode charsets + case 'ucs2': + case 'utf8': + $descr = __('Unicode') . ' (' . __('multilingual') . ')'; break; - case 'german2': - $descr = __('German') . ' (' . __('phone book') . ')'; + // West European charsets + case 'ascii': + case 'cp850': + case 'dec8': + case 'hp8': + case 'latin1': + case 'macroman': + $descr = __('West European') . ' (' . __('multilingual') . ')'; + break; + // Central European charsets + case 'cp1250': + case 'cp852': + case 'latin2': + case 'macce': + $descr = __('Central European') . ' (' . __('multilingual') . ')'; + break; + // Russian charsets + case 'cp866': + case 'koi8r': + $descr = __('Russian'); + break; + // Simplified Chinese charsets + case 'gb2312': + case 'gbk': + $descr = __('Simplified Chinese'); + break; + // Japanese charsets + case 'sjis': + case 'ujis': + case 'cp932': + case 'eucjpms': + $descr = __('Japanese'); break; - case 'hungarian': - $descr = __('Hungarian'); + // Baltic charsets + case 'cp1257': + case 'latin7': + $descr = __('Baltic') . ' (' . __('multilingual') . ')'; break; - case 'icelandic': - $descr = __('Icelandic'); + // Other + case 'armscii8': + case 'armscii': + $descr = __('Armenian'); break; - case 'japanese': - $descr = __('Japanese'); + case 'big5': + $descr = __('Traditional Chinese'); break; - case 'latvian': - $descr = __('Latvian'); + case 'cp1251': + $descr = __('Cyrillic') . ' (' . __('multilingual') . ')'; break; - case 'lithuanian': - $descr = __('Lithuanian'); + case 'cp1256': + $descr = __('Arabic'); break; - case 'korean': + case 'euckr': $descr = __('Korean'); break; - case 'persian': - $descr = __('Persian'); + case 'hebrew': + $descr = __('Hebrew'); break; - case 'polish': - $descr = __('Polish'); + case 'geostd8': + $descr = __('Georgian'); break; - case 'roman': - $descr = __('West European'); + case 'greek': + $descr = __('Greek'); break; - case 'romanian': - $descr = __('Romanian'); + case 'keybcs2': + $descr = __('Czech-Slovak'); break; - case 'slovak': - $descr = __('Slovak'); - break; - case 'slovenian': - $descr = __('Slovenian'); - break; - case 'spanish': - $descr = __('Spanish'); + case 'koi8u': + $descr = __('Ukrainian'); break; - case 'spanish2': - $descr = __('Traditional Spanish'); + case 'latin5': + $descr = __('Turkish'); break; - case 'swedish': + case 'swe7': $descr = __('Swedish'); break; - case 'thai': + case 'tis620': $descr = __('Thai'); break; - case 'turkish': - $descr = __('Turkish'); - break; - case 'ukrainian': - $descr = __('Ukrainian'); - break; - case 'unicode': - $descr = __('Unicode') . ' (' . __('multilingual') . ')'; + default: + $descr = __('unknown'); break; - case 'bin': - $is_bin = true; - case 'general': - switch ($parts[0]) { - // Unicode charsets - case 'ucs2': - case 'utf8': - $descr = __('Unicode') . ' (' . __('multilingual') . ')'; - break; - // West European charsets - case 'ascii': - case 'cp850': - case 'dec8': - case 'hp8': - case 'latin1': - case 'macroman': - $descr = __('West European') . ' (' . __('multilingual') . ')'; - break; - // Central European charsets - case 'cp1250': - case 'cp852': - case 'latin2': - case 'macce': - $descr = __('Central European') . ' (' . __('multilingual') . ')'; - break; - // Russian charsets - case 'cp866': - case 'koi8r': - $descr = __('Russian'); - break; - // Simplified Chinese charsets - case 'gb2312': - case 'gbk': - $descr = __('Simplified Chinese'); - break; - // Japanese charsets - case 'sjis': - case 'ujis': - case 'cp932': - case 'eucjpms': - $descr = __('Japanese'); - break; - // Baltic charsets - case 'cp1257': - case 'latin7': - $descr = __('Baltic') . ' (' . __('multilingual') . ')'; - break; - // Other - case 'armscii8': - case 'armscii': - $descr = __('Armenian'); - break; - case 'big5': - $descr = __('Traditional Chinese'); - break; - case 'cp1251': - $descr = __('Cyrillic') . ' (' . __('multilingual') . ')'; - break; - case 'cp1256': - $descr = __('Arabic'); - break; - case 'euckr': - $descr = __('Korean'); - break; - case 'hebrew': - $descr = __('Hebrew'); - break; - case 'geostd8': - $descr = __('Georgian'); - break; - case 'greek': - $descr = __('Greek'); - break; - case 'keybcs2': - $descr = __('Czech-Slovak'); - break; - case 'koi8u': - $descr = __('Ukrainian'); - break; - case 'latin5': - $descr = __('Turkish'); - break; - case 'swe7': - $descr = __('Swedish'); - break; - case 'tis620': - $descr = __('Thai'); - break; - default: - $descr = __('unknown'); - break; - } - if (!empty($is_bin)) { - $descr .= ', ' . __('Binary'); - } - break; - default: $descr = __('unknown'); + } + if (!empty($is_bin)) { + $descr .= ', ' . __('Binary'); + } + break; + default: $descr = __('unknown'); } if (!empty($parts[2])) { if ($parts[2] == 'ci') { diff --git a/tbl_printview.php b/tbl_printview.php index 068cfbc..a8eb5d6 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -101,10 +101,10 @@ foreach ($the_tables as $key => $table) { $columns = PMA_DBI_get_columns($db, $table); -// We need this to correctly learn if a TIMESTAMP is NOT NULL, since -// SHOW FULL FIELDS or INFORMATION_SCHEMA incorrectly says NULL -// and SHOW CREATE TABLE says NOT NULL (tested -// in MySQL 4.0.25 and 5.0.21, http://bugs.mysql.com/20910) + // We need this to correctly learn if a TIMESTAMP is NOT NULL, since + // SHOW FULL FIELDS or INFORMATION_SCHEMA incorrectly says NULL + // and SHOW CREATE TABLE says NOT NULL (tested + // in MySQL 4.0.25 and 5.0.21, http://bugs.mysql.com/20910) $show_create_table = PMA_DBI_fetch_value( 'SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table), hooks/post-receive -- phpMyAdmin

1 0