From 1635c5c0bce85d69b496a3ef03e075fa2042e413 Mon Sep 17 00:00:00 2001 From: Thilanka Kaushalya Date: Mon, 25 Jul 2011 22:22:13 +0530 Subject: [PATCH 001/100] Ajaxify the Alter table order in Table operations --- js/functions.js | 32 ++++++++++++++++++++++++++++++++ tbl_operations.php | 19 ++++++++++++++----- 2 files changed, 46 insertions(+), 5 deletions(-) diff --git a/js/functions.js b/js/functions.js index 295996ac1f..261785a71d 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1909,6 +1909,38 @@ $(document).ready(function() { }, 'top.frame_content'); //end $(document).ready for 'Change Table' +/** + * jQuery coding for 'Table operations'. Used on tbl_operations.php + * Attach Ajax Event handlers for Table operations + */ +$(document).ready(function() { + /** + *Ajax action for submitting the "Alter table order by" + **/ + $("#alterTableOrderby.ajax").live('submit', function(event) { + event.preventDefault(); + $form = $(this); + + PMA_prepareForAjaxRequest($form); + /*variables which stores the common attributes*/ + $.post($form.attr('action'), $form.serialize()+"&submitorderby=Go", function(data) { + if ($("#sqlqueryresults").length != 0) { + $("#sqlqueryresults").remove(); + } + if (data.success == true) { + PMA_ajaxShowMessage(data.message); + $("
").insertAfter("#topmenucontainer"); + $("#sqlqueryresults").html(data.sql_query); + $("#result_query .notice").remove(); + $("#result_query").prepend((data.message)); + } else { + PMA_ajaxShowMessage(data.error); + } + }) // end $.post() + });//end of alterTableOrderby ajax submit +}, 'top.frame_content'); //end $(document).ready for 'Table operations' + + /** * Attach Ajax event handlers for Drop Database. Moved here from db_structure.js * as it was also required on db_create.php diff --git a/tbl_operations.php b/tbl_operations.php index 11021ba2b1..3481fd1cd6 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -216,25 +216,34 @@ if ($reread_info) { unset($reread_info); /** - * Displays top menu links + * Displays top menu links in non ajax requests */ -require_once './libraries/tbl_links.inc.php'; - +if (!isset($_REQUEST['ajax_request'])) { + require_once './libraries/tbl_links.inc.php'; +} if (isset($result) && empty($message_to_show)) { // set to success by default, because result set could be empty // (for example, a table rename) $_type = 'success'; if (empty($_message)) { - $_message = $result ? __('Your SQL query has been executed successfully') : __('Error'); + $_message = $result ? $message = PMA_Message::success(__('Your SQL query has been executed successfully')) : PMA_Message::error(__('Error')); // $result should exist, regardless of $_message $_type = $result ? 'success' : 'error'; + if ( $GLOBALS['is_ajax_request'] == true) { + $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); + PMA_ajaxResponse($_message,$_message->isSuccess() ,$extra_data); + } } if (! empty($warning_messages)) { $_message = new PMA_Message; $_message->addMessages($warning_messages); $_message->isError(true); + if ( $GLOBALS['is_ajax_request'] == true) { + PMA_ajaxResponse($_message, false); + } unset($warning_messages); } + PMA_showMessage($_message, $sql_query, $_type); unset($_message, $_type); } @@ -258,7 +267,7 @@ unset($local_query); ?>
-
+>
From edc4bac85ab9599bc579ab54060ae7a93708d53c Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Tue, 26 Jul 2011 11:34:30 +0200 Subject: [PATCH 002/100] Translation update done using Pootle. --- po/ja.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index ef9c015a57..3b726f0bc6 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-24 04:22+0200\n" +"PO-Revision-Date: 2011-07-26 11:34+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -9843,6 +9843,9 @@ msgid "" " general_log produces a lot of data and increases server load by up " "to 15%" msgstr "" +"phpMyAdmin モニタは、サーバ構成の最適化を支援し、時間のかかるクエリを追跡することができます。後者の場合には、テーブルに log_output " +"を設定し、slow_query_log または general_log のいずれかを有効にする必要があります。なお、general_log " +"を大量のデータを生成し、サーバの負荷を 15% 増加させますので、注意するようにしてください。" #: server_status.php:1373 msgid "" From 0f57543a2aed01f8ce7271919910b459843235c7 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Tue, 26 Jul 2011 11:58:46 +0200 Subject: [PATCH 003/100] Translation update done using Pootle. --- po/ja.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 3b726f0bc6..6203929052 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 11:34+0200\n" +"PO-Revision-Date: 2011-07-26 11:58+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1255,10 +1255,10 @@ msgstr "出力をファイルに保存する" #. l10n: Enable in this context means setting a status variable to ON #: js/messages.php:126 -#, 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:128 From 86e49a80f844828b423423523f62826200e856cc Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Tue, 26 Jul 2011 11:59:00 +0200 Subject: [PATCH 004/100] Translation update done using Pootle. --- po/ja.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 6203929052..8305362492 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 11:58+0200\n" +"PO-Revision-Date: 2011-07-26 11:59+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1262,10 +1262,10 @@ msgstr "%s を有効にする" #. l10n: Disable in this context means setting a status variable to OFF #: js/messages.php:128 -#, fuzzy, php-format +#, php-format #| msgid "Disabled" msgid "Disable %s" -msgstr "無効" +msgstr "%s を無効にする" #. l10n: %d seconds #: js/messages.php:130 From b1ccfd49cb9400d5f9c3e275b46048826d370067 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Tue, 26 Jul 2011 11:59:50 +0200 Subject: [PATCH 005/100] Translation update done using Pootle. --- po/ja.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 8305362492..b34eda44de 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1280,10 +1280,9 @@ msgid "" msgstr "" #: js/messages.php:132 -#, fuzzy #| msgid "Manage your settings" msgid "Change settings" -msgstr "ユーザ設定の管理" +msgstr "設定の変更" #: js/messages.php:133 #, fuzzy From 4f991968bc4f0e7ea515dbd4ff6d67c8077e78ac Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Tue, 26 Jul 2011 12:00:11 +0200 Subject: [PATCH 006/100] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index b34eda44de..1e7c18204d 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 11:59+0200\n" +"PO-Revision-Date: 2011-07-26 12:00+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1285,10 +1285,9 @@ msgid "Change settings" msgstr "設定の変更" #: js/messages.php:133 -#, fuzzy #| msgid "More settings" msgid "Current settings" -msgstr "詳細設定" +msgstr "現在の設定" #: js/messages.php:135 server_status.php:1393 msgid "Chart Title" From 1ee0a9fa8a3ef11c330a03adcafe9d0aa277f22d Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Tue, 26 Jul 2011 12:03:04 +0200 Subject: [PATCH 007/100] 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 1e7c18204d..74a9079f0c 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 12:00+0200\n" +"PO-Revision-Date: 2011-07-26 12:03+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1244,7 +1244,7 @@ msgstr "" 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:124 From 7be8d0e843de20fcb58f565d7a4a015c171ce8d2 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Tue, 26 Jul 2011 12:04:32 +0200 Subject: [PATCH 008/100] Translation update done using Pootle. --- po/ja.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index 74a9079f0c..bd75e5a3b4 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 12:03+0200\n" +"PO-Revision-Date: 2011-07-26 12:04+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1347,7 +1347,6 @@ msgstr "" #. l10n: A collection of available filters #: js/messages.php:151 -#, fuzzy #| msgid "Filter" msgid "Filters" msgstr "フィルタ" From bb23eeeffcfd7e6ecf8da1b4b9df6b1c3d981149 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Tue, 26 Jul 2011 12:06:06 +0200 Subject: [PATCH 009/100] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index bd75e5a3b4..eb73386522 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 12:04+0200\n" +"PO-Revision-Date: 2011-07-26 12:06+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1118,10 +1118,9 @@ msgstr "接続／プロセス" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:87 -#, fuzzy #| msgid "Connections since last refresh" msgid "Questions since last refresh" -msgstr "更新間隔中の接続数" +msgstr "更新間隔中の問い合わせ数" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:89 From a716eb7ef73f6ab5323eda4e4a5d001cb10d7a1d Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Tue, 26 Jul 2011 12:08:25 +0200 Subject: [PATCH 010/100] 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 eb73386522..bf12337302 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 12:06+0200\n" +"PO-Revision-Date: 2011-07-26 12:08+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1125,7 +1125,7 @@ msgstr "更新間隔中の問い合わせ数" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:89 msgid "Questions (executed statements by the server)" -msgstr "" +msgstr "問い合わせ数（サーバで実行された命令文）" #: js/messages.php:91 server_status.php:617 msgid "Query statistics" From ca66fa920fd2417ba0fd501ec15e9d113d77a540 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Tue, 26 Jul 2011 12:18:49 +0200 Subject: [PATCH 011/100] Translation update done using Pootle. --- po/ja.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index bf12337302..eb074aad87 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 12:08+0200\n" +"PO-Revision-Date: 2011-07-26 12:18+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1531,7 +1531,6 @@ msgid "Ignore" msgstr "無視" #: js/messages.php:218 -#, fuzzy #| msgid "Add column" msgid "Add columns" msgstr "カラムを追加する" From f3660c91946d1366f305c5cedb483ec7127b9351 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Tue, 26 Jul 2011 12:22:47 +0200 Subject: [PATCH 012/100] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index eb074aad87..99b6aef1f2 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 12:18+0200\n" +"PO-Revision-Date: 2011-07-26 12:22+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -2450,10 +2450,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s 日 %s 時間 %s 分 %s 秒" #: libraries/common.lib.php:1856 -#, fuzzy #| msgid "Routine parameters" msgid "Missing parameter:" -msgstr "ルーチンのパラメータ" +msgstr "パラメータがありません：" #: libraries/common.lib.php:2162 libraries/common.lib.php:2165 #: libraries/display_tbl.lib.php:299 From 8c3a2dcbaaee316800c22f67b78a735cf551dd62 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Tue, 26 Jul 2011 12:28:53 +0200 Subject: [PATCH 013/100] Translation update done using Pootle. --- po/ja.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 99b6aef1f2..792647d024 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 12:22+0200\n" +"PO-Revision-Date: 2011-07-26 12:28+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -9035,10 +9035,10 @@ msgstr "関連リンク" #. l10n: Questions is the name of a MySQL Status variable #: server_status.php:738 -#, fuzzy, php-format +#, php-format #| msgid "Network traffic since startup: %s" msgid "Questions since startup: %s" -msgstr "起動以後のネットワークトラフィック：%s" +msgstr "起動以後の問い合わせ数：%s" #: server_status.php:744 server_status.php:779 server_status.php:895 #: server_status.php:940 From 4beb223b644bc3d9996e3af78c5d763a533afd23 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Tue, 26 Jul 2011 12:39:09 +0200 Subject: [PATCH 014/100] 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 792647d024..ae1d1b6174 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 12:28+0200\n" +"PO-Revision-Date: 2011-07-26 12:39+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1185,7 +1185,7 @@ msgstr "モニタリンググラフを追加する" #: js/messages.php:109 msgid "Please add at least one variable to the series" -msgstr "" +msgstr "少なくとも１つの系列を追加してください" #: js/messages.php:110 libraries/display_export.lib.php:306 #: libraries/display_tbl.lib.php:561 libraries/export/sql.php:1052 From 416fe3b7f1473a547ed3659c191ac9785f198942 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:20:34 +0200 Subject: [PATCH 015/100] Translation update done using Pootle. --- po/el.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/el.po b/po/el.po index 561be746b3..f0929373cc 100644 --- a/po/el.po +++ b/po/el.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-20 11:01+0200\n" +"PO-Revision-Date: 2011-07-26 18:20+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: greek \n" "Language: el\n" @@ -1206,7 +1206,6 @@ msgid "Pause monitor" msgstr "Παύση εποπτείας" #: js/messages.php:114 -#, fuzzy #| msgid "general_log and slow_query_log is enabled." msgid "general_log and slow_query_log are enabled." msgstr "Το general_log και το slow_query_log είναι ενεργοποιημένα." From 822ebe52d67d7709097ffad28064a10774eaa4fe Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:20:49 +0200 Subject: [PATCH 016/100] Translation update done using Pootle. --- po/el.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/el.po b/po/el.po index f0929373cc..bb7def3e58 100644 --- a/po/el.po +++ b/po/el.po @@ -1219,7 +1219,6 @@ msgid "slow_query_log is enabled." msgstr "Το slow_query_log είναι ενεργοποιημένα." #: js/messages.php:117 -#, fuzzy #| msgid "slow_query_log and general_log is disabled." msgid "slow_query_log and general_log are disabled." msgstr "Το slow_query_log και το general_log είναι απενεργοποιημένα." From 3f426aa675277ee1b769201957bfff4e2bc8a38e Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:21:05 +0200 Subject: [PATCH 017/100] Translation update done using Pootle. --- po/el.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/el.po b/po/el.po index bb7def3e58..10563b6071 100644 --- a/po/el.po +++ b/po/el.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 18:20+0200\n" +"PO-Revision-Date: 2011-07-26 18:21+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: greek \n" "Language: el\n" @@ -1281,7 +1281,6 @@ msgid "Set long_query_time to %ds" msgstr "Ορισμός του long_query_time σε %dδ" #: js/messages.php:131 -#, fuzzy #| msgid "" #| "You don't have super user rights to change this variables. Please log in " #| "as root account or contact your database administrator." From 3594b1540f0124dee0c6f2281f07e2373e635ee4 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:21:15 +0200 Subject: [PATCH 018/100] Translation update done using Pootle. --- po/el.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/el.po b/po/el.po index 10563b6071..8f50e37f96 100644 --- a/po/el.po +++ b/po/el.po @@ -1362,10 +1362,9 @@ msgstr "" #. l10n: A collection of available filters #: js/messages.php:151 -#, fuzzy #| msgid "Filter" msgid "Filters" -msgstr "Φίλτρο" +msgstr "Φίλτρα" #. l10n: Filter as in "Start Filtering" #: js/messages.php:153 navigation.php:270 From d451c5ad6099fa7bdfba5a5b624918c3043869bf Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:21:51 +0200 Subject: [PATCH 019/100] Translation update done using Pootle. --- po/el.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/el.po b/po/el.po index 8f50e37f96..b446dae4ab 100644 --- a/po/el.po +++ b/po/el.po @@ -1373,7 +1373,7 @@ msgstr "Φίλτρο" #: js/messages.php:154 msgid "Filter queries by word/regexp:" -msgstr "" +msgstr "Φιλτράρισμα ερωτημάτων ανά λέξη/κανονική έκφραση:" #: js/messages.php:155 msgid "Group queries, ignoring variable data in WHERE statements" From b3e0371a2047aeb99669440f250fd11e8a115300 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:22:47 +0200 Subject: [PATCH 020/100] Translation update done using Pootle. --- po/el.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/el.po b/po/el.po index b446dae4ab..7e42c04175 100644 --- a/po/el.po +++ b/po/el.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 18:21+0200\n" +"PO-Revision-Date: 2011-07-26 18:22+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: greek \n" "Language: el\n" @@ -1378,6 +1378,7 @@ msgstr "Φιλτράρισμα ερωτημάτων ανά λέξη/κανονι #: js/messages.php:155 msgid "Group queries, ignoring variable data in WHERE statements" msgstr "" +"Ομαδοποίηση ερωτημάτων, αγνοώντας τα δεδομένα μεταβλητής στις δηλώσεις WHERE" #: js/messages.php:156 #, fuzzy From a3e9a87953b32646a92b38d06947224bf3f6e973 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:23:22 +0200 Subject: [PATCH 021/100] Translation update done using Pootle. --- po/el.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/el.po b/po/el.po index 7e42c04175..95c334794c 100644 --- a/po/el.po +++ b/po/el.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 18:22+0200\n" +"PO-Revision-Date: 2011-07-26 18:23+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: greek \n" "Language: el\n" @@ -1381,10 +1381,9 @@ msgstr "" "Ομαδοποίηση ερωτημάτων, αγνοώντας τα δεδομένα μεταβλητής στις δηλώσεις WHERE" #: js/messages.php:156 -#, fuzzy #| msgid "Number of inserted rows" msgid "Sum of grouped rows:" -msgstr "Αριθμός εισαχθέντων γραμμών" +msgstr "Άθροισμα ομαδοποιημένων γραμμών" #: js/messages.php:157 #, fuzzy From 8e83232d91db6e724f4dffe3f0fcd7408204a2c3 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:23:32 +0200 Subject: [PATCH 022/100] Translation update done using Pootle. --- po/el.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/el.po b/po/el.po index 95c334794c..a129ca935e 100644 --- a/po/el.po +++ b/po/el.po @@ -1386,10 +1386,9 @@ msgid "Sum of grouped rows:" msgstr "Άθροισμα ομαδοποιημένων γραμμών" #: js/messages.php:157 -#, fuzzy #| msgid "Total" msgid "Total:" -msgstr "Σύνολο" +msgstr "Σύνολο:" #: js/messages.php:161 libraries/tbl_properties.inc.php:780 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545 From 9bbdb20f5d41138f9d4ae524b3542970917fb827 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:23:50 +0200 Subject: [PATCH 023/100] Translation update done using Pootle. --- po/el.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/el.po b/po/el.po index a129ca935e..74bea7a841 100644 --- a/po/el.po +++ b/po/el.po @@ -1526,10 +1526,9 @@ msgid "Change" msgstr "Αλλαγή" #: js/messages.php:208 -#, fuzzy #| msgid "Maximum execution time" msgid "Query execution time" -msgstr "Μέγιστος χρόνος εκτέλεσης" +msgstr "Χρόνος εκτέλεσης ερωτήματος" #: js/messages.php:211 msgid "Hide search criteria" From 4c5e8f43abfc90967f8a5d77eb6744d6eb75cb80 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:24:06 +0200 Subject: [PATCH 024/100] Translation update done using Pootle. --- po/el.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/el.po b/po/el.po index 74bea7a841..4a499c142a 100644 --- a/po/el.po +++ b/po/el.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 18:23+0200\n" +"PO-Revision-Date: 2011-07-26 18:24+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: greek \n" "Language: el\n" @@ -1544,10 +1544,9 @@ msgid "Ignore" msgstr "Παράληψη" #: js/messages.php:218 -#, fuzzy #| msgid "Add column" msgid "Add columns" -msgstr "Προσθήκη στήλης" +msgstr "Προσθήκη στηλών" #: js/messages.php:221 msgid "Select referenced key" From 319c5d7398c436529efbc6e37def4fe42dda338c Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:24:47 +0200 Subject: [PATCH 025/100] Translation update done using Pootle. --- po/el.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/el.po b/po/el.po index 4a499c142a..de94f1f936 100644 --- a/po/el.po +++ b/po/el.po @@ -1863,7 +1863,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 From 1e77fd115db523fecb65dde1a87414102889a11f Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:25:15 +0200 Subject: [PATCH 026/100] Translation update done using Pootle. --- po/el.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/el.po b/po/el.po index de94f1f936..d57c1d1405 100644 --- a/po/el.po +++ b/po/el.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 18:24+0200\n" +"PO-Revision-Date: 2011-07-26 18:25+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: greek \n" "Language: el\n" @@ -1866,10 +1866,9 @@ msgid "File was not an uploaded file." msgstr "Το αρχείο δεν ήταν αρχείο αποστολής." #: libraries/File.class.php:259 libraries/File.class.php:388 -#, fuzzy #| msgid "Unknown error in file upload." msgid "Unknown error while uploading." -msgstr "Άγνωστο σφάλμα στην αποστολή αρχείου." +msgstr "Άγνωστο σφάλμα κατά την αποστολή αρχείου." #: libraries/File.class.php:277 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." From 68ed8271c9d397493cf0461610d5a84e2aaf0888 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:25:50 +0200 Subject: [PATCH 027/100] Translation update done using Pootle. --- po/el.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/el.po b/po/el.po index d57c1d1405..37119ccd76 100644 --- a/po/el.po +++ b/po/el.po @@ -1914,7 +1914,7 @@ 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." From 937bfc9064e8e4da66f23bde3f4f0ddc4b4007a4 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:26:25 +0200 Subject: [PATCH 028/100] Translation update done using Pootle. --- po/el.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/el.po b/po/el.po index 37119ccd76..0aae03a419 100644 --- a/po/el.po +++ b/po/el.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 18:25+0200\n" +"PO-Revision-Date: 2011-07-26 18:26+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: greek \n" "Language: el\n" @@ -1918,7 +1918,7 @@ 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!" From d6ca1f29d4e9c5bc7f392f25f6ddaeb0d6768d39 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:26:53 +0200 Subject: [PATCH 029/100] Translation update done using Pootle. --- po/el.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/el.po b/po/el.po index 0aae03a419..679989ffae 100644 --- a/po/el.po +++ b/po/el.po @@ -2474,10 +2474,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s μέρες, %s ώρες, %s λεπτά %s δευτερόλεπτα" #: libraries/common.lib.php:1856 -#, fuzzy #| msgid "Routine parameters" msgid "Missing parameter:" -msgstr "Παράμετροι ρουτίνας" +msgstr "Απολεσθείσα παράμετρος:" #: libraries/common.lib.php:2162 libraries/common.lib.php:2165 #: libraries/display_tbl.lib.php:299 From e7f918143a6953051671a39e0f7f036a59ee377a Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:28:59 +0200 Subject: [PATCH 030/100] Translation update done using Pootle. --- po/el.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/el.po b/po/el.po index 679989ffae..a1b0d3e5d1 100644 --- a/po/el.po +++ b/po/el.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 18:26+0200\n" +"PO-Revision-Date: 2011-07-26 18:28+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: greek \n" "Language: el\n" @@ -6308,10 +6308,9 @@ msgid "" msgstr "Οι ακόλουθες δομές δημιουργήθηκαν ή αλλάχτηκαν. Εδώ μπορείτε να:" #: libraries/import.lib.php:1069 -#, fuzzy #| msgid "View a structure`s contents by clicking on its name" msgid "View a structure's contents by clicking on its name" -msgstr "Δείτε τα περιεχόμενα δομής πατώντας στο όνομα" +msgstr "Προβολή των περιεχομένων δομής πατώντας στο όνομά της" #: libraries/import.lib.php:1070 msgid "" From 9e177ed3dd45903c09a424fe9111284efdfdaa1f Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:29:37 +0200 Subject: [PATCH 031/100] Translation update done using Pootle. --- po/el.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/el.po b/po/el.po index a1b0d3e5d1..fe020296d3 100644 --- a/po/el.po +++ b/po/el.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 18:28+0200\n" +"PO-Revision-Date: 2011-07-26 18:29+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: greek \n" "Language: el\n" @@ -6318,10 +6318,9 @@ msgid "" msgstr "Αλλάξτε τις ρυθμίσεις πατώντας τον αντίστοιχο σύνδεσμο «Επιλογές»" #: libraries/import.lib.php:1071 -#, fuzzy #| msgid "Edit its structure by following the \"Structure\" link" msgid "Edit structure by following the \"Structure\" link" -msgstr "Επεξεργαστεί τη δομή από τον σύνδεσμο «Δομή»" +msgstr "Επεξεργαστείτε τη δομή πατώντας τον σύνδεσμο «Δομή»" #: libraries/import.lib.php:1074 msgid "Go to database" From c0bca1ed53bd90d19443e38ce2ad33d5ee48c7bf Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:33:27 +0200 Subject: [PATCH 032/100] Translation update done using Pootle. --- po/el.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/po/el.po b/po/el.po index fe020296d3..35766765c7 100644 --- a/po/el.po +++ b/po/el.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 18:29+0200\n" +"PO-Revision-Date: 2011-07-26 18:33+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: greek \n" "Language: el\n" @@ -10031,7 +10031,6 @@ msgid "Monitor Instructions" msgstr "Οδηγίες Εποπτείας" #: server_status.php:1364 -#, fuzzy #| msgid "" #| "The phpMyAdmin Monitor can assist you in optimizing the server " #| "configuration and track down time intensive\n" @@ -10048,8 +10047,11 @@ msgid "" msgstr "" "Η Εποπτεία phpMyAdmin μπορεί να σας βοηθήσει να βελτιστοποιήσετε τη ρύθμιση " "του διακομιστή και να καταγράφει χρονοβόρα\n" -" ερωτήματα. Για το τελευταίο θα χρειαστείτε να ορίσετε το log_output " -"σε «TABLE» και να έχετε ενεργοποιήσει το slow_query_log ή το general_log." +"ερωτήματα. Για το τελευταίο θα χρειαστείτε να ορίσετε το log_output σε " +"«TABLE» και να έχετε ενεργοποιήσει το slow_query_log ή το general_log. " +"Σημειώστε, ωστόσο, ότι το\n" +"general_log παράγει πολλά δεδομένα και αυξάνει τη χρήση πόρων του διακομιστή " +"μέχρι και 15%" #: server_status.php:1373 #, fuzzy From 8ad755ebc29b718bbf40d00452213b5efc2eced6 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:35:31 +0200 Subject: [PATCH 033/100] Translation update done using Pootle. --- po/el.po | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/po/el.po b/po/el.po index 35766765c7..0eeb9a7b29 100644 --- a/po/el.po +++ b/po/el.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 18:33+0200\n" +"PO-Revision-Date: 2011-07-26 18:35+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: greek \n" "Language: el\n" @@ -10054,7 +10054,6 @@ msgstr "" "μέχρι και 15%" #: server_status.php:1373 -#, fuzzy #| msgid "" #| "Using the monitor:
\n" #| " Ok, you are good to go! Once you click 'Start monitor' your " @@ -10098,14 +10097,7 @@ msgstr "" " αριστερό πλήκτρο του ποντικιού και μετακινηθείτε μέσα στο διάγραμμα. " "Αυτό θα φορτώσει τα απαιτούμενα στατιστικά από τις καταγραφές βοηθόντας να " "βρείτε τι προκάλεσε αυτή\n" -" την έντονη δραστηριότητα.

\n" -"

Σημειώστε:\n" -" Ενεργοποιώντας το general_log ίσως αυξήσει τη φόρτωση του διακομιστή " -"μεταξύ 5-15%. Επίσης, έχετε υπόψη ότι η δημιουργία στατιστικών από τις " -"καταγραφές είναι μια \n" -" πολύ απαιτητική σε πόρους εργασία, έτσι σας προτείνουμε να επιλέξετε " -"μια μικρή επέκταση χρόνου.\n" -"

" +" την έντονη δραστηριότητα.

" #: server_status.php:1383 msgid "" From baac8ed6311e1a4d85ed8212680f3c2d1a8dbe46 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:40:11 +0200 Subject: [PATCH 034/100] Translation update done using Pootle. --- po/el.po | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/po/el.po b/po/el.po index 0eeb9a7b29..249226e181 100644 --- a/po/el.po +++ b/po/el.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 18:35+0200\n" +"PO-Revision-Date: 2011-07-26 18:40+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: greek \n" "Language: el\n" @@ -10109,6 +10109,13 @@ msgid "" "not required any more.\n" " " msgstr "" +"Σημειώστε:\n" +" Η ενεργοποίηση του general_log μπορεί να αυξήσει τη χρήση των πόρων " +"του συστήματος κατά 5-15%. Επίσης, λάβετε υπόψη ότι η δημιουργία στατιστικών " +"από τις καταγραφές είναι μια εργασία που απαιτεί έντονη χρήση πόρων, για " +"αυτό σας προτείνεται να χρησιμοποιήσετε μικρό χρονικό όριο και να " +"απενεργοποιήσετε το general_log και να αδειάσετε τον πίνακά του μόλις η " +"εποπτεία δεν είναι πλέον απαραίτητη. " #: server_status.php:1396 msgid "CPU Usage" From ab27efc90c1c5042e55b173aadb90a20300a32e4 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:40:48 +0200 Subject: [PATCH 035/100] Translation update done using Pootle. --- po/el.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/el.po b/po/el.po index 249226e181..1bc65821dd 100644 --- a/po/el.po +++ b/po/el.po @@ -10183,7 +10183,7 @@ msgstr "Επιλεγμένο εύρος χρόνου:" #: server_status.php:1465 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements" -msgstr "" +msgstr "Λήψη μόνο των δηλώσεων SELECT,INSERT,UPDATE και DELETE" #: server_status.php:1470 msgid "Remove variable data in INSERT statements for better grouping" From d5b81d421519afaf8586a58835fd46a4de8a965f Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:41:27 +0200 Subject: [PATCH 036/100] Translation update done using Pootle. --- po/el.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/el.po b/po/el.po index 1bc65821dd..3dfd0bc4b2 100644 --- a/po/el.po +++ b/po/el.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 18:40+0200\n" +"PO-Revision-Date: 2011-07-26 18:41+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: greek \n" "Language: el\n" @@ -10188,6 +10188,8 @@ msgstr "Λήψη μόνο των δηλώσεων SELECT,INSERT,UPDATE και DE #: server_status.php:1470 msgid "Remove variable data in INSERT statements for better grouping" msgstr "" +"Απομάκρυνση δεδομένων μεταβλητών στις δηλώσεις INSERT για καλύτερη " +"ομαδοποιήση" #: server_status.php:1473 msgid "" From b5f7fcd7108974550ba48ddc3ef650bba6567c78 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 26 Jul 2011 18:41:36 +0200 Subject: [PATCH 037/100] Translation update done using Pootle. --- po/el.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/el.po b/po/el.po index 3dfd0bc4b2..ca875f06c5 100644 --- a/po/el.po +++ b/po/el.po @@ -10200,10 +10200,9 @@ msgstr "" "αποτελέσματα ομοδοποιούνται ανά κείμενο ερωτήματος." #: server_status.php:1476 -#, fuzzy #| msgid "Query type" msgid "Query analyzer" -msgstr "Τύπος ερωτήματος" +msgstr "Αναλυτής ερωτήματος" #: server_status.php:1512 #, php-format From f774184a8f5ba3a1ed2995099a940c48c25a90eb Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 27 Jul 2011 11:21:02 +0200 Subject: [PATCH 038/100] 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 ae1d1b6174..2922fe47c7 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-26 12:39+0200\n" +"PO-Revision-Date: 2011-07-27 11:21+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -6926,7 +6926,7 @@ msgstr "ルーチンタイプが不正です: \"%s\"" #: libraries/rte/rte_routines.lib.php:268 msgid "Sorry, we failed to restore the dropped routine." -msgstr "" +msgstr "申し訳ありませんが、削除されたルーチンの復元に失敗しました。" #: libraries/rte/rte_routines.lib.php:273 #, php-format From 2bce171ea2fe8a52155bf64a16b41a477150996f Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 27 Jul 2011 11:21:26 +0200 Subject: [PATCH 039/100] Translation update done using Pootle. --- po/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja.po b/po/ja.po index 2922fe47c7..8d90cd4e19 100644 --- a/po/ja.po +++ b/po/ja.po @@ -7052,7 +7052,7 @@ msgstr "関数" #: libraries/rte/rte_triggers.lib.php:89 msgid "Sorry, we failed to restore the dropped trigger." -msgstr "" +msgstr "申し訳ありませんが、削除されたトリガの復元に失敗しました。" #: libraries/rte/rte_triggers.lib.php:94 #, php-format From 88fdf41cd340d07949626ee4621e36862e1a335d Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 27 Jul 2011 11:24:27 +0200 Subject: [PATCH 040/100] Translation update done using Pootle. --- po/ja.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 8d90cd4e19..9778f5f172 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 11:21+0200\n" +"PO-Revision-Date: 2011-07-27 11:24+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -9068,10 +9068,10 @@ msgid "Network traffic since startup: %s" msgstr "起動以後のネットワークトラフィック：%s" #: server_status.php:852 -#, fuzzy, php-format +#, php-format #| msgid "This MySQL server has been running for %s. It started up on %s." msgid "This MySQL server has been running for %1$s. It started up on %2$s." -msgstr "この MySQL サーバの稼働時間: %s (起動時刻: %s)" +msgstr "この MySQL サーバの稼働時間: %1$s (起動時刻: %2$s)" #: server_status.php:862 msgid "" From 062a48731abbf1d2afaf6170d6fa36503213e75b Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 27 Jul 2011 11:45:41 +0200 Subject: [PATCH 041/100] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 9778f5f172..04806875f4 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 11:24+0200\n" +"PO-Revision-Date: 2011-07-27 11:45+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1157,10 +1157,9 @@ msgstr "平均負荷" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:102 -#, fuzzy #| msgid "Suggestions:" msgid "Questions" -msgstr "提案：" +msgstr "問い合わせ" #: js/messages.php:103 server_status.php:894 msgid "Traffic" From 5e65960866a352ddc427ac7829ce0af1095a4103 Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 27 Jul 2011 11:53:45 +0200 Subject: [PATCH 042/100] 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 04806875f4..6638a2baed 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 11:45+0200\n" +"PO-Revision-Date: 2011-07-27 11:53+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -10854,7 +10854,7 @@ msgstr "カラムを選択してください (最低 1 つ)" #: tbl_select.php:278 msgid "Add search conditions (body of the \"where\" clause):" -msgstr "または 検索条件 (WHERE 節の内容) を追加してください" +msgstr "検索条件 (WHERE 節の内容) を追加してください" #: tbl_select.php:285 msgid "Number of rows per page" From 19fd3cca5c810cc56251acf1871efe58fc0793bf Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 27 Jul 2011 11:59:39 +0200 Subject: [PATCH 043/100] 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 6638a2baed..d94e9aa498 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 11:53+0200\n" +"PO-Revision-Date: 2011-07-27 11:59+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1275,7 +1275,7 @@ msgstr "" msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." -msgstr "" +msgstr "これらの変数を変更することはできません。root でログインするか、データベース管理者に連絡してください。" #: js/messages.php:132 #| msgid "Manage your settings" From 3858a22196e87c217603a1b1589a570f7eb2eeda Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 27 Jul 2011 12:12:46 +0200 Subject: [PATCH 044/100] Translation update done using Pootle. --- po/ja.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index d94e9aa498..30851e2c75 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 11:59+0200\n" +"PO-Revision-Date: 2011-07-27 12:12+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1852,10 +1852,9 @@ msgid "File was not an uploaded file." msgstr "" #: libraries/File.class.php:259 libraries/File.class.php:388 -#, fuzzy #| msgid "Unknown error in file upload." msgid "Unknown error while uploading." -msgstr "ファイルのアップロード中に予期しないエラーが発生しました。" +msgstr "アップロード中に予期しないエラーが発生しました。" #: libraries/File.class.php:277 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." From f5088c52e6fa8b260c0272e99f45c4f6b792985e Mon Sep 17 00:00:00 2001 From: Yuichiro Date: Wed, 27 Jul 2011 12:14:38 +0200 Subject: [PATCH 045/100] 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 30851e2c75..c38e202a70 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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 12:12+0200\n" +"PO-Revision-Date: 2011-07-27 12:14+0200\n" "Last-Translator: Yuichiro \n" "Language-Team: japanese \n" "Language: ja\n" @@ -1849,7 +1849,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 #| msgid "Unknown error in file upload." From a5c3a09b957fbcb2ee8748202a29a1c5577c3500 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 14:44:20 +0200 Subject: [PATCH 046/100] Translation update done using Pootle. --- po/sk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sk.po b/po/sk.po index 99677c066a..d483c23199 100644 --- a/po/sk.po +++ b/po/sk.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-14 15:30+0200\n" +"PO-Revision-Date: 2011-07-27 14:44+0200\n" "Last-Translator: Martin Lacina \n" "Language-Team: slovak \n" "Language: sk\n" @@ -1131,7 +1131,7 @@ msgstr "Spojení od posledného obnovenia" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:89 msgid "Questions (executed statements by the server)" -msgstr "" +msgstr "Dopyty (príkazy vykonané na serveri)" #: js/messages.php:91 server_status.php:617 msgid "Query statistics" From 9db269a164e8043bb858306e73d6bb63320399ad Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 14:44:57 +0200 Subject: [PATCH 047/100] Translation update done using Pootle. --- po/sk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sk.po b/po/sk.po index d483c23199..aa4622787f 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1139,7 +1139,7 @@ msgstr "Štatistika dopytov" #: js/messages.php:94 msgid "System CPU Usage" -msgstr "" +msgstr "Využitie CPU" #: js/messages.php:95 msgid "System memory" From 5ca5fb8a38d3e953fc22865c2f97bfdbded8fb71 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 14:45:10 +0200 Subject: [PATCH 048/100] Translation update done using Pootle. --- po/sk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sk.po b/po/sk.po index aa4622787f..c8a10f1ae5 100644 --- a/po/sk.po +++ b/po/sk.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 14:44+0200\n" +"PO-Revision-Date: 2011-07-27 14:45+0200\n" "Last-Translator: Martin Lacina \n" "Language-Team: slovak \n" "Language: sk\n" @@ -1143,7 +1143,7 @@ msgstr "Využitie CPU" #: js/messages.php:95 msgid "System memory" -msgstr "" +msgstr "Systémová pamäť" #: js/messages.php:96 msgid "System swap" From 8ade28f0299999237d4bcc3f35656fb788717e68 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 14:46:35 +0200 Subject: [PATCH 049/100] Translation update done using Pootle. --- po/sk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sk.po b/po/sk.po index c8a10f1ae5..3dc5614a28 100644 --- a/po/sk.po +++ b/po/sk.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 14:45+0200\n" +"PO-Revision-Date: 2011-07-27 14:46+0200\n" "Last-Translator: Martin Lacina \n" "Language-Team: slovak \n" "Language: sk\n" @@ -1147,7 +1147,7 @@ msgstr "Systémová pamäť" #: js/messages.php:96 msgid "System swap" -msgstr "" +msgstr "Stránkovacia oblasť" #: js/messages.php:97 libraries/common.lib.php:1274 server_status.php:1433 msgid "MiB" From 52ffb4d5235673213aa676a9c4633ebe5b325bac Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 14:46:47 +0200 Subject: [PATCH 050/100] Translation update done using Pootle. --- po/sk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sk.po b/po/sk.po index 3dc5614a28..f99bd7944c 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1159,7 +1159,7 @@ msgstr "KiB" #: js/messages.php:100 msgid "Average load" -msgstr "" +msgstr "Priemerné vyťaženie" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:102 From 68da99bdf27887dabb60b5f3a85338943c768a9a Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 14:47:13 +0200 Subject: [PATCH 051/100] Translation update done using Pootle. --- po/sk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sk.po b/po/sk.po index f99bd7944c..1cd8eb0511 100644 --- a/po/sk.po +++ b/po/sk.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 14:46+0200\n" +"PO-Revision-Date: 2011-07-27 14:47+0200\n" "Last-Translator: Martin Lacina \n" "Language-Team: slovak \n" "Language: sk\n" @@ -1185,7 +1185,7 @@ msgstr "Odstrániť databázu" #: js/messages.php:106 msgid "Edit labels and series" -msgstr "" +msgstr "Upraviť popisy a série" #: js/messages.php:107 msgid "Add chart to grid" From de3656a488b628af7448422d14c41cf529235c12 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 14:47:27 +0200 Subject: [PATCH 052/100] Translation update done using Pootle. --- po/sk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sk.po b/po/sk.po index 1cd8eb0511..283371661a 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1189,7 +1189,7 @@ msgstr "Upraviť popisy a série" #: js/messages.php:107 msgid "Add chart to grid" -msgstr "" +msgstr "Pridať graf do mriežky" #: js/messages.php:109 msgid "Please add at least one variable to the series" From 9ddcd5bfa4dbb0dd4b535f437cf9617909213964 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 14:47:43 +0200 Subject: [PATCH 053/100] Translation update done using Pootle. --- po/sk.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/sk.po b/po/sk.po index 283371661a..3f65a5ac62 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1178,10 +1178,9 @@ msgid "Settings" msgstr "Nastavenia" #: js/messages.php:105 -#, fuzzy #| msgid "Remove database" msgid "Remove chart" -msgstr "Odstrániť databázu" +msgstr "Odstrániť graf" #: js/messages.php:106 msgid "Edit labels and series" From 756a11261b561dffbcd4ec7c5d7df35b2cc5c7b1 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 14:47:54 +0200 Subject: [PATCH 054/100] Translation update done using Pootle. --- po/sk.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/sk.po b/po/sk.po index 3f65a5ac62..fd36ca683d 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1163,10 +1163,9 @@ msgstr "Priemerné vyťaženie" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:102 -#, fuzzy #| msgid "Versions" msgid "Questions" -msgstr "Verzia" +msgstr "Dopyty" #: js/messages.php:103 server_status.php:894 msgid "Traffic" From 244744cfd947fd299dfe97606d256bb7b3214960 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 14:49:07 +0200 Subject: [PATCH 055/100] Translation update done using Pootle. --- po/sk.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/sk.po b/po/sk.po index fd36ca683d..98dad825e5 100644 --- a/po/sk.po +++ b/po/sk.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 14:47+0200\n" +"PO-Revision-Date: 2011-07-27 14:49+0200\n" "Last-Translator: Martin Lacina \n" "Language-Team: slovak \n" "Language: sk\n" @@ -5303,10 +5303,9 @@ msgid "%d is not valid row number." msgstr "%d nie je platné číslo riadku." #: libraries/display_tbl.lib.php:433 -#, fuzzy #| msgid "Start" msgid "Start row" -msgstr "Štart" +msgstr "Prvý riadok" #: libraries/display_tbl.lib.php:435 msgid "Number of rows" From a08b2bb69de6e46e11d541c62c03f8f0b51f8d67 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 14:49:15 +0200 Subject: [PATCH 056/100] Translation update done using Pootle. --- po/sk.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/sk.po b/po/sk.po index 98dad825e5..24d775eea0 100644 --- a/po/sk.po +++ b/po/sk.po @@ -5312,10 +5312,9 @@ msgid "Number of rows" msgstr "Počet riadkov" #: libraries/display_tbl.lib.php:440 -#, fuzzy #| msgid "More" msgid "Mode" -msgstr "Viac" +msgstr "Režim" #: libraries/display_tbl.lib.php:442 msgid "horizontal" From 5ea775d7e395485cce8700e7877d6b566cc2e549 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 14:49:26 +0200 Subject: [PATCH 057/100] Translation update done using Pootle. --- po/sk.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/sk.po b/po/sk.po index 24d775eea0..a4792e1ead 100644 --- a/po/sk.po +++ b/po/sk.po @@ -5444,9 +5444,8 @@ msgid "Visualize GIS data" msgstr "Zobraziť GIS data" #: libraries/display_tbl.lib.php:2526 -#, fuzzy msgid "Create view" -msgstr "Vytvoriť relaciu" +msgstr "Vytvoriť pohľad" #: libraries/display_tbl.lib.php:2626 msgid "Link not found" From 7cd34b1d2280cc4738e3475b55d2e45f774fcda5 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 14:50:04 +0200 Subject: [PATCH 058/100] Translation update done using Pootle. --- po/sk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sk.po b/po/sk.po index a4792e1ead..b5e62c09b7 100644 --- a/po/sk.po +++ b/po/sk.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 14:49+0200\n" +"PO-Revision-Date: 2011-07-27 14:50+0200\n" "Last-Translator: Martin Lacina \n" "Language-Team: slovak \n" "Language: sk\n" @@ -5699,7 +5699,7 @@ msgstr "" #: libraries/engines/pbms.lib.php:60 msgid "Metadata Headers" -msgstr "" +msgstr "Hlavičky metadát" #: libraries/engines/pbms.lib.php:61 msgid "" From cb946e6529fe1f0dc27bcc823ee525809928078a Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 14:50:40 +0200 Subject: [PATCH 059/100] Translation update done using Pootle. --- po/sk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sk.po b/po/sk.po index b5e62c09b7..52d43bbe41 100644 --- a/po/sk.po +++ b/po/sk.po @@ -5728,7 +5728,7 @@ msgstr "" #: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" -msgstr "" +msgstr "Veľkosť vyrovnávacej pamäte indexu" #: libraries/engines/pbxt.lib.php:23 msgid "" From 8d315ac362f1d29fb38725ab68cf57b3130cfa07 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 14:52:22 +0200 Subject: [PATCH 060/100] Translation update done using Pootle. --- po/sk.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/sk.po b/po/sk.po index 52d43bbe41..0d8a4c0cae 100644 --- a/po/sk.po +++ b/po/sk.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 14:50+0200\n" +"PO-Revision-Date: 2011-07-27 14:52+0200\n" "Last-Translator: Martin Lacina \n" "Language-Team: slovak \n" "Language: sk\n" @@ -5735,6 +5735,9 @@ msgid "" "This is the amount of memory allocated to the index cache. Default value is " "32MB. The memory allocated here is used only for caching index pages." msgstr "" +"Množstvo pamäte vyhradenej pre vyrovnávaciu pamät indexu. Štandardná hodnota " +"je 32MB. Pamät tu priradená je použitá výhradne pre vyrovnávaciu pamäť " +"indexových stránok." #: libraries/engines/pbxt.lib.php:27 msgid "Record cache size" From 1d765356a8cb86180d8a776433f9ffb169fefedc Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 14:52:54 +0200 Subject: [PATCH 061/100] Translation update done using Pootle. --- po/sk.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/sk.po b/po/sk.po index 0d8a4c0cae..60e40e3b18 100644 --- a/po/sk.po +++ b/po/sk.po @@ -5769,6 +5769,8 @@ msgid "" "The size of a transaction log before rollover, and a new log is created. The " "default value is 16MB." msgstr "" +"Maximálna veľkosť transakčného logu pred jeho pretočením a vytvorením " +"nového. Štandardná hodnota je 16MB." #: libraries/engines/pbxt.lib.php:42 msgid "Transaction buffer size" From 2264fcd19981931b4e709aecbaab56f8bc394fc2 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 15:30:40 +0200 Subject: [PATCH 062/100] Translation update done using Pootle. --- po/sk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sk.po b/po/sk.po index 60e40e3b18..1907b7ca3b 100644 --- a/po/sk.po +++ b/po/sk.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 14:52+0200\n" +"PO-Revision-Date: 2011-07-27 15:30+0200\n" "Last-Translator: Martin Lacina \n" "Language-Team: slovak \n" "Language: sk\n" @@ -1191,7 +1191,7 @@ msgstr "Pridať graf do mriežky" #: js/messages.php:109 msgid "Please add at least one variable to the series" -msgstr "" +msgstr "Pridajte prosím aspoň jednu hodnotu do série" #: js/messages.php:110 libraries/display_export.lib.php:306 #: libraries/display_tbl.lib.php:561 libraries/export/sql.php:1052 From 800a36c30cc48865eaad1d3949b7748f6f5d8443 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 15:31:16 +0200 Subject: [PATCH 063/100] Translation update done using Pootle. --- po/sk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sk.po b/po/sk.po index 1907b7ca3b..5398816faf 100644 --- a/po/sk.po +++ b/po/sk.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 15:30+0200\n" +"PO-Revision-Date: 2011-07-27 15:31+0200\n" "Last-Translator: Martin Lacina \n" "Language-Team: slovak \n" "Language: sk\n" @@ -1210,7 +1210,7 @@ msgstr "" #: js/messages.php:114 msgid "general_log and slow_query_log are enabled." -msgstr "" +msgstr "general_log a slow_query_log sú povolené." #: js/messages.php:115 msgid "general_log is enabled." From 6de769540f0a0db170b9b4183190e90a89909914 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 15:31:38 +0200 Subject: [PATCH 064/100] Translation update done using Pootle. --- po/sk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sk.po b/po/sk.po index 5398816faf..57c0e140e0 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1214,7 +1214,7 @@ msgstr "general_log a slow_query_log sú povolené." #: js/messages.php:115 msgid "general_log is enabled." -msgstr "" +msgstr "general_log je povolený." #: js/messages.php:116 msgid "slow_query_log is enabled." From b6c256b70e3de9d0f163ed7a21c1ef1f3d647897 Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 15:31:49 +0200 Subject: [PATCH 065/100] Translation update done using Pootle. --- po/sk.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/sk.po b/po/sk.po index 57c0e140e0..e9fb3ea867 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1218,7 +1218,7 @@ msgstr "general_log je povolený." #: js/messages.php:116 msgid "slow_query_log is enabled." -msgstr "" +msgstr "slow_query_log je povolený." #: js/messages.php:117 msgid "slow_query_log and general_log are disabled." From 11dae68730b6b00d0fbda07ee75605ccbdd56edc Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Wed, 27 Jul 2011 15:32:07 +0200 Subject: [PATCH 066/100] Translation update done using Pootle. --- po/sk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/sk.po b/po/sk.po index e9fb3ea867..caf7e4e5d4 100644 --- a/po/sk.po +++ b/po/sk.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 15:31+0200\n" +"PO-Revision-Date: 2011-07-27 15:32+0200\n" "Last-Translator: Martin Lacina \n" "Language-Team: slovak \n" "Language: sk\n" @@ -1222,7 +1222,7 @@ msgstr "slow_query_log je povolený." #: js/messages.php:117 msgid "slow_query_log and general_log are disabled." -msgstr "" +msgstr "slow_query_log a general_log sú zakázané." #: js/messages.php:118 msgid "log_output is not set to TABLE." From f45c4292c1eccbb10569e78219b2bb32eb139852 Mon Sep 17 00:00:00 2001 From: Thilanka Kaushalya Date: Wed, 27 Jul 2011 19:56:23 +0530 Subject: [PATCH 067/100] included tbl change.js file to the tbl select.php file --- tbl_select.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tbl_select.php b/tbl_select.php index 52e8b93fb1..c6b0a35332 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -19,6 +19,7 @@ require_once './libraries/mysql_charsets.lib.php'; $GLOBALS['js_include'][] = 'makegrid.js'; $GLOBALS['js_include'][] = 'sql.js'; $GLOBALS['js_include'][] = 'tbl_select.js'; +$GLOBALS['js_include'][] = 'tbl_change.js'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; $GLOBALS['js_include'][] = 'jquery/timepicker.js'; if ($GLOBALS['cfg']['PropertiesIconic'] == true) { From b590279dd2e69ac225e95045f38fe82cc4ff7e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:38:31 +0200 Subject: [PATCH 068/100] Translation update done using Pootle. --- po/es.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index c12474488f..98f28df437 100644 --- a/po/es.po +++ b/po/es.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-19 22:29+0200\n" +"PO-Revision-Date: 2011-07-27 16:38+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -1212,10 +1212,9 @@ msgid "Pause monitor" msgstr "Pausar monitorización" #: js/messages.php:114 -#, fuzzy #| msgid "general_log and slow_query_log is enabled." msgid "general_log and slow_query_log are enabled." -msgstr "«general_log» y «slow_query_log» activos." +msgstr "«general_log» y «slow_query_log» están activos." #: js/messages.php:115 msgid "general_log is enabled." From ac617a75219315235a3de2e976392c82b6e73cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:38:39 +0200 Subject: [PATCH 069/100] Translation update done using Pootle. --- po/es.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/es.po b/po/es.po index 98f28df437..f09b9649c7 100644 --- a/po/es.po +++ b/po/es.po @@ -1225,7 +1225,6 @@ msgid "slow_query_log is enabled." msgstr "«slow_query_log» activo." #: js/messages.php:117 -#, fuzzy #| msgid "slow_query_log and general_log is disabled." msgid "slow_query_log and general_log are disabled." msgstr "«slow_query_log» y «general_log» desactivados." From 676eb481216e88f310e15d2d6b1a7d57dad9f3f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:38:47 +0200 Subject: [PATCH 070/100] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index f09b9649c7..79a1a542d9 100644 --- a/po/es.po +++ b/po/es.po @@ -1214,7 +1214,7 @@ msgstr "Pausar monitorización" #: js/messages.php:114 #| msgid "general_log and slow_query_log is enabled." msgid "general_log and slow_query_log are enabled." -msgstr "«general_log» y «slow_query_log» están activos." +msgstr "«general_log» y «slow_query_log» activos." #: js/messages.php:115 msgid "general_log is enabled." From 6f9f7267bb95c96359ed5507786ee043d4c8f4b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:39:07 +0200 Subject: [PATCH 071/100] Translation update done using Pootle. --- po/es.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/es.po b/po/es.po index 79a1a542d9..3df6aaa16d 100644 --- a/po/es.po +++ b/po/es.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 16:38+0200\n" +"PO-Revision-Date: 2011-07-27 16:39+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -1286,7 +1286,6 @@ msgid "Set long_query_time to %ds" msgstr "Definir «long_query_time» a %ds" #: js/messages.php:131 -#, fuzzy #| msgid "" #| "You don't have super user rights to change this variables. Please log in " #| "as root account or contact your database administrator." @@ -1294,9 +1293,8 @@ msgid "" "You can't change these variables. Please log in as root or contact your " "database administrator." msgstr "" -"No posee permisos de superusuario para cambiar estas variables. Por favor " -"inicie sesión con la cuenta root o contacte a su administrador de base de " -"datos." +"No posee permisos para cambiar estas variables. Por favor inicie sesión con " +"la cuenta root o contacte a su administrador de base de datos." #: js/messages.php:132 msgid "Change settings" From 162158d93cdefc8c917c3d8aef0e767653e920ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:39:14 +0200 Subject: [PATCH 072/100] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 3df6aaa16d..ffbe11f6fb 100644 --- a/po/es.po +++ b/po/es.po @@ -1366,10 +1366,9 @@ msgstr "" #. l10n: A collection of available filters #: js/messages.php:151 -#, fuzzy #| msgid "Filter" msgid "Filters" -msgstr "Filtrar" +msgstr "Filtros" #. l10n: Filter as in "Start Filtering" #: js/messages.php:153 navigation.php:270 From 79098ab5f58a187d2643972cb449c434c6975837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:39:33 +0200 Subject: [PATCH 073/100] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index ffbe11f6fb..3977885b2d 100644 --- a/po/es.po +++ b/po/es.po @@ -1377,7 +1377,7 @@ msgstr "Filtrar" #: js/messages.php:154 msgid "Filter queries by word/regexp:" -msgstr "" +msgstr "Filtrar consultas por palabra/expresión regular:" #: js/messages.php:155 msgid "Group queries, ignoring variable data in WHERE statements" From c8b37d803e119e8aa121206d0f2f8d6f7d651cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:39:56 +0200 Subject: [PATCH 074/100] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 3977885b2d..35f49f36a7 100644 --- a/po/es.po +++ b/po/es.po @@ -1381,7 +1381,7 @@ msgstr "Filtrar consultas por palabra/expresión regular:" #: js/messages.php:155 msgid "Group queries, ignoring variable data in WHERE statements" -msgstr "" +msgstr "Agrupar consultas, ignorando datos variables en sentencias WHERE" #: js/messages.php:156 #, fuzzy From faf1d05478398134d3260a79828bcd7aecf57699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:40:29 +0200 Subject: [PATCH 075/100] Translation update done using Pootle. --- po/es.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index 35f49f36a7..d550e30b87 100644 --- a/po/es.po +++ b/po/es.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 16:39+0200\n" +"PO-Revision-Date: 2011-07-27 16:40+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -1384,10 +1384,9 @@ msgid "Group queries, ignoring variable data in WHERE statements" msgstr "Agrupar consultas, ignorando datos variables en sentencias WHERE" #: js/messages.php:156 -#, fuzzy #| msgid "Number of inserted rows" msgid "Sum of grouped rows:" -msgstr "Número de filas insertadas" +msgstr "Suma de filas agrupadas:" #: js/messages.php:157 #, fuzzy From 8b099a032c9e9a2190ec5a8ade772fc54d43d4a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:47:30 +0200 Subject: [PATCH 076/100] Translation update done using Pootle. --- po/es.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index d550e30b87..8f2028d3d3 100644 --- a/po/es.po +++ b/po/es.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 16:40+0200\n" +"PO-Revision-Date: 2011-07-27 16:47+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -1389,10 +1389,9 @@ msgid "Sum of grouped rows:" msgstr "Suma de filas agrupadas:" #: js/messages.php:157 -#, fuzzy #| msgid "Total" msgid "Total:" -msgstr "Total" +msgstr "Total:" #: js/messages.php:161 libraries/tbl_properties.inc.php:780 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545 From 4acfb4ef1e3b1c48b7041084e2fe7baf312694f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:47:42 +0200 Subject: [PATCH 077/100] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 8f2028d3d3..832504ef69 100644 --- a/po/es.po +++ b/po/es.po @@ -1530,10 +1530,9 @@ msgid "Change" msgstr "Cambiar" #: js/messages.php:208 -#, fuzzy #| msgid "Maximum execution time" msgid "Query execution time" -msgstr "Tiempo máximo de ejecución" +msgstr "Tiempo de ejecución de la consulta" #: js/messages.php:211 msgid "Hide search criteria" From 2f0b9b89345f93c1d4fa0b7686e3c1fd798262d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:47:52 +0200 Subject: [PATCH 078/100] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 832504ef69..4dab782d32 100644 --- a/po/es.po +++ b/po/es.po @@ -1548,10 +1548,9 @@ msgid "Ignore" msgstr "Ignorar" #: js/messages.php:218 -#, fuzzy #| msgid "Add column" msgid "Add columns" -msgstr "Añadir columna" +msgstr "Agregar columnas" #: js/messages.php:221 msgid "Select referenced key" From 906a4247ce7c3f40d758c6f47d4641fae8ca7a20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:48:09 +0200 Subject: [PATCH 079/100] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 4dab782d32..2c34505e91 100644 --- a/po/es.po +++ b/po/es.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 16:47+0200\n" +"PO-Revision-Date: 2011-07-27 16:48+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -1867,7 +1867,7 @@ msgstr "Tamaño de fuente" #: libraries/File.class.php:220 msgid "File was not an uploaded file." -msgstr "" +msgstr "El archivo no era un archivo subido." #: libraries/File.class.php:259 libraries/File.class.php:388 #, fuzzy From 5b41f8a4b63f32369e8daed96021098e7fdaa856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:48:25 +0200 Subject: [PATCH 080/100] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 2c34505e91..d7840d8784 100644 --- a/po/es.po +++ b/po/es.po @@ -1870,10 +1870,9 @@ msgid "File was not an uploaded file." msgstr "El archivo no era un archivo subido." #: libraries/File.class.php:259 libraries/File.class.php:388 -#, fuzzy #| msgid "Unknown error in file upload." msgid "Unknown error while uploading." -msgstr "Error desconocido al subir el archivo." +msgstr "Error desconocido durante subida." #: libraries/File.class.php:277 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." From 895327632af4486b9e8fc73f4a93b3e789a667b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:48:36 +0200 Subject: [PATCH 081/100] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index d7840d8784..d3b3ee387b 100644 --- a/po/es.po +++ b/po/es.po @@ -1918,7 +1918,7 @@ msgstr "" #: libraries/File.class.php:507 msgid "Error while moving uploaded file." -msgstr "" +msgstr "Error al mover el archivo subido." #: libraries/File.class.php:515 msgid "Cannot read (moved) upload file." From c13df8288304762d428e9f70fe2d467257185fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:48:53 +0200 Subject: [PATCH 082/100] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index d3b3ee387b..d6be06cacb 100644 --- a/po/es.po +++ b/po/es.po @@ -1922,7 +1922,7 @@ msgstr "Error al mover el archivo subido." #: libraries/File.class.php:515 msgid "Cannot read (moved) upload file." -msgstr "" +msgstr "No se puede leer el archivo subido (y movido)." #: libraries/Index.class.php:418 tbl_relation.php:526 msgid "No index defined!" From d6675263e8dae7190e867b793a544384746f9ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:49:06 +0200 Subject: [PATCH 083/100] Translation update done using Pootle. --- po/es.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index d6be06cacb..2661f7217b 100644 --- a/po/es.po +++ b/po/es.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 16:48+0200\n" +"PO-Revision-Date: 2011-07-27 16:49+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -2480,10 +2480,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds" msgstr "%s días, %s horas, %s minutos y %s segundos" #: libraries/common.lib.php:1856 -#, fuzzy #| msgid "Routine parameters" msgid "Missing parameter:" -msgstr "Parámetros de rutina" +msgstr "Parámetro faltante:" #: libraries/common.lib.php:2162 libraries/common.lib.php:2165 #: libraries/display_tbl.lib.php:299 From 33e7382650ae89dea8560ac13cf7c15de5835ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:49:25 +0200 Subject: [PATCH 084/100] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 2661f7217b..440b2472cd 100644 --- a/po/es.po +++ b/po/es.po @@ -6338,10 +6338,9 @@ msgid "" msgstr "Las siguientes estructureas fueron creadas o alteradas. Puedes:" #: libraries/import.lib.php:1069 -#, fuzzy #| msgid "View a structure`s contents by clicking on its name" msgid "View a structure's contents by clicking on its name" -msgstr "Ver los contenidos de una estructura pulsando en su nombre" +msgstr "Puede ver los contenidos de una estructura pulsando en su nombre" #: libraries/import.lib.php:1070 msgid "" From e8c2cb5aa760aa0e4a4555bd47a80dd0bb6b3dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:49:38 +0200 Subject: [PATCH 085/100] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 440b2472cd..42249b94d7 100644 --- a/po/es.po +++ b/po/es.po @@ -6350,10 +6350,9 @@ msgstr "" "correspondiente" #: libraries/import.lib.php:1071 -#, fuzzy #| msgid "Edit its structure by following the \"Structure\" link" msgid "Edit structure by following the \"Structure\" link" -msgstr "Edite su estructura siguiendo el enlace \"Estructura\"" +msgstr "Edite la estructura siguiendo el enlace \"Estructura\"" #: libraries/import.lib.php:1074 msgid "Go to database" From dd76c5b5a69fc9dee5dc445c4c2aa85a1f19f4f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:50:44 +0200 Subject: [PATCH 086/100] Translation update done using Pootle. --- po/es.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/po/es.po b/po/es.po index 42249b94d7..3430f20ca8 100644 --- a/po/es.po +++ b/po/es.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 16:49+0200\n" +"PO-Revision-Date: 2011-07-27 16:50+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -10066,7 +10066,6 @@ msgid "Monitor Instructions" msgstr "Instrucciones de monitorización" #: server_status.php:1364 -#, fuzzy #| msgid "" #| "The phpMyAdmin Monitor can assist you in optimizing the server " #| "configuration and track down time intensive\n" @@ -10083,8 +10082,10 @@ msgid "" msgstr "" "El monitorizador de phpMyAdmin puede asistir en la optimización de la " "configuración del servidor y rastrear consultas que toman mucho tiempo. Para " -"esto último va a necesitar que «log_output» esté definido como 'TABLE' y " -"tener activado «slow_query_log» o «general_log»." +"esto último necesitará que «log_output» esté definido como 'TABLE' y tener " +"activado «slow_query_log» o «general_log». Note, sin embargo, que " +"«general_log» produce mucha información y aumenta la carga en el servidor " +"hasta en un 15%" #: server_status.php:1373 #, fuzzy From 6d5408ea535c9d4c5538f174c468e928108649fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:52:30 +0200 Subject: [PATCH 087/100] Translation update done using Pootle. --- po/es.po | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/po/es.po b/po/es.po index 3430f20ca8..c789e43baa 100644 --- a/po/es.po +++ b/po/es.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 16:50+0200\n" +"PO-Revision-Date: 2011-07-27 16:52+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -10088,7 +10088,6 @@ msgstr "" "hasta en un 15%" #: server_status.php:1373 -#, fuzzy #| msgid "" #| "Using the monitor:
\n" #| " Ok, you are good to go! Once you click 'Start monitor' your " @@ -10129,14 +10128,7 @@ msgstr "" "

Cuando vea un pico repentino de actividad, seleccione el intervalo de " "tiempo relevante en el gráfico manteniendo pulsado el botón izquierdo y " "arrastrando sobre el gráfico. Esto cargará las estadísticas de los " -"registros, lo que lo ayudará a encontrar la causa del pico de actividad.\n" -"

Notar que:\n" -"Activar «general_log» puede aumentar la carga en el servidor hast un 5-15%. " -"También esté al tanto que generar estadísticas de los registros es una tarea " -"muy intensiva por lo que se recomienda seleccionar un período de tiempo lo " -"más pequeño posible.\n" -"

" +"registros, lo que lo ayudará a encontrar la causa del pico de actividad.

" #: server_status.php:1383 msgid "" From efaae7001e06d64923e4c0cfeedb3a914f3fdc00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:53:28 +0200 Subject: [PATCH 088/100] Translation update done using Pootle. --- po/es.po | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index c789e43baa..74516d1c5b 100644 --- a/po/es.po +++ b/po/es.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 16:52+0200\n" +"PO-Revision-Date: 2011-07-27 16:53+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -10140,6 +10140,12 @@ msgid "" "not required any more.\n" " " msgstr "" +"Notar que:\n" +"Activar «general_log» puede aumentar la carga en el servidor hasta un 5-15%. " +"También esté al tanto que generar estadísticas de los registros es una " +"tarea muy intensiva por lo que se recomienda seleccionar un período de " +"tiempo lo más pequeño posible y desactivar «general_log» y vaciar sus tablas " +"una vez que ya no se necesite monitorizar.\n" #: server_status.php:1396 msgid "CPU Usage" From 26931b4f70fdaa11685bfc8b47a9aad89aa9c9a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:53:55 +0200 Subject: [PATCH 089/100] Translation update done using Pootle. --- po/es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/es.po b/po/es.po index 74516d1c5b..f9d147ae0f 100644 --- a/po/es.po +++ b/po/es.po @@ -10213,7 +10213,7 @@ msgstr "Rango de tiempo seleccionado:" #: server_status.php:1465 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements" -msgstr "" +msgstr "Sólo recuperar sentencias SELECT, INSERT, UPDATE y DELETE" #: server_status.php:1470 msgid "Remove variable data in INSERT statements for better grouping" From 7d7ef56692acae09b382331bf2901b39f84f4795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:54:29 +0200 Subject: [PATCH 090/100] Translation update done using Pootle. --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index f9d147ae0f..0a30a09faa 100644 --- a/po/es.po +++ b/po/es.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-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-27 16:53+0200\n" +"PO-Revision-Date: 2011-07-27 16:54+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: spanish \n" "Language: es\n" @@ -10217,7 +10217,7 @@ msgstr "Sólo recuperar sentencias SELECT, INSERT, UPDATE y DELETE" #: server_status.php:1470 msgid "Remove variable data in INSERT statements for better grouping" -msgstr "" +msgstr "Eliminar datos variables en sentencias INSERT para mejor agrupación" #: server_status.php:1473 msgid "" From 5ba9ce1d6b1a942dbcda64c064900637bf9d5de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Wed, 27 Jul 2011 16:54:37 +0200 Subject: [PATCH 091/100] Translation update done using Pootle. --- po/es.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 0a30a09faa..28557a3d5c 100644 --- a/po/es.po +++ b/po/es.po @@ -10228,10 +10228,9 @@ msgstr "" "se agruparán por el texto de la consulta." #: server_status.php:1476 -#, fuzzy #| msgid "Query type" msgid "Query analyzer" -msgstr "Tipo de consulta" +msgstr "Analizador de consultas" #: server_status.php:1512 #, php-format From 2141b5fe81d71d08524a11251a38fe5663b51ac7 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Wed, 27 Jul 2011 17:20:14 +0200 Subject: [PATCH 092/100] Fix incorrect variable name persistant > persistent --- libraries/dbi/mysql.dbi.lib.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index aa099eb070..b017e103bb 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -20,18 +20,18 @@ if (! defined('PMA_MYSQL_CLIENT_API')) { unset($client_api); } -function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persistant=false) +function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persistent=false) { global $cfg; if (empty($client_flags)) { - if ($cfg['PersistentConnections'] || $persistant) { + if ($cfg['PersistentConnections'] || $persistent) { $link = @mysql_pconnect($server, $user, $password); } else { $link = @mysql_connect($server, $user, $password); } } else { - if ($cfg['PersistentConnections'] || $persistant) { + if ($cfg['PersistentConnections'] || $persistent) { $link = @mysql_pconnect($server, $user, $password, $client_flags); } else { $link = @mysql_connect($server, $user, $password, false, $client_flags); @@ -40,11 +40,12 @@ function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persist return $link; } + /** * @param string $user mysql user name * @param string $password mysql user password * @param boolean $is_controluser - * @param array $server host/port/socket/persistant + * @param array $server host/port/socket/persistent * @param boolean $auxiliary_connection (when true, don't go back to login if connection fails) * @return mixed false on error or a mysqli object on success */ @@ -59,7 +60,7 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu $server_socket = (empty($server['socket'])) ? '' : ':' . $server['socket']; - $server_persistant = (empty($server['persistant'])) + $server_persistent = (empty($server['persistent'])) ? false : true; } else { @@ -101,9 +102,9 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu } } else { if (!isset($server['host'])) { - $link = PMA_DBI_real_connect($server_socket, $user, $password, NULL, $server_persistant); + $link = PMA_DBI_real_connect($server_socket, $user, $password, NULL, $server_persistent); } else { - $link = PMA_DBI_real_connect($server['host'] . $server_port . $server_socket, $user, $password, NULL, $server_persistant); + $link = PMA_DBI_real_connect($server['host'] . $server_port . $server_socket, $user, $password, NULL, $server_persistent); } } if (empty($link)) { From 69ac50958439cc32f4fa313ebb096d90b3a10746 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Wed, 27 Jul 2011 17:25:20 +0200 Subject: [PATCH 093/100] This should be checked in common, not in dbi library --- libraries/common.inc.php | 5 +++++ libraries/dbi/mysql.dbi.lib.php | 4 ---- libraries/dbi/mysqli.dbi.lib.php | 5 ----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 53cde17982..2b2cf60a9f 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -899,6 +899,11 @@ if (! defined('PMA_MINIMUM_COMMON')) { unset($login_without_password_is_forbidden); //Clean up after you! } + // if using TCP socket is not needed + if (strtolower($cfg['Server']['connect_type']) == 'tcp') { + $cfg['Server']['socket'] = ''; + } + // Try to connect MySQL with the control user profile (will be used to // get the privileges list for the current user but the true user link // must be open after this one so it would be default one for all the diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index b017e103bb..ba01cf10c0 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -72,10 +72,6 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu : ':' . $cfg['Server']['socket']; } - if (strtolower($cfg['Server']['connect_type']) == 'tcp') { - $cfg['Server']['socket'] = ''; - } - $client_flags = 0; // always use CLIENT_LOCAL_FILES as defined in mysql_com.h diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 0cd7c2f6dd..c9f02bb454 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -74,11 +74,6 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu : $GLOBALS['cfg']['Server']['socket']; } - - if (strtolower($GLOBALS['cfg']['Server']['connect_type']) == 'tcp') { - $GLOBALS['cfg']['Server']['socket'] = ''; - } - // NULL enables connection to the default socket $link = mysqli_init(); From b0ce7c20c4595a8a093177583cbdd5e15c6b6dca Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Wed, 27 Jul 2011 17:31:23 +0200 Subject: [PATCH 094/100] Improve readability --- libraries/dbi/mysqli.dbi.lib.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index c9f02bb454..d9f0a780d7 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -55,6 +55,8 @@ if (! defined('MYSQLI_TYPE_BIT')) { */ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = null, $auxiliary_connection = false) { + global $cfg; + if ($server) { $server_port = (empty($server['port'])) ? false @@ -66,12 +68,12 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu ? 'localhost' : $server['host']; } else { - $server_port = (empty($GLOBALS['cfg']['Server']['port'])) + $server_port = (empty($cfg['Server']['port'])) ? false - : (int) $GLOBALS['cfg']['Server']['port']; - $server_socket = (empty($GLOBALS['cfg']['Server']['socket'])) + : (int) $cfg['Server']['port']; + $server_socket = (empty($cfg['Server']['socket'])) ? null - : $GLOBALS['cfg']['Server']['socket']; + : $cfg['Server']['socket']; } // NULL enables connection to the default socket @@ -83,20 +85,20 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu $client_flags = 0; /* Optionally compress connection */ - if ($GLOBALS['cfg']['Server']['compress'] && defined('MYSQLI_CLIENT_COMPRESS')) { + if ($cfg['Server']['compress'] && defined('MYSQLI_CLIENT_COMPRESS')) { $client_flags |= MYSQLI_CLIENT_COMPRESS; } /* Optionally enable SSL */ - if ($GLOBALS['cfg']['Server']['ssl'] && defined('MYSQLI_CLIENT_SSL')) { + if ($cfg['Server']['ssl'] && defined('MYSQLI_CLIENT_SSL')) { $client_flags |= MYSQLI_CLIENT_SSL; } if (!$server) { - $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags); + $return_value = @mysqli_real_connect($link, $cfg['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags); // Retry with empty password if we're allowed to - if ($return_value == false && isset($GLOBALS['cfg']['Server']['nopassword']) && $GLOBALS['cfg']['Server']['nopassword'] && !$is_controluser) { - $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, '', false, $server_port, $server_socket, $client_flags); + if ($return_value == false && isset($cfg['Server']['nopassword']) && $cfg['Server']['nopassword'] && !$is_controluser) { + $return_value = @mysqli_real_connect($link, $cfg['Server']['host'], $user, '', false, $server_port, $server_socket, $client_flags); } } else { $return_value = @mysqli_real_connect($link, $server['host'], $user, $password, false, $server_port, $server_socket); From 46cd0f9a09e3a3fd0f2bb3b9b018282390c4e813 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Wed, 27 Jul 2011 19:01:15 +0200 Subject: [PATCH 095/100] Comments --- libraries/dbi/mysql.dbi.lib.php | 64 ++++++++++++++++++++++++---- libraries/dbi/mysqli.dbi.lib.php | 72 ++++++++++++++++---------------- 2 files changed, 92 insertions(+), 44 deletions(-) diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index ba01cf10c0..a175aaeb91 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -20,6 +20,16 @@ if (! defined('PMA_MYSQL_CLIENT_API')) { unset($client_api); } +/** + * Helper function for connecting to the database server + * + * @param string $server + * @param string $user + * @param string $password + * @param int $client_flags + * @param boolean $persistent + * @return mixed false on error or a mysql connection resource on success + */ function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persistent=false) { global $cfg; @@ -42,6 +52,8 @@ function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persist } /** + * connects to the database server + * * @param string $user mysql user name * @param string $password mysql user password * @param boolean $is_controluser @@ -125,11 +137,11 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu } /** - * select a db + * selects given database * - * @param string $dbname name of db to select - * @param resource $link mysql link resource - * @return boolean success + * @param string $dbname name of db to select + * @param resource $link mysql link resource + * @return boolean */ function PMA_DBI_select_db($dbname, $link = null) { @@ -146,9 +158,9 @@ function PMA_DBI_select_db($dbname, $link = null) /** * runs a query and returns the result * - * @param string $query query to run + * @param string $query query to run * @param resource $link mysql link resource - * @param integer $options + * @param integer $options * @return mixed */ function PMA_DBI_real_query($query, $link, $options) @@ -162,15 +174,33 @@ function PMA_DBI_real_query($query, $link, $options) } } +/** + * returns array of rows with associative and numeric keys from $result + * + * @param resource $result + * @return array + */ function PMA_DBI_fetch_array($result) { return mysql_fetch_array($result, MYSQL_BOTH); } +/** + * returns array of rows with associative keys from $result + * + * @param resource $result + * @return array + */ function PMA_DBI_fetch_assoc($result) { return mysql_fetch_array($result, MYSQL_ASSOC); } +/** + * returns array of rows with numeric keys from $result + * + * @param resource $result + * @return array + */ function PMA_DBI_fetch_row($result) { return mysql_fetch_array($result, MYSQL_NUM); @@ -334,6 +364,12 @@ function PMA_DBI_getError($link = null) return $error; } +/** + * returns the number of rows returned by last query + * + * @param resource $result + * @return string|ineteger + */ function PMA_DBI_num_rows($result) { if (!is_bool($result)) { @@ -343,6 +379,12 @@ function PMA_DBI_num_rows($result) } } +/** + * returns last inserted auto_increment id for given $link or $GLOBALS['userlink'] + * + * @param resource $link the mysql object + * @return string|ineteger + */ function PMA_DBI_insert_id($link = null) { if (empty($link)) { @@ -363,9 +405,9 @@ function PMA_DBI_insert_id($link = null) /** * returns the number of rows affected by last query * - * @param object mysql $link the mysql object - * @param boolean $get_from_cache - * @return string integer + * @param resource $link the mysql object + * @param boolean $get_from_cache + * @return string|integer */ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) { @@ -385,7 +427,11 @@ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) } /** + * returns metainfo for fields in $result + * * @todo add missing keys like in from mysqli_query (orgname, orgtable, flags, decimals) + * @param resource $result + * @return array meta info for fields in $result */ function PMA_DBI_get_fields_meta($result) { diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index d9f0a780d7..8c999dfe50 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -128,9 +128,9 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu /** * selects given database * - * @param string $dbname database name to select - * @param object mysqli $link the mysqli object - * @return boolean true or false + * @param string $dbname database name to select + * @param mysqli $link the mysqli object + * @return boolean */ function PMA_DBI_select_db($dbname, $link = null) { @@ -147,10 +147,10 @@ function PMA_DBI_select_db($dbname, $link = null) /** * runs a query and returns the result * - * @param string $query query to execute - * @param object mysqli $link mysqli object - * @param integer $options - * @return mixed true, false or result object + * @param string $query query to execute + * @param mysqli $link mysqli object + * @param integer $options + * @return mysqli_result|boolean */ function PMA_DBI_real_query($query, $link, $options) { @@ -168,8 +168,8 @@ function PMA_DBI_real_query($query, $link, $options) /** * returns array of rows with associative and numeric keys from $result * - * @param object mysqli result $result - * @return array result rows + * @param mysqli_result $result + * @return array */ function PMA_DBI_fetch_array($result) { @@ -179,8 +179,8 @@ function PMA_DBI_fetch_array($result) /** * returns array of rows with associative keys from $result * - * @param object mysqli result $result - * @return array result rows + * @param mysqli_result $result + * @return array */ function PMA_DBI_fetch_assoc($result) { @@ -190,8 +190,8 @@ function PMA_DBI_fetch_assoc($result) /** * returns array of rows with numeric keys from $result * - * @param object mysqli result $result - * @return array result rows + * @param mysqli_result $result + * @return array */ function PMA_DBI_fetch_row($result) { @@ -227,7 +227,7 @@ function PMA_DBI_free_result() /** * Check if there are any more query results from a multi query * - * @param object mysqli $link the mysqli object + * @param mysqli $link the mysqli object * @return boolean true or false */ function PMA_DBI_more_results($link = null) { @@ -244,7 +244,7 @@ function PMA_DBI_more_results($link = null) { /** * Prepare next result from multi_query * - * @param object mysqli $link the mysqli object + * @param mysqli $link the mysqli object * @return boolean true or false */ function PMA_DBI_next_result($link = null) { @@ -353,8 +353,10 @@ function PMA_DBI_getError($link = null) } /** + * returns the number of rows returned by last query * - * @param object mysqli result $result + * @param mysqli_result $result + * @return string|ineteger */ function PMA_DBI_num_rows($result) { @@ -369,10 +371,10 @@ function PMA_DBI_num_rows($result) /** * returns last inserted auto_increment id for given $link or $GLOBALS['userlink'] * - * @param object mysqli $link the mysqli object - * @return string ineteger + * @param mysqli $link the mysqli object + * @return string|ineteger */ -function PMA_DBI_insert_id($link = '') +function PMA_DBI_insert_id($link = null) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { @@ -393,9 +395,9 @@ function PMA_DBI_insert_id($link = '') /** * returns the number of rows affected by last query * - * @param object mysqli $link the mysqli object - * @param boolean $get_from_cache - * @return string integer + * @param mysqli $link the mysqli object + * @param boolean $get_from_cache + * @return string|integer */ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) { @@ -417,8 +419,8 @@ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) * returns metainfo for fields in $result * * @todo preserve orignal flags value - * @param object mysqli result $result - * @return array meta info for fields in $result + * @param mysqli_result $result + * @return array meta info for fields in $result */ function PMA_DBI_get_fields_meta($result) { @@ -496,8 +498,8 @@ function PMA_DBI_get_fields_meta($result) /** * return number of fields in given $result * - * @param object mysqli result $result - * @return integer field count + * @param mysqli_result $result + * @return integer field count */ function PMA_DBI_num_fields($result) { @@ -507,9 +509,9 @@ function PMA_DBI_num_fields($result) /** * returns the length of the given field $i in $result * - * @param object mysqli result $result - * @param integer $i field - * @return integer length of field + * @param mysqli_result $result + * @param integer $i field + * @return integer length of field */ function PMA_DBI_field_len($result, $i) { @@ -519,9 +521,9 @@ function PMA_DBI_field_len($result, $i) /** * returns name of $i. field in $result * - * @param object mysqli result $result - * @param integer $i field - * @return string name of $i. field in $result + * @param mysqli_result $result + * @param integer $i field + * @return string name of $i. field in $result */ function PMA_DBI_field_name($result, $i) { @@ -531,9 +533,9 @@ function PMA_DBI_field_name($result, $i) /** * returns concatenated string of human readable field flags * - * @param object mysqli result $result - * @param integer $i field - * @return string field flags + * @param mysqli_result $result + * @param integer $i field + * @return string field flags */ function PMA_DBI_field_flags($result, $i) { From f43517efb525b8e4cfc387822308c206f32ba6ee Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Wed, 27 Jul 2011 19:37:51 +0200 Subject: [PATCH 096/100] mysql extension - remove 'persistent' parameter Was named 'persistant' and never used/documented --- libraries/dbi/mysql.dbi.lib.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index a175aaeb91..292dfffa7b 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -30,7 +30,7 @@ if (! defined('PMA_MYSQL_CLIENT_API')) { * @param boolean $persistent * @return mixed false on error or a mysql connection resource on success */ -function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persistent=false) +function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persistent = false) { global $cfg; @@ -72,9 +72,6 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu $server_socket = (empty($server['socket'])) ? '' : ':' . $server['socket']; - $server_persistent = (empty($server['persistent'])) - ? false - : true; } else { $server_port = (empty($cfg['Server']['port'])) ? '' @@ -110,9 +107,9 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu } } else { if (!isset($server['host'])) { - $link = PMA_DBI_real_connect($server_socket, $user, $password, NULL, $server_persistent); + $link = PMA_DBI_real_connect($server_socket, $user, $password, NULL); } else { - $link = PMA_DBI_real_connect($server['host'] . $server_port . $server_socket, $user, $password, NULL, $server_persistent); + $link = PMA_DBI_real_connect($server['host'] . $server_port . $server_socket, $user, $password, NULL); } } if (empty($link)) { From b9ff7b7ce279391e5a2538c182ee0419e3456fa3 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Wed, 27 Jul 2011 19:51:09 +0200 Subject: [PATCH 097/100] Support persistent connections with mysqli extension (only PHP 5.3.0 and newer) --- Documentation.html | 8 ++++++-- libraries/dbi/mysqli.dbi.lib.php | 34 +++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/Documentation.html b/Documentation.html index 33bfa85e27..26673cbc23 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1391,8 +1391,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE is known to cause data corruption when having enabled buffering.
$cfg['PersistentConnections'] boolean
-
Whether persistent connections should be used or not (mysql_connect or - mysql_pconnect).
+
Whether persistent connections + should be used or not. Works with following extensions: +
$cfg['ForceSSL'] boolean
Whether to force using https while accessing phpMyAdmin.
diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 8c999dfe50..2effc4e2d2 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -43,6 +43,34 @@ if (! defined('MYSQLI_TYPE_BIT')) { define('MYSQLI_TYPE_BIT', 16); } +/** + * Helper function for connecting to the database server + * + * @param mysqli $link + * @param string $host + * @param string $user + * @param string $password + * @param string $dbname + * @param int $server_port + * @param string $server_socket + * @param int $client_flags + * @param boolean $persistent + * @return boolean + */ +function PMA_DBI_real_connect($link, $host, $user, $password, $dbname, $server_port, $server_socket, $client_flags = null, $persistent = false) +{ + global $cfg; + + if ($cfg['PersistentConnections'] || $persistent) { + $host = 'p:' . $host; + } + if ($client_flags === null) { + return @mysqli_real_connect($link, $host, $user, $password, $dbname, $server_port, $server_socket); + } else { + return @mysqli_real_connect($link, $host, $user, $password, $dbname, $server_port, $server_socket, $client_flags); + } +} + /** * connects to the database server * @@ -95,13 +123,13 @@ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = nu } if (!$server) { - $return_value = @mysqli_real_connect($link, $cfg['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags); + $return_value = @PMA_DBI_real_connect($link, $cfg['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags); // Retry with empty password if we're allowed to if ($return_value == false && isset($cfg['Server']['nopassword']) && $cfg['Server']['nopassword'] && !$is_controluser) { - $return_value = @mysqli_real_connect($link, $cfg['Server']['host'], $user, '', false, $server_port, $server_socket, $client_flags); + $return_value = @PMA_DBI_real_connect($link, $cfg['Server']['host'], $user, '', false, $server_port, $server_socket, $client_flags); } } else { - $return_value = @mysqli_real_connect($link, $server['host'], $user, $password, false, $server_port, $server_socket); + $return_value = @PMA_DBI_real_connect($link, $server['host'], $user, $password, false, $server_port, $server_socket); } if ($return_value == false) { From e82682d0e4037d92305ad92cb5514e822e9a5abc Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Wed, 27 Jul 2011 19:54:22 +0200 Subject: [PATCH 098/100] Simplify PMA_DBI_free_result It was never used with multiple arguments --- libraries/dbi/mysql.dbi.lib.php | 13 +++++-------- libraries/dbi/mysqli.dbi.lib.php | 12 +++++------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 292dfffa7b..ed8a93a84d 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -216,17 +216,14 @@ function PMA_DBI_data_seek($result, $offset) } /** - * Frees the memory associated with the results + * Frees memory associated with the result * - * @param result $result,... one or more mysql result resources + * @param resource $result */ -function PMA_DBI_free_result() +function PMA_DBI_free_result($result) { - foreach (func_get_args() as $result) { - if (is_resource($result) - && get_resource_type($result) === 'mysql result') { - mysql_free_result($result); - } + if (is_resource($result) && get_resource_type($result) === 'mysql result') { + mysql_free_result($result); } } diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 2effc4e2d2..535b8253c5 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -239,16 +239,14 @@ function PMA_DBI_data_seek($result, $offset) } /** - * Frees the memory associated with the results + * Frees memory associated with the result * - * @param result $result,... one or more mysql result resources + * @param mysqli_result $result */ -function PMA_DBI_free_result() +function PMA_DBI_free_result($result) { - foreach (func_get_args() as $result) { - if ($result instanceof mysqli_result) { - mysqli_free_result($result); - } + if ($result instanceof mysqli_result) { + mysqli_free_result($result); } } From 5f8842739de809166475ffb763dbaccb6d755728 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Wed, 27 Jul 2011 21:26:28 +0200 Subject: [PATCH 099/100] Remove invalid usage of $php_errormsg --- libraries/auth/config.auth.lib.php | 8 +------- libraries/auth/signon.auth.lib.php | 2 -- libraries/dbi/mysql.dbi.lib.php | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php index 5c98d258b2..e90e0bf795 100644 --- a/libraries/auth/config.auth.lib.php +++ b/libraries/auth/config.auth.lib.php @@ -66,15 +66,9 @@ function PMA_auth_set_user() */ function PMA_auth_fails() { - global $php_errormsg, $cfg; - $conn_error = PMA_DBI_getError(); if (!$conn_error) { - if (isset($php_errormsg)) { - $conn_error = $php_errormsg; - } else { - $conn_error = __('Cannot connect: invalid settings.'); - } + $conn_error = __('Cannot connect: invalid settings.'); } // Defines the charset to be used diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php index a829faa65c..0a079b26a1 100644 --- a/libraries/auth/signon.auth.lib.php +++ b/libraries/auth/signon.auth.lib.php @@ -238,8 +238,6 @@ function PMA_auth_fails() $_SESSION['PMA_single_signon_error_message'] = sprintf(__('No activity within %s seconds; please log in again'), $GLOBALS['cfg']['LoginCookieValidity']); } elseif (PMA_DBI_getError()) { $_SESSION['PMA_single_signon_error_message'] = PMA_sanitize(PMA_DBI_getError()); - } elseif (isset($php_errormsg)) { - $_SESSION['PMA_single_signon_error_message'] = $php_errormsg; } else { $_SESSION['PMA_single_signon_error_message'] = __('Cannot log in to the MySQL server'); } diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index ed8a93a84d..64ab026275 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -63,7 +63,7 @@ function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persist */ function PMA_DBI_connect($user, $password, $is_controluser = false, $server = null, $auxiliary_connection = false) { - global $cfg, $php_errormsg; + global $cfg; if ($server) { $server_port = (empty($server['port'])) From e58eea5deece01151db13083ad3b0b9e33455570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 27 Jul 2011 22:53:22 +0200 Subject: [PATCH 100/100] Fixup --- po/es.po | 1 + 1 file changed, 1 insertion(+) diff --git a/po/es.po b/po/es.po index 28557a3d5c..af4cbe2fbe 100644 --- a/po/es.po +++ b/po/es.po @@ -10146,6 +10146,7 @@ msgstr "" "tarea muy intensiva por lo que se recomienda seleccionar un período de " "tiempo lo más pequeño posible y desactivar «general_log» y vaciar sus tablas " "una vez que ya no se necesite monitorizar.\n" +" " #: server_status.php:1396 msgid "CPU Usage"