[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13771-gc54b040 - Git

9 Aug 2011

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@cihar.com
Date:   Tue Aug 9 08:38:15 2011 +0200
Merge remote-tracking branch 'pootle/master'
commit 1cd48e7962e549e3419339148d8493a88a1f3a2a
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:37:55 2011 +0200
Translation update done using Pootle.
commit 786fc85aee2bed0650e62e1074ca47b7b6da68ec
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:37:33 2011 +0200
Translation update done using Pootle.
commit 04d2649e38bcd0826e7252832db08b2c23eab70b
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:37:27 2011 +0200
Translation update done using Pootle.
commit 01047b353253e859b5d3f0845cf81eeb57b742f9
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:37:18 2011 +0200
Translation update done using Pootle.
commit be8e32305fc11f9853e6cb36b1f3229ab31a61e6
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:36:58 2011 +0200
Translation update done using Pootle.
commit 0b3951d59beb5b0ee4b36f2c5407ab9dbcd1814d
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:36:52 2011 +0200
Translation update done using Pootle.
commit c61f87ae08dad69f1998210c31002028c856560c
Author: Michal Čihař michal@cihar.com
Date:   Tue Aug 9 08:36:01 2011 +0200
Remove unused variables
commit 5558e10a3d125c804c087c323bcc56475d6d0bad
Author: Michal Čihař michal@cihar.com
Date:   Tue Aug 9 08:35:00 2011 +0200
Remove unused variables
commit db50c8cf0980ad70671bb0ab78fa4783077c2e7e
Author: Michal Čihař michal@cihar.com
Date:   Tue Aug 9 08:33:50 2011 +0200
Remove unused variables
commit 159205458a6ba8be822fb154a09a7440d6bd0fcd
Author: Michal Čihař michal@cihar.com
Date:   Tue Aug 9 08:32:27 2011 +0200
Unused variable
commit b08a3aa2d0970d2cd65760bb04d82652a6044f15
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:28:32 2011 +0200
Translation update done using Pootle.
commit 4c5e976088b8ee89d70b989c078f467de9ec5ade
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:27:49 2011 +0200
Translation update done using Pootle.
commit 049e03892a6ddd8c2d9eb6d7f97ef03800e30a60
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:27:29 2011 +0200
Translation update done using Pootle.
commit 6bce2f19775d22247b3e4dc427563bbc7940bfcc
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:27:19 2011 +0200
Translation update done using Pootle.
commit 59febd005885e2e3fde5792430a5723aace8cf74
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:25:04 2011 +0200
Translation update done using Pootle.
commit 8f00cbb6f0fc8434ffb0ecc30b34c7803fd5f91a
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:24:39 2011 +0200
Translation update done using Pootle.
commit c57b0b8d60a1497948da11d3c0a9ff09e78ef257
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:23:59 2011 +0200
Translation update done using Pootle.
commit a7cfb1af4c09a0040910eb048e7c5fbebd0a1307
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:23:40 2011 +0200
Translation update done using Pootle.
commit d994f162b7e4154396ddc6a57b1f836b0f267139
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:23:18 2011 +0200
Translation update done using Pootle.
commit d3fdee7dfbfb92b07faf7c52c07940687a9b0666
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:18:22 2011 +0200
Translation update done using Pootle.
commit 6f09edce18f690f031ceb7eb5b9bd361ab42a7ce
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:14:54 2011 +0200
Translation update done using Pootle.
commit 948545545015c3b3c8cef159664524e38a8d34a4
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:11:17 2011 +0200
Translation update done using Pootle.
commit 671b50c71b51e7c8c1ef1aafc0a848e9abeb161d
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:11:08 2011 +0200
Translation update done using Pootle.
commit 31bc64273e14e535caf1227dbcaac7edb9f7acdd
Author: shanyan baishui Siramizu@gmail.com
Date:   Tue Aug 9 08:10:19 2011 +0200
Translation update done using Pootle.
commit 55c989e699e3e3041e1af8d3de4833c8264c7737
Author: shanyan baishui Siramizu@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@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@gmail.com\n"
 "Language-Team: chinese_simplified zh_CN@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


    