From 71b418333fb2e805605d286107afcb507edf6d61 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Tue, 31 May 2011 12:03:56 +0200 Subject: [PATCH 1/9] Translation update done using Pootle. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index d154593e56..f371197252 100644 --- a/po/ja.po +++ b/po/ja.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-05-18 07:46-0400\n" -"PO-Revision-Date: 2011-05-29 07:59+0200\n" +"PO-Revision-Date: 2011-05-31 12:03+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -4919,7 +4919,7 @@ msgstr "行/クエリ" #: libraries/display_tbl.lib.php:2045 msgid "Showing rows" -msgstr "表示中の列" +msgstr "行の表示" #: libraries/display_tbl.lib.php:2055 msgid "total" From 11c852d057329be369b0f1d8b9d6aceea234d965 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Tue, 31 May 2011 12:04:20 +0200 Subject: [PATCH 2/9] Translation update done using Pootle. --- po/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index f371197252..b7a8952cdf 100644 --- a/po/ja.po +++ b/po/ja.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-05-18 07:46-0400\n" -"PO-Revision-Date: 2011-05-31 12:03+0200\n" +"PO-Revision-Date: 2011-05-31 12:04+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -6510,7 +6510,7 @@ msgstr "同名のブックマークは差し替える" #: libraries/sql_query_form.lib.php:366 msgid "Do not overwrite this query from outside the window" -msgstr "他のウィンドウからクエリを上書きすることはできません" +msgstr "別ウインドウからのクエリの上書きを禁止する" #: libraries/sql_query_form.lib.php:373 msgid "Delimiter" From a47ac24a49d5d925553f8d3c92f6a9722ee8b0ad Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 31 May 2011 06:31:58 -0400 Subject: [PATCH 3/9] Move the links we assume are used less, towards the end --- libraries/server_links.inc.php | 44 ++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php index b8b4dcdb0a..41ec8a8706 100644 --- a/libraries/server_links.inc.php +++ b/libraries/server_links.inc.php @@ -34,6 +34,7 @@ if (!$GLOBALS['is_ajax_request']) { /** * Displays tab links + * Put the links we assume are used less, towards the end */ $tabs = array(); @@ -49,11 +50,6 @@ if (!$GLOBALS['is_ajax_request']) { $tabs['status']['link'] = 'server_status.php'; $tabs['status']['text'] = __('Status'); - if (! empty($binary_logs)) { - $tabs['binlog']['icon'] = 's_tbl.png'; - $tabs['binlog']['link'] = 'server_binlog.php'; - $tabs['binlog']['text'] = __('Binary log'); - } $tabs['process']['icon'] = 's_process.png'; $tabs['process']['link'] = 'server_processlist.php'; $tabs['process']['text'] = __('Processes'); @@ -72,6 +68,28 @@ if (!$GLOBALS['is_ajax_request']) { $tabs['import']['link'] = 'server_import.php'; $tabs['import']['text'] = __('Import'); + $tabs['settings']['icon'] = 'b_tblops.png'; + $tabs['settings']['link'] = 'prefs_manage.php'; + $tabs['settings']['text'] = __('Settings'); + $tabs['settings']['active'] = in_array(basename($GLOBALS['PMA_PHP_SELF']), + array('prefs_forms.php', 'prefs_manage.php')); + + $tabs['synchronize']['icon'] = 's_sync.png'; + $tabs['synchronize']['link'] = 'server_synchronize.php'; + $tabs['synchronize']['text'] = __('Synchronize'); + + if (! empty($binary_logs)) { + $tabs['binlog']['icon'] = 's_tbl.png'; + $tabs['binlog']['link'] = 'server_binlog.php'; + $tabs['binlog']['text'] = __('Binary log'); + } + + if ($is_superuser) { + $tabs['replication']['icon'] = 's_replication.png'; + $tabs['replication']['link'] = 'server_replication.php'; + $tabs['replication']['text'] = __('Replication'); + } + $tabs['vars']['icon'] = 's_vars.png'; $tabs['vars']['link'] = 'server_variables.php'; $tabs['vars']['text'] = __('Variables'); @@ -84,22 +102,6 @@ if (!$GLOBALS['is_ajax_request']) { $tabs['engine']['link'] = 'server_engines.php'; $tabs['engine']['text'] = __('Engines'); - if ($is_superuser) { - $tabs['replication']['icon'] = 's_replication.png'; - $tabs['replication']['link'] = 'server_replication.php'; - $tabs['replication']['text'] = __('Replication'); - } - - $tabs['synchronize']['icon'] = 's_sync.png'; - $tabs['synchronize']['link'] = 'server_synchronize.php'; - $tabs['synchronize']['text'] = __('Synchronize'); - - $tabs['settings']['icon'] = 'b_tblops.png'; - $tabs['settings']['link'] = 'prefs_manage.php'; - $tabs['settings']['text'] = __('Settings'); - $tabs['settings']['active'] = in_array(basename($GLOBALS['PMA_PHP_SELF']), - array('prefs_forms.php', 'prefs_manage.php')); - echo PMA_generate_html_tabs($tabs, array()); unset($tabs); From 82891c683206acb7f4b5e39f11160913a6c7bcfd Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 31 May 2011 17:18:17 +0200 Subject: [PATCH 4/9] Translation update done using Pootle. --- po/en_GB.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 4e34b040eb..7d875f77cb 100644 --- a/po/en_GB.po +++ b/po/en_GB.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-05-18 07:46-0400\n" -"PO-Revision-Date: 2011-05-18 17:48+0200\n" +"PO-Revision-Date: 2011-05-31 17:18+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: english-gb \n" "Language: en_GB\n" @@ -4552,10 +4552,9 @@ msgstr "MySQL 4.0 compatible" #: libraries/display_create_database.lib.php:21 #: libraries/display_create_database.lib.php:39 -#, fuzzy #| msgid "Create new database" msgid "Create database" -msgstr "Create new database" +msgstr "Create database" #: libraries/display_create_database.lib.php:33 msgid "Create" From 5fa80010f599fd1f55f608a69b85dd0acbafe4a0 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 31 May 2011 17:18:39 +0200 Subject: [PATCH 5/9] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index eb46005873..76d82ef7ec 100644 --- a/po/fr.po +++ b/po/fr.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-05-18 07:46-0400\n" -"PO-Revision-Date: 2011-05-18 17:49+0200\n" +"PO-Revision-Date: 2011-05-31 17:18+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -4606,7 +4606,6 @@ msgstr "Compatible MySQL 4.0" #: libraries/display_create_database.lib.php:21 #: libraries/display_create_database.lib.php:39 -#, fuzzy #| msgid "Create new database" msgid "Create database" msgstr "Créer une base de données" From a3115184945f62a578a86d529cf225ce3df6db0b Mon Sep 17 00:00:00 2001 From: Tyron Madlener Date: Tue, 31 May 2011 10:33:37 +0200 Subject: [PATCH 6/9] If the PMA_formatNumber() parameters would result in 0.0, it displays <0.1 instead --- libraries/common.lib.php | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 39b78f9b32..ac82f5275d 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -891,9 +891,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 '