From cc99e0405536b2d886897c269a4877c05ba156f9 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 25 Jul 2011 10:08:10 -0400 Subject: [PATCH 001/107] 3.4.5 started --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 551eb8d362..03daef06fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +3.4.5.0 (not yet released) + 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes - bug #3323101 [parser] Invalid escape sequence in SQL parser From 871aaa9b641714af2137de5d67c137c8017580bd Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 25 Jul 2011 10:12:37 -0400 Subject: [PATCH 002/107] 3.4.5-dev --- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation.html b/Documentation.html index 23efaa9548..d7f2501359 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.4.4-dev - Documentation + phpMyAdmin 3.4.5-dev - Documentation @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 06955517ff..9c627c5773 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.4-dev +Version 3.4.5-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index f9e10f039a..f76d545acc 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.4-dev'); + $this->set('PMA_VERSION', '3.4.5-dev'); /** * @deprecated */ From 0d70e08ac25086fbfc2bb56ce2094d6822a36bd3 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:43:23 +0200 Subject: [PATCH 003/107] Translation update done using Pootle. --- po/tr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index 65f554ddd0..322f54beab 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-24 11:06+0200\n" +"PO-Revision-Date: 2011-07-25 18:43+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -1199,10 +1199,9 @@ msgid "Pause monitor" msgstr "İzlemeyi duraklat" #: 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 ve slow_query_log etkinleştirildi." +msgstr "general_log ve slow_query_log etkin." #: js/messages.php:115 msgid "general_log is enabled." From 7bed10b649dc8b331f55c1a47ed7a9697de69dc3 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:43:35 +0200 Subject: [PATCH 004/107] Translation update done using Pootle. --- po/tr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 322f54beab..afaca02e17 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1212,10 +1212,9 @@ msgid "slow_query_log is enabled." msgstr "slow_query_log etkinleştirildi." #: 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 ve general_log etkisizleştirildi." +msgstr "slow_query_log ve general_log etkisiz." #: js/messages.php:118 msgid "log_output is not set to TABLE." From a1f5e871264a994ba827d33f6a52f889d94f5856 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:43:41 +0200 Subject: [PATCH 005/107] Translation update done using Pootle. --- po/tr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index afaca02e17..d27a861ad8 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1348,10 +1348,9 @@ msgstr "Günlük incelendi, ama bu zaman aralığında bulunan veri yok." #. l10n: A collection of available filters #: js/messages.php:151 -#, fuzzy #| msgid "Filter" msgid "Filters" -msgstr "Süzgeç" +msgstr "Süzgeçler" #. l10n: Filter as in "Start Filtering" #: js/messages.php:153 navigation.php:270 From 20b639aaab820e14b1fcb0bd55590d21dd277465 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:49:44 +0200 Subject: [PATCH 006/107] Translation update done using Pootle. --- po/tr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index d27a861ad8..dc27cd112b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-25 18:43+0200\n" +"PO-Revision-Date: 2011-07-25 18:49+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -1366,10 +1366,9 @@ msgid "Group queries, ignoring variable data in WHERE statements" msgstr "" #: js/messages.php:156 -#, fuzzy #| msgid "Number of inserted rows" msgid "Sum of grouped rows:" -msgstr "Eklenmiş satır sayısı" +msgstr "Gruplanmış satırların toplamı:" #: js/messages.php:157 #, fuzzy From 6fe2817cc97cd443df50f44b0c3be73d0dee1bbf Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:49:49 +0200 Subject: [PATCH 007/107] Translation update done using Pootle. --- po/tr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index dc27cd112b..6820cb5069 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1371,10 +1371,9 @@ msgid "Sum of grouped rows:" msgstr "Gruplanmış satırların toplamı:" #: js/messages.php:157 -#, fuzzy #| msgid "Total" msgid "Total:" -msgstr "Toplam" +msgstr "Toplam:" #: js/messages.php:161 libraries/tbl_properties.inc.php:780 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545 From b7e8ad42af6bc0e749fca928bd09bd191e8b428f Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:50:07 +0200 Subject: [PATCH 008/107] Translation update done using Pootle. --- po/tr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index 6820cb5069..8dceeef8e7 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-25 18:49+0200\n" +"PO-Revision-Date: 2011-07-25 18:50+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -1512,10 +1512,9 @@ msgid "Change" msgstr "Değiştir" #: js/messages.php:208 -#, fuzzy #| msgid "Maximum execution time" msgid "Query execution time" -msgstr "En fazla yürütme süresi" +msgstr "Sorgu yürütme süresi" #: js/messages.php:211 msgid "Hide search criteria" From b5bdc5f564937fb6ca1baf4ba079dc5b3dfa7e2c Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:50:18 +0200 Subject: [PATCH 009/107] Translation update done using Pootle. --- po/tr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 8dceeef8e7..ab5a89beb8 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1530,10 +1530,9 @@ msgid "Ignore" msgstr "Yoksay" #: js/messages.php:218 -#, fuzzy #| msgid "Add column" msgid "Add columns" -msgstr "Sütun ekle" +msgstr "Sütunları ekle" #: js/messages.php:221 msgid "Select referenced key" From f90e2bd1ef7dae30fc9050146ae3d82c895ed522 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:51:29 +0200 Subject: [PATCH 010/107] Translation update done using Pootle. --- po/tr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index ab5a89beb8..daa2c7a595 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-25 18:50+0200\n" +"PO-Revision-Date: 2011-07-25 18:51+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -6248,10 +6248,9 @@ msgid "" msgstr "Aşağıdaki yapılar ya oluşturuldu ya da değiştirildi. Buyurun:" #: 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 "İsmine tıklayarak yapının içeriklerini görüntüleyin" +msgstr "Adına tıklayarak yapının içeriklerini görün" #: libraries/import.lib.php:1070 msgid "" From b8445f72e10394cd26498a6ce0603f1f0b9fc28e Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:52:03 +0200 Subject: [PATCH 011/107] Translation update done using Pootle. --- po/tr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index daa2c7a595..b3e1742553 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-25 18:51+0200\n" +"PO-Revision-Date: 2011-07-25 18:52+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -6260,10 +6260,9 @@ msgstr "" "değiştirin" #: libraries/import.lib.php:1071 -#, fuzzy #| msgid "Edit its structure by following the \"Structure\" link" msgid "Edit structure by following the \"Structure\" link" -msgstr "Aşağıdaki \"Yapı\" bağlantısıyla bunun yapısını düzenleyin" +msgstr "Aşağıdaki \"Yapı\" bağlantısıyla yapısını düzenleyin" #: libraries/import.lib.php:1074 msgid "Go to database" From 1635c5c0bce85d69b496a3ef03e075fa2042e413 Mon Sep 17 00:00:00 2001 From: Thilanka Kaushalya Date: Mon, 25 Jul 2011 22:22:13 +0530 Subject: [PATCH 012/107] 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 004bfe9d8e214529905c2d9748fd60347bb6de7d Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:54:08 +0200 Subject: [PATCH 013/107] Translation update done using Pootle. --- po/tr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index b3e1742553..19ea9df8ca 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-25 18:52+0200\n" +"PO-Revision-Date: 2011-07-25 18:54+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -10031,10 +10031,9 @@ msgstr "" "metnine göre gruplandırılır." #: server_status.php:1476 -#, fuzzy #| msgid "Query type" msgid "Query analyzer" -msgstr "Sorgu türü" +msgstr "Sorgu çözümleyici" #: server_status.php:1512 #, php-format From cd73f932a15088514164929290a268900cdad94e Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:54:37 +0200 Subject: [PATCH 014/107] Translation update done using Pootle. --- po/tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 19ea9df8ca..81ead94590 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6911,7 +6911,7 @@ msgstr "Her olay için geçerli aralık değeri vermek zorundasınız." #: libraries/rte/rte_events.lib.php:549 msgid "You must provide a valid execution time for the event." -msgstr "Olay için geçerli bir çalıştırma zamanı vermek zorundasınız." +msgstr "Olay için geçerli bir yürütme zamanı vermek zorundasınız." #: libraries/rte/rte_events.lib.php:553 msgid "You must provide a valid type for the event." From 8a8a2193911288f242ea25e6ecc90573f5c86756 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:55:07 +0200 Subject: [PATCH 015/107] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 81ead94590..2400df0661 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-25 18:54+0200\n" +"PO-Revision-Date: 2011-07-25 18:55+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -6957,7 +6957,7 @@ msgid "" "b> Please use the improved 'mysqli' extension to avoid any problems." msgstr "" "Çoklu sorguları kullanma kabiliyeti olmayan PHP'nin onaylamadığı 'mysql' " -"uzantısını kullanıyorsunuz. Bazı depolanmış yordamların çalıştırılması " +"uzantısını kullanıyorsunuz. Bazı depolanmış yordamların yürütülmesi " "başarısız olabilir! Lütfen herhangi bir sorundan kaçınmak için gelişmiş " "'mysql' uzantısı kullanın." From c7b42c1edccc5580f407f2074bec2887cfa74fca Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:55:21 +0200 Subject: [PATCH 016/107] Translation update done using Pootle. --- po/tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 2400df0661..83902debd1 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7076,7 +7076,7 @@ msgstr[0] "İşlemin içindeki son ifade tarafından %d satır etkilendi" #: libraries/rte/rte_routines.lib.php:1214 #, php-format msgid "Execution results of routine %s" -msgstr "%s yordamı çalıştırma sonuçları" +msgstr "%s yordamı yürütme sonuçları" #: libraries/rte/rte_routines.lib.php:1288 #: libraries/rte/rte_routines.lib.php:1294 From 4207d1d2aef9946a48220d6f92633a660f96573a Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:55:29 +0200 Subject: [PATCH 017/107] Translation update done using Pootle. --- po/tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index 83902debd1..81bed6100e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -11130,7 +11130,7 @@ msgstr "Bu seçenek tablolarınızı ve içerdiği veriyi değiştirecektir." #: tbl_tracking.php:560 msgid "SQL execution" -msgstr "SQL çalıştırma" +msgstr "SQL yürütme" #: tbl_tracking.php:572 #, php-format From 962724424f695aba114c7e3c1191aa58a97e3e1c Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:56:29 +0200 Subject: [PATCH 018/107] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 81bed6100e..bded2b180c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-25 18:55+0200\n" +"PO-Revision-Date: 2011-07-25 18:56+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -1312,7 +1312,7 @@ msgstr "Genel günlükten" #: js/messages.php:142 msgid "Analysing & loading logs. This may take a while." -msgstr "Günlükler inceleniyor ve yükleniyor. Bu biraz zaman alabilir." +msgstr "Günlükler çözümleniyor ve yükleniyor. Bu biraz zaman alabilir." #: js/messages.php:143 msgid "" From 73874434c769b17bc921249c5a6cb9f3528488b2 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:56:42 +0200 Subject: [PATCH 019/107] Translation update done using Pootle. --- po/tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index bded2b180c..abba9c041a 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1344,7 +1344,7 @@ msgstr "Günlük tablosuna atla" #: js/messages.php:148 msgid "Log analysed, but not data found in this time span." -msgstr "Günlük incelendi, ama bu zaman aralığında bulunan veri yok." +msgstr "Günlük çözümlendi, ama bu zaman aralığında bulunan veri yok." #. l10n: A collection of available filters #: js/messages.php:151 From 7b074df0a08190deed4e14791cae9e5bd1b390e0 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:57:07 +0200 Subject: [PATCH 020/107] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index abba9c041a..da8d92bb70 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-25 18:56+0200\n" +"PO-Revision-Date: 2011-07-25 18:57+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -705,7 +705,7 @@ msgstr "Tabloyu onar" #: db_structure.php:513 tbl_operations.php:627 msgid "Analyze table" -msgstr "Tabloyu incele" +msgstr "Tabloyu çözümle" #: db_structure.php:515 msgid "Add prefix to table" From 78cde1464430b733e3ed9f714982a46562af9d58 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:57:22 +0200 Subject: [PATCH 021/107] Translation update done using Pootle. --- po/tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/tr.po b/po/tr.po index da8d92bb70..b8690fa78b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -10835,7 +10835,7 @@ msgstr "Bölüm %s" #: tbl_operations.php:744 msgid "Analyze" -msgstr "İncele" +msgstr "Çözümle" #: tbl_operations.php:745 msgid "Check" From 2ffffc458c2fd984f5cdb959606ff5cbc00941ef Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 18:59:50 +0200 Subject: [PATCH 022/107] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index b8690fa78b..8d24ec4b48 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-25 18:57+0200\n" +"PO-Revision-Date: 2011-07-25 18:59+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -1359,7 +1359,7 @@ msgstr "Süzgeç" #: js/messages.php:154 msgid "Filter queries by word/regexp:" -msgstr "" +msgstr "Kelime/düzenli ifadeye göre sorguları süz" #: js/messages.php:155 msgid "Group queries, ignoring variable data in WHERE statements" From 23a4462633413e09a5bf0f8fa6b50b2f7bbd01e9 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 19:02:47 +0200 Subject: [PATCH 023/107] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 8d24ec4b48..576e52c8b2 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-25 18:59+0200\n" +"PO-Revision-Date: 2011-07-25 19:02+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -1363,7 +1363,7 @@ msgstr "Kelime/düzenli ifadeye göre sorguları süz" #: js/messages.php:155 msgid "Group queries, ignoring variable data in WHERE statements" -msgstr "" +msgstr "Sorguları grupla, WHERE ifadelerindeki değişken veri yoksayılıyor" #: js/messages.php:156 #| msgid "Number of inserted rows" From b8916c5268eb2b042bb258d27767041907182e58 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 19:30:25 +0200 Subject: [PATCH 024/107] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 576e52c8b2..62f85687ac 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-25 19:02+0200\n" +"PO-Revision-Date: 2011-07-25 19:30+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -10016,7 +10016,7 @@ msgstr "Seçili zaman aralığı:" #: server_status.php:1465 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements" -msgstr "" +msgstr "Sadece SELECT,INSERT,UPDATE ve DELETE İfadeleri erişir" #: server_status.php:1470 msgid "Remove variable data in INSERT statements for better grouping" From 4755a531109db609ba6ab42a90d298ba72f6d4a5 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 25 Jul 2011 19:31:30 +0200 Subject: [PATCH 025/107] Translation update done using Pootle. --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index 62f85687ac..2c9833bc00 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-25 11:36+0200\n" -"PO-Revision-Date: 2011-07-25 19:30+0200\n" +"PO-Revision-Date: 2011-07-25 19:31+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -10020,7 +10020,7 @@ msgstr "Sadece SELECT,INSERT,UPDATE ve DELETE İfadeleri erişir" #: server_status.php:1470 msgid "Remove variable data in INSERT statements for better grouping" -msgstr "" +msgstr "Daha iyi gruplama için INSERT ifadelerindeki değişken veriyi kaldır" #: server_status.php:1473 msgid "" From ebe14a205b603bd25d13fdea699e1773c6aecc07 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:05:11 +0200 Subject: [PATCH 026/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 1dc63b51df..988994c133 100644 --- a/po/ar.po +++ b/po/ar.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-09 03:43+0200\n" +"PO-Revision-Date: 2011-07-25 21:05+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" From 066319039dc60e2fc728091d80e3f18b53de6d9a Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:05:50 +0200 Subject: [PATCH 027/107] Translation update done using Pootle. --- po/ar.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 988994c133..3655be2fc4 100644 --- a/po/ar.po +++ b/po/ar.po @@ -11015,7 +11015,6 @@ msgid "Available transformations" msgstr "التحويلات المتوفرة" #: transformation_overview.php:47 -#, fuzzy #| msgid "Description" msgctxt "for MIME transformation" msgid "Description" From 57897e8f3cdaeb1c8eaf4cd661a62cf136379feb Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:06:06 +0200 Subject: [PATCH 028/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 3655be2fc4..7573da0f66 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:05+0200\n" +"PO-Revision-Date: 2011-07-25 21:06+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" From 239c3630f51c3335ef0a9ed58c5bcaeedb14a5ab Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:06:32 +0200 Subject: [PATCH 029/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 7573da0f66..23646874e4 100644 --- a/po/ar.po +++ b/po/ar.po @@ -11026,7 +11026,7 @@ msgstr "ليس لديك الحقوق الكافية بأن تكون هنا ال #: user_password.php:96 msgid "The profile has been updated." -msgstr "لقد تم تجديد العرض الجانبي." +msgstr "لقد تم تجديد الملف الشخصي." #: view_create.php:141 msgid "VIEW name" From 95734c71d548aae9ff0daa6182e0b3de38a60b50 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:06:47 +0200 Subject: [PATCH 030/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 23646874e4..8022b191b6 100644 --- a/po/ar.po +++ b/po/ar.po @@ -11030,7 +11030,7 @@ msgstr "لقد تم تجديد الملف الشخصي." #: view_create.php:141 msgid "VIEW name" -msgstr "" +msgstr "اسم VIEW" #: view_operations.php:91 msgid "Rename view to" From 31736e2a503c6628f9d42b1c888b70622b900654 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:07:13 +0200 Subject: [PATCH 031/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 8022b191b6..800e7a5873 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:06+0200\n" +"PO-Revision-Date: 2011-07-25 21:07+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" From 3ed32ed18a54d280a8b758f6d4b1f0a10e3f00b6 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:08:00 +0200 Subject: [PATCH 032/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 800e7a5873..460755a715 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:07+0200\n" +"PO-Revision-Date: 2011-07-25 21:08+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10971,7 +10971,7 @@ msgstr "" #: tbl_tracking.php:707 msgid "Activate now" -msgstr "" +msgstr "تنشيط الآن" #: tbl_tracking.php:720 #, php-format From 61de5389092ee2e38f2e711b9950d7106a58ab6d Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:08:57 +0200 Subject: [PATCH 033/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 460755a715..cab9139635 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10976,7 +10976,7 @@ msgstr "تنشيط الآن" #: tbl_tracking.php:720 #, php-format msgid "Create version %s of %s.%s" -msgstr "" +msgstr "انشئ إصدار %s لـ %s.s%s" #: tbl_tracking.php:724 msgid "Track these data definition statements:" From 4459881dbc45d87542cb72a2cb501747d65044c4 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:09:45 +0200 Subject: [PATCH 034/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index cab9139635..ae41876c2e 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:08+0200\n" +"PO-Revision-Date: 2011-07-25 21:09+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10962,7 +10962,7 @@ msgstr "" #: tbl_tracking.php:694 msgid "Deactivate now" -msgstr "" +msgstr "تعطيل الآن" #: tbl_tracking.php:705 #, php-format From f8b27b066f656fde0aafb8143c801f3f9a8ce3e7 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:10:02 +0200 Subject: [PATCH 035/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index ae41876c2e..15ec57eb3a 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:09+0200\n" +"PO-Revision-Date: 2011-07-25 21:10+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10967,7 +10967,7 @@ msgstr "تعطيل الآن" #: tbl_tracking.php:705 #, php-format msgid "Activate tracking for %s.%s" -msgstr "" +msgstr "تنشيط التتبع لـ %s.%s" #: tbl_tracking.php:707 msgid "Activate now" From 609d79d23d974d48d7e433ce779d8ef64cf0ff4f Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:11:08 +0200 Subject: [PATCH 036/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 15ec57eb3a..cd2c6ade6f 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:10+0200\n" +"PO-Revision-Date: 2011-07-25 21:11+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10980,7 +10980,7 @@ msgstr "انشئ إصدار %s لـ %s.s%s" #: tbl_tracking.php:724 msgid "Track these data definition statements:" -msgstr "" +msgstr "تتبع جمل تعريف البيانات:" #: tbl_tracking.php:732 msgid "Track these data manipulation statements:" From 397e8625ad3021af14de5dd05202fee4654296c8 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:12:22 +0200 Subject: [PATCH 037/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index cd2c6ade6f..afb4d265ba 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:11+0200\n" +"PO-Revision-Date: 2011-07-25 21:12+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10984,7 +10984,7 @@ msgstr "تتبع جمل تعريف البيانات:" #: tbl_tracking.php:732 msgid "Track these data manipulation statements:" -msgstr "" +msgstr "تتبع تقارير التلاعب بالبيانات:" #: tbl_tracking.php:740 msgid "Create version" From ffadf44ec6c10c4b6678450ff80e2d95b4dc6bb0 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:12:38 +0200 Subject: [PATCH 038/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index afb4d265ba..af62136e57 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10980,7 +10980,7 @@ msgstr "انشئ إصدار %s لـ %s.s%s" #: tbl_tracking.php:724 msgid "Track these data definition statements:" -msgstr "تتبع جمل تعريف البيانات:" +msgstr "تتبع تقارير تعريف البيانات:" #: tbl_tracking.php:732 msgid "Track these data manipulation statements:" From c56b99a0b7e147eb7ab69cf02aab44c672a5856a Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:13:51 +0200 Subject: [PATCH 039/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index af62136e57..0286c2082a 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:12+0200\n" +"PO-Revision-Date: 2011-07-25 21:13+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10988,7 +10988,7 @@ msgstr "تتبع تقارير التلاعب بالبيانات:" #: tbl_tracking.php:740 msgid "Create version" -msgstr "" +msgstr "إنشاء إصدار" #: themes.php:31 #, php-format From 524835414f5454b6955f2a6bdc17c093f45ca7b7 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:29:12 +0200 Subject: [PATCH 040/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 0286c2082a..5015988f84 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:13+0200\n" +"PO-Revision-Date: 2011-07-25 21:29+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10995,7 +10995,7 @@ msgstr "إنشاء إصدار" msgid "" "No themes support; please check your configuration and/or your themes in " "directory %s." -msgstr "" +msgstr "لايوجد سمة مدعومة , فضلا راجع إعدادات السمات في المسار %s." #: themes.php:41 msgid "Get more themes!" From 2824ac988a799a137a050d7c57dcee013f1a4836 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:29:28 +0200 Subject: [PATCH 041/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 5015988f84..6e3ceb435a 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10999,7 +10999,7 @@ msgstr "لايوجد سمة مدعومة , فضلا راجع إعدادات ال #: themes.php:41 msgid "Get more themes!" -msgstr "" +msgstr "الحصول على سمات جديدة!" #: transformation_overview.php:24 msgid "Available MIME types" From c453d79bb4172857c1f6ac9e82b61ee76e058124 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:34:41 +0200 Subject: [PATCH 042/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 6e3ceb435a..0a051040fb 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:29+0200\n" +"PO-Revision-Date: 2011-07-25 21:34+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10940,7 +10940,7 @@ msgstr "" #: tbl_tracking.php:560 msgid "SQL execution" -msgstr "" +msgstr "تنفيذ SQL" #: tbl_tracking.php:572 #, php-format From e14a647ff77867559031f4670fe73813b5494b0e Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:34:58 +0200 Subject: [PATCH 043/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 0a051040fb..97900868aa 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10945,7 +10945,7 @@ msgstr "تنفيذ SQL" #: tbl_tracking.php:572 #, php-format msgid "Export as %s" -msgstr "" +msgstr "تصدير كـ %s" #: tbl_tracking.php:612 msgid "Show versions" From 90bcacd9dbf66849a5fb35f7accdee85731bb730 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:35:14 +0200 Subject: [PATCH 044/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 97900868aa..df74766c05 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:34+0200\n" +"PO-Revision-Date: 2011-07-25 21:35+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10949,7 +10949,7 @@ msgstr "تصدير كـ %s" #: tbl_tracking.php:612 msgid "Show versions" -msgstr "" +msgstr "عرض الإصدارات" #: tbl_tracking.php:644 msgid "Version" From 91d033a5cda7e20e9111b3fc3c0898397fb7b9fc Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:35:41 +0200 Subject: [PATCH 045/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index df74766c05..2e347ca578 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10958,7 +10958,7 @@ msgstr "نسخة" #: tbl_tracking.php:692 #, php-format msgid "Deactivate tracking for %s.%s" -msgstr "" +msgstr "تعطيل التتبع لـ %s.%s" #: tbl_tracking.php:694 msgid "Deactivate now" From ba8d55b7969180821cb00099db25c74392d5d867 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:36:21 +0200 Subject: [PATCH 046/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 2e347ca578..bb7d99ceae 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:35+0200\n" +"PO-Revision-Date: 2011-07-25 21:36+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10858,7 +10858,7 @@ msgstr "" #: tbl_tracking.php:208 msgid "SQL statements executed." -msgstr "" +msgstr "تم تنفيذ جمل SQL." #: tbl_tracking.php:214 msgid "" From 937367b306b55485897b7fe480a0c0f488937510 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:36:47 +0200 Subject: [PATCH 047/107] Translation update done using Pootle. --- po/ar.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index bb7d99ceae..7a153838a8 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10884,10 +10884,9 @@ msgid "Tracking data definition successfully deleted" msgstr "" #: tbl_tracking.php:384 tbl_tracking.php:401 -#, fuzzy #| msgid "errors." msgid "Query error" -msgstr "أخطاء." +msgstr "خطأ في الإستعلام" #: tbl_tracking.php:399 msgid "Tracking data manipulation successfully deleted" From 6f091f7642316406f1d83f62efb494b7adc8f24e Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:37:05 +0200 Subject: [PATCH 048/107] Translation update done using Pootle. --- po/ar.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ar.po b/po/ar.po index 7a153838a8..543855cdc6 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:36+0200\n" +"PO-Revision-Date: 2011-07-25 21:37+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10908,10 +10908,9 @@ msgid "Delete tracking data row from report" msgstr "يسمح بإضافة واستبدال البيانات." #: tbl_tracking.php:443 -#, fuzzy #| msgid "No databases" msgid "No data" -msgstr "لايوجد قواعد بيانات" +msgstr "لايوجد بيانات" #: tbl_tracking.php:453 tbl_tracking.php:510 msgid "Date" From d1e220a9009ad070add65c6017ac3f65ed2ab198 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:37:34 +0200 Subject: [PATCH 049/107] Translation update done using Pootle. --- po/ar.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 543855cdc6..1604e22264 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10769,7 +10769,6 @@ msgid "Add FULLTEXT index" msgstr "" #: tbl_structure.php:391 -#, fuzzy #| msgid "None" msgctxt "None for default" msgid "None" From 6f9f391e4eeee0ca34cb8509f270a8c1a2f063e5 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:38:05 +0200 Subject: [PATCH 050/107] Translation update done using Pootle. --- po/ar.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ar.po b/po/ar.po index 1604e22264..57b1ecb8b8 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:37+0200\n" +"PO-Revision-Date: 2011-07-25 21:38+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10775,10 +10775,10 @@ msgid "None" msgstr "لا شيء" #: tbl_structure.php:404 -#, fuzzy, php-format +#, php-format #| msgid "Table %s has been dropped" msgid "Column %s has been dropped" -msgstr "جدول %s حذفت" +msgstr "تم حذف العمود %s" #: tbl_structure.php:415 tbl_structure.php:509 #, php-format From a2198f247757f579ec862d594839a2f27c1e8fad Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:38:25 +0200 Subject: [PATCH 051/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 57b1ecb8b8..c9e3e64129 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10783,7 +10783,7 @@ msgstr "تم حذف العمود %s" #: tbl_structure.php:415 tbl_structure.php:509 #, php-format msgid "A primary key has been added on %s" -msgstr "لقد أُضيف المفتاح الأساسي في %s" +msgstr "تم إضافة المفتاح الأساسي في %s" #: tbl_structure.php:430 tbl_structure.php:445 tbl_structure.php:465 #: tbl_structure.php:480 tbl_structure.php:522 tbl_structure.php:535 From 75f3be7cc68bb23fdd8cff6b1f3cb7626ad5d085 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:38:43 +0200 Subject: [PATCH 052/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index c9e3e64129..178f3444b5 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10790,7 +10790,7 @@ msgstr "تم إضافة المفتاح الأساسي في %s" #: tbl_structure.php:548 tbl_structure.php:561 #, php-format msgid "An index has been added on %s" -msgstr "لقد أُضيف الفهرس في %s" +msgstr "تم إضافة الفهرس في %s" #: tbl_structure.php:497 #, fuzzy From c3ff2ed1ce96960c8310c136d2d56a19a4f3b129 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:39:04 +0200 Subject: [PATCH 053/107] Translation update done using Pootle. --- po/ar.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ar.po b/po/ar.po index 178f3444b5..d9ac4549a8 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:38+0200\n" +"PO-Revision-Date: 2011-07-25 21:39+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10793,10 +10793,9 @@ msgid "An index has been added on %s" msgstr "تم إضافة الفهرس في %s" #: tbl_structure.php:497 -#, fuzzy #| msgid "Show PHP information" msgid "Show more actions" -msgstr "عرض المعلومات المتعلقة ب PHP" +msgstr "عرض المزيد من العمليات" #: tbl_structure.php:642 tbl_structure.php:644 msgid "Relation view" From 9563a82a591d1d6bb60a1e281d617bc76d6dc587 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:39:31 +0200 Subject: [PATCH 054/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index d9ac4549a8..5e5b96c454 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10799,7 +10799,7 @@ msgstr "عرض المزيد من العمليات" #: tbl_structure.php:642 tbl_structure.php:644 msgid "Relation view" -msgstr "عرض الروابط" +msgstr "عرض العلاقات" #: tbl_structure.php:651 tbl_structure.php:653 msgid "Propose table structure" From 370c8809a13d1b0895c8796ff7b7cc9967ff5062 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:40:01 +0200 Subject: [PATCH 055/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 5e5b96c454..ae3a13bd96 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:39+0200\n" +"PO-Revision-Date: 2011-07-25 21:40+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" From 6e015e53dacda51bcc5f138079b059e2f00a5e2d Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:40:11 +0200 Subject: [PATCH 056/107] Translation update done using Pootle. --- po/ar.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index ae3a13bd96..26783ba449 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10806,10 +10806,9 @@ msgid "Propose table structure" msgstr "اقترح بناء الجدول" #: tbl_structure.php:676 -#, fuzzy #| msgid "Add into comments" msgid "Add column" -msgstr "أضف إلى الملاحظات" +msgstr "إضافة عمود" #: tbl_structure.php:690 msgid "At End of Table" From 0ea0a4b23b0a323fdd62e828ca6c5b706cb76915 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:41:06 +0200 Subject: [PATCH 057/107] Translation update done using Pootle. --- po/ar.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ar.po b/po/ar.po index 26783ba449..f0c9c55dda 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:40+0200\n" +"PO-Revision-Date: 2011-07-25 21:41+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10824,10 +10824,10 @@ msgid "After %s" msgstr "بعد %s" #: tbl_structure.php:732 -#, fuzzy, php-format +#, php-format #| msgid "Create an index on %s columns" msgid "Create an index on  %s columns" -msgstr "تصميم فهرسه على %s عمود" +msgstr "إنشاء فهرس للعمود %s" #: tbl_structure.php:889 msgid "partitioned" From a9bcef0371e1e80018700eb2b88f47dad7c807fd Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:41:58 +0200 Subject: [PATCH 058/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index f0c9c55dda..0a01c3dfda 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10831,7 +10831,7 @@ msgstr "إنشاء فهرس للعمود %s" #: tbl_structure.php:889 msgid "partitioned" -msgstr "" +msgstr "مقسم" #: tbl_tracking.php:109 #, php-format From b344843bd6516072bdd60e8227c61c472900f2af Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:42:33 +0200 Subject: [PATCH 059/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 0a01c3dfda..60ce5682df 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:41+0200\n" +"PO-Revision-Date: 2011-07-25 21:42+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10836,7 +10836,7 @@ msgstr "مقسم" #: tbl_tracking.php:109 #, php-format msgid "Tracking report for table `%s`" -msgstr "" +msgstr "تتبع التقرير للجدول %s" #: tbl_tracking.php:182 #, php-format From 0dd0ff8792e77de5a7fb5e5f23087a3a5686c5eb Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:44:04 +0200 Subject: [PATCH 060/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 60ce5682df..72bb2d7e78 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:42+0200\n" +"PO-Revision-Date: 2011-07-25 21:44+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10841,7 +10841,7 @@ msgstr "تتبع التقرير للجدول %s" #: tbl_tracking.php:182 #, php-format msgid "Version %s is created, tracking for %s.%s is activated." -msgstr "" +msgstr "تم إنشاء الإصدار %s , التتبع نشط لـ %s.%s " #: tbl_tracking.php:190 #, php-format From 64ac597231aa767f3c3288654a5308ac00e1c607 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:44:21 +0200 Subject: [PATCH 061/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 72bb2d7e78..073fbf5612 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10841,7 +10841,7 @@ msgstr "تتبع التقرير للجدول %s" #: tbl_tracking.php:182 #, php-format msgid "Version %s is created, tracking for %s.%s is activated." -msgstr "تم إنشاء الإصدار %s , التتبع نشط لـ %s.%s " +msgstr "تم إنشاء الإصدار %s , التتبع نشط لـ %s.%s" #: tbl_tracking.php:190 #, php-format From 060d1d60288a28854fadf389ec616c9df03ba0d8 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:45:21 +0200 Subject: [PATCH 062/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 073fbf5612..1d3f89d89a 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:44+0200\n" +"PO-Revision-Date: 2011-07-25 21:45+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10846,7 +10846,7 @@ msgstr "تم إنشاء الإصدار %s , التتبع نشط لـ %s.%s" #: tbl_tracking.php:190 #, php-format msgid "Tracking for %s.%s , version %s is deactivated." -msgstr "" +msgstr "اللتبع لـ %s.%s , الإصدار %s معطل ." #: tbl_tracking.php:198 #, php-format From 6bd934e46899d89f08950c047290fc96d76fe6cd Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:45:48 +0200 Subject: [PATCH 063/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 1d3f89d89a..6f3633e545 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10851,7 +10851,7 @@ msgstr "اللتبع لـ %s.%s , الإصدار %s معطل ." #: tbl_tracking.php:198 #, php-format msgid "Tracking for %s.%s , version %s is activated." -msgstr "" +msgstr "اللتبع لـ %s.%s , الإصدار %s مفعل." #: tbl_tracking.php:208 msgid "SQL statements executed." From b91d97715453950f850f26e7fc887f7842c2149c Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:48:08 +0200 Subject: [PATCH 064/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 6f3633e545..7dc0321997 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:45+0200\n" +"PO-Revision-Date: 2011-07-25 21:48+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10746,7 +10746,7 @@ msgstr "" #: tbl_structure.php:170 tbl_structure.php:171 msgid "Add primary key" -msgstr "" +msgstr "إضافة مفتاح رئيسي" #: tbl_structure.php:172 tbl_structure.php:173 #, fuzzy From a97f57764c88f513a07e9008da01ec3598f507e0 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:48:19 +0200 Subject: [PATCH 065/107] Translation update done using Pootle. --- po/ar.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 7dc0321997..8e6db8ed55 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10749,10 +10749,9 @@ msgid "Add primary key" msgstr "إضافة مفتاح رئيسي" #: tbl_structure.php:172 tbl_structure.php:173 -#, fuzzy #| msgid "Add new field" msgid "Add index" -msgstr "إضافة حقل جديد" +msgstr "إضافة فهرس" #: tbl_structure.php:174 tbl_structure.php:175 msgid "Add unique index" From eab22c4d9692711bd67c891718501e687df49bfb Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:48:35 +0200 Subject: [PATCH 066/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 8e6db8ed55..743bfb11c4 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10755,7 +10755,7 @@ msgstr "إضافة فهرس" #: tbl_structure.php:174 tbl_structure.php:175 msgid "Add unique index" -msgstr "" +msgstr "إضافة فهرس مميز" #: tbl_structure.php:176 tbl_structure.php:177 #, fuzzy From ac270ab375440d83a5549887b57be4746ed75ecb Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:49:38 +0200 Subject: [PATCH 067/107] Translation update done using Pootle. --- po/ar.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ar.po b/po/ar.po index 743bfb11c4..3781be6a4a 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:48+0200\n" +"PO-Revision-Date: 2011-07-25 21:49+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10719,10 +10719,9 @@ msgid "Do a \"query by example\" (wildcard: \"%\")" msgstr "تجعل \"استعلام بواسطة المثال\" (wildcard: \"%\")" #: tbl_select.php:260 -#, fuzzy #| msgid "Select fields (at least one):" msgid "Select columns (at least one):" -msgstr "اختيار حقول (على الأقل واحد):" +msgstr "اختيار الأعمدة (واحد على الأقل):" #: tbl_select.php:278 msgid "Add search conditions (body of the \"where\" clause):" From 52b4191708b8a0daa663f5bfe5a7da781c46a8aa Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:50:26 +0200 Subject: [PATCH 068/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 3781be6a4a..c539ef383b 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:49+0200\n" +"PO-Revision-Date: 2011-07-25 21:50+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10725,7 +10725,7 @@ msgstr "اختيار الأعمدة (واحد على الأقل):" #: tbl_select.php:278 msgid "Add search conditions (body of the \"where\" clause):" -msgstr "أضف شروط البحث (جسم من الفقره \"where\" clause):" +msgstr "أضف شروط البحث (الفقرة \"where\" ):" #: tbl_select.php:285 msgid "Number of rows per page" From aa2b9e54a5a61bb96b90d5b1777daa43f99e37fa Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:51:32 +0200 Subject: [PATCH 069/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index c539ef383b..3870440400 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:50+0200\n" +"PO-Revision-Date: 2011-07-25 21:51+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10741,7 +10741,7 @@ msgstr "" #: tbl_structure.php:165 tbl_structure.php:169 msgid "Browse distinct values" -msgstr "" +msgstr "إستعرض القيم المميزة" #: tbl_structure.php:170 tbl_structure.php:171 msgid "Add primary key" From 971df4e38ff87132ad06b0efffcb7e12d322a0d7 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:52:16 +0200 Subject: [PATCH 070/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 3870440400..41e552b426 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:51+0200\n" +"PO-Revision-Date: 2011-07-25 21:52+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" From 95f37ff17488a0e8761ebea185c0d864346244f2 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:52:40 +0200 Subject: [PATCH 071/107] Translation update done using Pootle. --- po/ar.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 41e552b426..761d8be1fd 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10699,7 +10699,6 @@ msgid "Error creating foreign key on %1$s (check data types)" msgstr "" #: tbl_relation.php:402 -#, fuzzy #| msgid "Internal relations" msgid "Internal relation" msgstr "العلاقات الداخلية" From b775a76e0b184648568ffbaaf6f8e6829459aa4b Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:53:01 +0200 Subject: [PATCH 072/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 761d8be1fd..51a0068f64 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:52+0200\n" +"PO-Revision-Date: 2011-07-25 21:53+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10711,7 +10711,7 @@ msgstr "" #: tbl_relation.php:410 msgid "Foreign key constraint" -msgstr "" +msgstr "قيود المفتاح الغريب" #: tbl_select.php:110 msgid "Do a \"query by example\" (wildcard: \"%\")" From 8a39a3aa989d00a940dbb90fb16b0501f28719ce Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:53:33 +0200 Subject: [PATCH 073/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 51a0068f64..fa3cdcf0be 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10715,7 +10715,7 @@ msgstr "قيود المفتاح الغريب" #: tbl_select.php:110 msgid "Do a \"query by example\" (wildcard: \"%\")" -msgstr "تجعل \"استعلام بواسطة المثال\" (wildcard: \"%\")" +msgstr "عمل \"استعلام بواسطة المثال\" (بدل: \"%\")" #: tbl_select.php:260 #| msgid "Select fields (at least one):" From 12959427cbb9ce5f3f724be2a4f72de1fc7a874c Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:54:02 +0200 Subject: [PATCH 074/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index fa3cdcf0be..58dfd3f1c7 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:53+0200\n" +"PO-Revision-Date: 2011-07-25 21:54+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" From 9f2d6bab5103988018a85c846f2239902a7b91d8 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:54:09 +0200 Subject: [PATCH 075/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 58dfd3f1c7..a8cd33aeac 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10639,7 +10639,7 @@ msgstr "تحقق" #: tbl_operations.php:746 msgid "Optimize" -msgstr "" +msgstr "تحسين" #: tbl_operations.php:747 msgid "Rebuild" From 234ca374755206c89bf3f0ad17eff467f188d902 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:54:19 +0200 Subject: [PATCH 076/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index a8cd33aeac..9e24565805 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10643,7 +10643,7 @@ msgstr "تحسين" #: tbl_operations.php:747 msgid "Rebuild" -msgstr "" +msgstr "إعادة بناء" #: tbl_operations.php:748 msgid "Repair" From 48bde78cb7d3e91f07034e9d48e6d21b822c47dc Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:54:26 +0200 Subject: [PATCH 077/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 9e24565805..b3f550cd39 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10647,7 +10647,7 @@ msgstr "إعادة بناء" #: tbl_operations.php:748 msgid "Repair" -msgstr "صلح" +msgstr "إصلاح" #: tbl_operations.php:760 msgid "Remove partitioning" From 668a6dc1e5783679b21c5a3f31dd3e2e389cfecc Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:54:40 +0200 Subject: [PATCH 078/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index b3f550cd39..d4f7404489 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10651,7 +10651,7 @@ msgstr "إصلاح" #: tbl_operations.php:760 msgid "Remove partitioning" -msgstr "" +msgstr "إزالة التقسيم" #: tbl_operations.php:786 msgid "Check referential integrity:" From d9e28cf01451f947f96a7ec01d8ded9787df0bba Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:55:00 +0200 Subject: [PATCH 079/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index d4f7404489..58c26afa97 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:54+0200\n" +"PO-Revision-Date: 2011-07-25 21:55+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10659,7 +10659,7 @@ msgstr "تحديد التكامل المرجعي:" #: tbl_printview.php:72 msgid "Show tables" -msgstr "شاهد الجدول" +msgstr "عرض الجداول" #: tbl_printview.php:307 tbl_structure.php:789 msgid "Space usage" From a169ff7fd3b0865354462b8fdcd39e526f7e2af2 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:55:11 +0200 Subject: [PATCH 080/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 58c26afa97..57c935273e 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10663,7 +10663,7 @@ msgstr "عرض الجداول" #: tbl_printview.php:307 tbl_structure.php:789 msgid "Space usage" -msgstr "المساحة المستغلة" +msgstr "المساحة المستخدمة" #: tbl_printview.php:311 tbl_structure.php:793 msgid "Usage" From 00045629a6fc841366ae8a10b10da630c547ceca Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:55:26 +0200 Subject: [PATCH 081/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 57c935273e..178306bcf4 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10667,7 +10667,7 @@ msgstr "المساحة المستخدمة" #: tbl_printview.php:311 tbl_structure.php:793 msgid "Usage" -msgstr "المساحة" +msgstr "الإستخدام" #: tbl_printview.php:338 tbl_structure.php:820 msgid "Effective" From 214b0ea88bc47273c3bc98baefe061e5efb1d170 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:56:01 +0200 Subject: [PATCH 082/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 178306bcf4..0afa7c490b 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:55+0200\n" +"PO-Revision-Date: 2011-07-25 21:56+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10612,7 +10612,7 @@ msgstr "إرجاع أو استيراد بيانات الجدول" #: tbl_operations.php:692 msgid "Empty the table (TRUNCATE)" -msgstr "" +msgstr "إفراغ الجدول (TRUNCATE)" #: tbl_operations.php:712 #, fuzzy From a0965208b1e1663f3309dc7b8ff2865cb11f9b17 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:56:35 +0200 Subject: [PATCH 083/107] Translation update done using Pootle. --- po/ar.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 0afa7c490b..4af3acd4f1 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10615,10 +10615,9 @@ msgid "Empty the table (TRUNCATE)" msgstr "إفراغ الجدول (TRUNCATE)" #: tbl_operations.php:712 -#, fuzzy #| msgid "Copy database to" msgid "Delete the table (DROP)" -msgstr "إنسخ قاعدة البيانات إلى" +msgstr "حذف الجدول (DROP)" #: tbl_operations.php:733 msgid "Partition maintenance" From f275902987ae09373eebe61e5ce67ad39cf36ea3 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:59:10 +0200 Subject: [PATCH 084/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 4af3acd4f1..ab3ea8a5ed 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:56+0200\n" +"PO-Revision-Date: 2011-07-25 21:59+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10591,7 +10591,7 @@ msgstr "صيانة الجدول" #: tbl_operations.php:614 msgid "Defragment table" -msgstr "" +msgstr "إلغاء تجزئة الجدول" #: tbl_operations.php:662 #, php-format From 48f422999ed34554762588e2082482d1f1b9db9a Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 21:59:42 +0200 Subject: [PATCH 085/107] Translation update done using Pootle. --- po/ar.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index ab3ea8a5ed..2118013a4d 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10599,10 +10599,9 @@ msgid "Table %s has been flushed" msgstr "لقد تم إعادة تحميل الجدول %s بنجاح" #: tbl_operations.php:668 -#, fuzzy #| msgid "Flush the table (\"FLUSH\")" msgid "Flush the table (FLUSH)" -msgstr "إعادة تحميل الجدول (\"FLUSH\")" +msgstr "إعادة تحميل الجدول (FLUSH)" #: tbl_operations.php:677 #, fuzzy From a4a1ce2f5e6a1391947f9f6c4c0010516c8f209d Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 22:00:14 +0200 Subject: [PATCH 086/107] Translation update done using Pootle. --- po/ar.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ar.po b/po/ar.po index 2118013a4d..9d6e9401a8 100644 --- a/po/ar.po +++ b/po/ar.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-25 21:59+0200\n" +"PO-Revision-Date: 2011-07-25 22:00+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -10604,10 +10604,9 @@ msgid "Flush the table (FLUSH)" msgstr "إعادة تحميل الجدول (FLUSH)" #: tbl_operations.php:677 -#, fuzzy #| msgid "Dumping data for table" msgid "Delete data or table" -msgstr "إرجاع أو استيراد بيانات الجدول" +msgstr "حذف البيانات او الجدول" #: tbl_operations.php:692 msgid "Empty the table (TRUNCATE)" From 5299f56eb025c66685e28275d0c2d30ce7bce851 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 22:00:37 +0200 Subject: [PATCH 087/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index 9d6e9401a8..72f7b30768 100644 --- a/po/ar.po +++ b/po/ar.po @@ -10624,7 +10624,7 @@ msgstr "" #: tbl_operations.php:741 #, php-format msgid "Partition %s" -msgstr "" +msgstr "تقسيم %s" #: tbl_operations.php:744 msgid "Analyze" From c8491c893d6035602c26ecc86461b1b5f90b35dc Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 22:03:16 +0200 Subject: [PATCH 088/107] Translation update done using Pootle. --- po/ar.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ar.po b/po/ar.po index 72f7b30768..373cc5979e 100644 --- a/po/ar.po +++ b/po/ar.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-25 22:00+0200\n" +"PO-Revision-Date: 2011-07-25 22:03+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -1122,10 +1122,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 3e580b3becedb94c20634e3dccfdea13b0ee1fb6 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 22:04:05 +0200 Subject: [PATCH 089/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 373cc5979e..a6c5567657 100644 --- a/po/ar.po +++ b/po/ar.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-25 22:03+0200\n" +"PO-Revision-Date: 2011-07-25 22:04+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -1129,7 +1129,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 e78d4c654519495fe229e53c6d15488b26d47b7e Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 22:04:49 +0200 Subject: [PATCH 090/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index a6c5567657..fc52abb118 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1137,7 +1137,7 @@ msgstr "إحصائيات الإستعلام" #: js/messages.php:94 msgid "System CPU Usage" -msgstr "" +msgstr "إستخدام النظام للمعالج (CPU)" #: js/messages.php:95 msgid "System memory" From 73582711a80f8e073b450c29e8ccea716043db60 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 22:05:03 +0200 Subject: [PATCH 091/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index fc52abb118..c07f0a558f 100644 --- a/po/ar.po +++ b/po/ar.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-25 22:04+0200\n" +"PO-Revision-Date: 2011-07-25 22:05+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -1141,7 +1141,7 @@ msgstr "إستخدام النظام للمعالج (CPU)" #: js/messages.php:95 msgid "System memory" -msgstr "" +msgstr "ذاكرة النظام" #: js/messages.php:96 msgid "System swap" From 358fe9e2db16171c374e58195080ef4fd1e3f5e9 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 22:05:21 +0200 Subject: [PATCH 092/107] Translation update done using Pootle. --- po/ar.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ar.po b/po/ar.po index c07f0a558f..30d508c29f 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1157,7 +1157,7 @@ msgstr "كيلوبايت" #: js/messages.php:100 msgid "Average load" -msgstr "" +msgstr "متوسط التحميل" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:102 From fddf190ebf6020a46e08436e4ec9bf22f429a320 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 22:05:29 +0200 Subject: [PATCH 093/107] Translation update done using Pootle. --- po/ar.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 30d508c29f..8599bb0b4b 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1161,10 +1161,9 @@ msgstr "متوسط التحميل" #. l10n: Questions is the name of a MySQL Status variable #: js/messages.php:102 -#, fuzzy #| msgid "Versions" msgid "Questions" -msgstr "نسخ" +msgstr "العمليات" #: js/messages.php:103 server_status.php:894 msgid "Traffic" From e6aec890e1e93b5d7d91b2085ab83ed096b691f2 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 22:05:39 +0200 Subject: [PATCH 094/107] Translation update done using Pootle. --- po/ar.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 8599bb0b4b..90896e49be 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1171,10 +1171,9 @@ msgstr "بيانات سير" #: js/messages.php:104 libraries/server_links.inc.php:73 #: server_status.php:1324 -#, fuzzy #| msgid "General relation features" msgid "Settings" -msgstr "المزايا العامّة للرابط" +msgstr "الإعدادات" #: js/messages.php:105 #, fuzzy From d3eece0801d7ce4526dc62afcd5474cfb4504c30 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 22:05:58 +0200 Subject: [PATCH 095/107] Translation update done using Pootle. --- po/ar.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 90896e49be..19a23f0b19 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1176,10 +1176,9 @@ msgid "Settings" msgstr "الإعدادات" #: js/messages.php:105 -#, fuzzy #| msgid "Remove database" msgid "Remove chart" -msgstr "حذف قاعدة البيانات" +msgstr "حذف الرسم البياني" #: js/messages.php:106 msgid "Edit labels and series" From 1ef456176905bafe20b0af69631176f22535d5c9 Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 22:06:23 +0200 Subject: [PATCH 096/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index 19a23f0b19..e165fad3f3 100644 --- a/po/ar.po +++ b/po/ar.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-25 22:05+0200\n" +"PO-Revision-Date: 2011-07-25 22:06+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -1182,7 +1182,7 @@ msgstr "حذف الرسم البياني" #: js/messages.php:106 msgid "Edit labels and series" -msgstr "" +msgstr "حذف العناوين والسلاسل" #: js/messages.php:107 msgid "Add chart to grid" From c50d21541bd80f8870ebb5f4ceedbb81a1d4aabe Mon Sep 17 00:00:00 2001 From: Abdullah Al-Saedi Date: Mon, 25 Jul 2011 22:07:25 +0200 Subject: [PATCH 097/107] Translation update done using Pootle. --- po/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ar.po b/po/ar.po index e165fad3f3..39cf4de9ba 100644 --- a/po/ar.po +++ b/po/ar.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-25 22:06+0200\n" +"PO-Revision-Date: 2011-07-25 22:07+0200\n" "Last-Translator: Abdullah Al-Saedi \n" "Language-Team: arabic \n" "Language: ar\n" @@ -1190,7 +1190,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 9525cac85cb206f6ab6da2f56f85e613f17b601b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 26 Jul 2011 07:21:27 +0200 Subject: [PATCH 098/107] Update CodeMirror to 2.12 --- js/codemirror/lib/codemirror.js | 421 ++++++++++++++++++++------------ 1 file changed, 265 insertions(+), 156 deletions(-) diff --git a/js/codemirror/lib/codemirror.js b/js/codemirror/lib/codemirror.js index 844c54a3ff..27bec72ff1 100644 --- a/js/codemirror/lib/codemirror.js +++ b/js/codemirror/lib/codemirror.js @@ -21,7 +21,7 @@ var CodeMirror = (function() { wrapper.innerHTML = '
' + // Wraps and hides input textarea '
' + - '
' + + '
' + '
' + // Set to the height of the text, causes scrolling '
' + '
' + // Moved around its parent to cover visible view @@ -72,19 +72,17 @@ var CodeMirror = (function() { var editing, bracketHighlighted; // Tracks the maximum line length so that the horizontal scrollbar // can be kept static when scrolling. - var maxLine = ""; + var maxLine = "", maxWidth; - // Initialize the content. Somewhat hacky (delayed prepareInput) - // to work around browser issues. + // Initialize the content. operation(function(){setValue(options.value || ""); updateInput = false;})(); - setTimeout(prepareInput, 20); // Register our event handlers. connect(scroller, "mousedown", operation(onMouseDown)); // Gecko browsers fire contextmenu *after* opening the menu, at // which point we can't mess with it anymore. Context menu is // handled in onMouseDown for Gecko. - if (!gecko) connect(scroller, "contextmenu", operation(onContextMenu)); + if (!gecko) connect(scroller, "contextmenu", onContextMenu); connect(code, "dblclick", operation(onDblClick)); connect(scroller, "scroll", function() {updateDisplay([]); if (options.onScroll) options.onScroll(instance);}); connect(window, "resize", function() {updateDisplay(true);}); @@ -94,8 +92,8 @@ var CodeMirror = (function() { connect(input, "focus", onFocus); connect(input, "blur", onBlur); - connect(scroller, "dragenter", function(e){e.stop();}); - connect(scroller, "dragover", function(e){e.stop();}); + connect(scroller, "dragenter", e_stop); + connect(scroller, "dragover", e_stop); connect(scroller, "drop", operation(onDrop)); connect(scroller, "paste", function(){focusInput(); fastPoll();}); connect(input, "paste", function(){fastPoll();}); @@ -104,7 +102,7 @@ var CodeMirror = (function() { // IE throws unspecified error in certain cases, when // trying to access activeElement before onload var hasFocus; try { hasFocus = (targetDocument.activeElement == input); } catch(e) { } - if (hasFocus) onFocus(); + if (hasFocus) setTimeout(onFocus, 20); else onBlur(); function isLine(l) {return l >= 0 && l < lines.length;} @@ -124,6 +122,7 @@ var CodeMirror = (function() { if (option == "lineNumbers" || option == "gutter") gutterChanged(); else if (option == "mode" || option == "indentUnit") loadMode(); else if (option == "readOnly" && value == "nocursor") input.blur(); + else if (option == "theme") scroller.className = scroller.className.replace(/cm-s-\w+/, "cm-s-" + value); }, getOption: function(option) {return options[option];}, undo: operation(undo), @@ -135,6 +134,10 @@ var CodeMirror = (function() { pos = clipPos(pos); return lines[pos.line].getTokenAt(mode, getStateBefore(pos.line), pos.ch); }, + getStateAfter: function(line) { + line = clipLine(line == null ? lines.length - 1: line); + return getStateBefore(line + 1); + }, cursorCoords: function(start){ if (start == null) start = sel.inverted; return pageCoords(start ? sel.from : sel.to); @@ -151,13 +154,25 @@ var CodeMirror = (function() { clearMarker: removeGutterMarker, setLineClass: operation(setLineClass), lineInfo: lineInfo, - addWidget: function(pos, node, scroll) { - var pos = localCoords(clipPos(pos), true); - node.style.top = (showingFrom * lineHeight() + pos.yBot + paddingTop()) + "px"; - node.style.left = (pos.x + paddingLeft()) + "px"; + addWidget: function(pos, node, scroll, where) { + pos = localCoords(clipPos(pos)); + var top = pos.yBot, left = pos.x; + node.style.position = "absolute"; code.appendChild(node); + node.style.left = left + "px"; + if (where == "over") top = pos.y; + else if (where == "near") { + var vspace = Math.max(scroller.offsetHeight, lines.length * lineHeight()), + hspace = Math.max(code.clientWidth, lineSpace.clientWidth) - paddingLeft(); + if (pos.yBot + node.offsetHeight > vspace && pos.y > node.offsetHeight) + top = pos.y - node.offsetHeight; + if (left + node.offsetWidth > hspace) + left = hspace - node.offsetWidth; + } + node.style.top = (top + paddingTop()) + "px"; + node.style.left = (left + paddingLeft()) + "px"; if (scroll) - scrollIntoView(pos.x, pos.yBot, pos.x + node.offsetWidth, pos.yBot + node.offsetHeight); + scrollIntoView(left, top, left + node.offsetWidth, top + node.offsetHeight); }, lineCount: function() {return lines.length;}, @@ -184,7 +199,8 @@ var CodeMirror = (function() { operation: function(f){return operation(f)();}, refresh: function(){updateDisplay(true);}, getInputField: function(){return input;}, - getWrapperElement: function(){return wrapper;} + getWrapperElement: function(){return wrapper;}, + getScrollerElement: function(){return scroller;} }; function setValue(code) { @@ -202,28 +218,39 @@ var CodeMirror = (function() { } function onMouseDown(e) { + // Check whether this is a click in a widget + for (var n = e_target(e); n != wrapper; n = n.parentNode) + if (n.parentNode == code && n != mover) return; var ld = lastDoubleClick; lastDoubleClick = null; // First, see if this is a click in the gutter - for (var n = e.target(); n != wrapper; n = n.parentNode) + for (var n = e_target(e); n != wrapper; n = n.parentNode) if (n.parentNode == gutterText) { if (options.onGutterClick) options.onGutterClick(instance, indexOf(gutterText.childNodes, n) + showingFrom); - return e.stop(); + return e_preventDefault(e); } - if (gecko && e.button() == 3) onContextMenu(e); - if (e.button() != 1) return; + var start = posFromMouse(e); + + switch (e_button(e)) { + case 3: + if (gecko && !mac) onContextMenu(e); + return; + case 2: + if (start) setCursor(start.line, start.ch, true); + return; + } // For button 1, if it was clicked inside the editor // (posFromMouse returning non-null), we have to adjust the // selection. - var start = posFromMouse(e), last = start, going; - if (!start) {if (e.target() == scroller) e.stop(); return;} + if (!start) {if (e_target(e) == scroller) e_preventDefault(e); return;} if (!focused) onFocus(); - e.stop(); + e_preventDefault(e); if (ld && +new Date - ld < 400) return selectLine(start.line); setCursor(start.line, start.ch, true); + var last = start, going; // And then we have to see if it's a drag event, in which case // the dragged-over text must be selected. function end() { @@ -246,14 +273,14 @@ var CodeMirror = (function() { var move = connect(targetDocument, "mousemove", operation(function(e) { clearTimeout(going); - e.stop(); + e_preventDefault(e); extend(e); }), true); var up = connect(targetDocument, "mouseup", operation(function(e) { clearTimeout(going); var cur = posFromMouse(e); if (cur) setSelectionUser(start, cur); - e.stop(); + e_preventDefault(e); end(); }), true); } @@ -261,15 +288,14 @@ var CodeMirror = (function() { var pos = posFromMouse(e); if (!pos) return; selectWordAt(pos); - e.stop(); + e_preventDefault(e); lastDoubleClick = +new Date; } function onDrop(e) { - var pos = posFromMouse(e, true), files = e.e.dataTransfer.files; + e.preventDefault(); + var pos = posFromMouse(e, true), files = e.dataTransfer.files; if (!pos || options.readOnly) return; if (files && files.length && window.FileReader && window.File) { - var n = files.length, text = Array(n), read = 0; - for (var i = 0; i < n; ++i) loadFile(files[i], i); function loadFile(file, i) { var reader = new FileReader; reader.onload = function() { @@ -278,10 +304,12 @@ var CodeMirror = (function() { }; reader.readAsText(file); } + var n = files.length, text = Array(n), read = 0; + for (var i = 0; i < n; ++i) loadFile(files[i], i); } else { try { - var text = e.e.dataTransfer.getData("Text"); + var text = e.dataTransfer.getData("Text"); if (text) replaceRange(text, pos, pos); } catch(e){} @@ -290,25 +318,27 @@ var CodeMirror = (function() { function onKeyDown(e) { if (!focused) onFocus(); - var code = e.e.keyCode; + var code = e.keyCode; + // IE does strange things with escape. + if (ie && code == 27) { e.returnValue = false; } // Tries to detect ctrl on non-mac, cmd on mac. - var mod = (mac ? e.e.metaKey : e.e.ctrlKey) && !e.e.altKey, anyMod = e.e.ctrlKey || e.e.altKey || e.e.metaKey; - if (code == 16 || e.e.shiftKey) shiftSelecting = shiftSelecting || (sel.inverted ? sel.to : sel.from); + var mod = (mac ? e.metaKey : e.ctrlKey) && !e.altKey, anyMod = e.ctrlKey || e.altKey || e.metaKey; + if (code == 16 || e.shiftKey) shiftSelecting = shiftSelecting || (sel.inverted ? sel.to : sel.from); else shiftSelecting = null; // First give onKeyEvent option a chance to handle this. - if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e.e))) return; + if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e))) return; - if (code == 33 || code == 34) {scrollPage(code == 34); return e.stop();} // page up/down + if (code == 33 || code == 34) {scrollPage(code == 34); return e_preventDefault(e);} // page up/down if (mod && ((code == 36 || code == 35) || // ctrl-home/end mac && (code == 38 || code == 40))) { // cmd-up/down - scrollEnd(code == 36 || code == 38); return e.stop(); + scrollEnd(code == 36 || code == 38); return e_preventDefault(e); } - if (mod && code == 65) {selectAll(); return e.stop();} // ctrl-a + if (mod && code == 65) {selectAll(); return e_preventDefault(e);} // ctrl-a if (!options.readOnly) { if (!anyMod && code == 13) {return;} // enter - if (!anyMod && code == 9 && handleTab(e.e.shiftKey)) return e.stop(); // tab - if (mod && code == 90) {undo(); return e.stop();} // ctrl-z - if (mod && ((e.e.shiftKey && code == 90) || code == 89)) {redo(); return e.stop();} // ctrl-shift-z, ctrl-y + if (!anyMod && code == 9 && handleTab(e.shiftKey)) return e_preventDefault(e); // tab + if (mod && code == 90) {undo(); return e_preventDefault(e);} // ctrl-z + if (mod && ((e.shiftKey && code == 90) || code == 89)) {redo(); return e_preventDefault(e);} // ctrl-shift-z, ctrl-y } // Key id to use in the movementKeys map. We also pass it to @@ -328,42 +358,47 @@ var CodeMirror = (function() { fastPoll(curKeyId); } function onKeyUp(e) { - if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e.e))) return; + if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e))) return; if (reducedSelection) { reducedSelection = null; updateInput = true; } - if (e.e.keyCode == 16) shiftSelecting = null; + if (e.keyCode == 16) shiftSelecting = null; } function onKeyPress(e) { - if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e.e))) return; + if (options.onKeyEvent && options.onKeyEvent(instance, addStop(e))) return; if (options.electricChars && mode.electricChars) { - var ch = String.fromCharCode(e.e.charCode == null ? e.e.keyCode : e.e.charCode); + var ch = String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode); if (mode.electricChars.indexOf(ch) > -1) setTimeout(operation(function() {indentLine(sel.to.line, "smart");}), 50); } - var code = e.e.keyCode; + var code = e.keyCode; // Re-stop tab and enter. Necessary on some browsers. - if (code == 13) {if (!options.readOnly) handleEnter(); e.stop();} - else if (!e.e.ctrlKey && !e.e.altKey && !e.e.metaKey && code == 9 && options.tabMode != "default") e.stop(); + if (code == 13) {if (!options.readOnly) handleEnter(); e_preventDefault(e);} + else if (!e.ctrlKey && !e.altKey && !e.metaKey && code == 9 && options.tabMode != "default") e_preventDefault(e); else fastPoll(curKeyId); } function onFocus() { if (options.readOnly == "nocursor") return; - if (!focused && options.onFocus) options.onFocus(instance); - focused = true; + if (!focused) { + if (options.onFocus) options.onFocus(instance); + focused = true; + if (wrapper.className.search(/\bCodeMirror-focused\b/) == -1) + wrapper.className += " CodeMirror-focused"; + if (!leaveInputAlone) prepareInput(); + } slowPoll(); - if (wrapper.className.search(/\bCodeMirror-focused\b/) == -1) - wrapper.className += " CodeMirror-focused"; restartBlink(); } function onBlur() { - if (focused && options.onBlur) options.onBlur(instance); + if (focused) { + if (options.onBlur) options.onBlur(instance); + focused = false; + wrapper.className = wrapper.className.replace(" CodeMirror-focused", ""); + } clearInterval(blinker); - shiftSelecting = null; - focused = false; - wrapper.className = wrapper.className.replace(" CodeMirror-focused", ""); + setTimeout(function() {if (!focused) shiftSelecting = null;}, 150); } // Replace the range from from to to by the strings in newText. @@ -386,6 +421,7 @@ var CodeMirror = (function() { var pos = clipPos({line: change.start + change.old.length - 1, ch: editEnd(replaced[replaced.length-1], change.old[change.old.length-1])}); updateLinesNoUndo({line: change.start, ch: 0}, {line: end - 1, ch: lines[end-1].text.length}, change.old, pos, pos); + updateInput = true; } } function undo() {unredoHelper(history.done, history.undone);} @@ -393,7 +429,7 @@ var CodeMirror = (function() { function updateLinesNoUndo(from, to, newText, selFrom, selTo) { var recomputeMaxLength = false, maxLineLength = maxLine.length; - for (var i = from.line; i < to.line; ++i) { + for (var i = from.line; i <= to.line; ++i) { if (lines[i].text.length == maxLineLength) {recomputeMaxLength = true; break;} } @@ -427,12 +463,12 @@ var CodeMirror = (function() { for (var i = from.line, e = i + newText.length; i < e; ++i) { var l = lines[i].text; if (l.length > maxLineLength) { - maxLine = l; maxLineLength = l.length; + maxLine = l; maxLineLength = l.length; maxWidth = null; recomputeMaxLength = false; } } if (recomputeMaxLength) { - maxLineLength = 0; + maxLineLength = 0; maxLine = ""; maxWidth = null; for (var i = 0, e = lines.length; i < e; ++i) { var l = lines[i].text; if (l.length > maxLineLength) { @@ -449,7 +485,12 @@ var CodeMirror = (function() { if (task < from.line) newWork.push(task); else if (task > to.line) newWork.push(task + lendiff); } - if (newText.length) newWork.push(from.line); + if (newText.length < 5) { + highlightLines(from.line, from.line + newText.length); + newWork.push(from.line + newText.length); + } else { + newWork.push(from.line); + } work = newWork; startWorker(100); // Remember that these lines changed, for updating the display @@ -537,7 +578,7 @@ var CodeMirror = (function() { // to the data in the editing variable, and updates the editor // content or cursor if something changed. function readInput() { - if (leaveInputAlone) return; + if (leaveInputAlone || !focused) return; var changed = false, text = input.value, sr = selRange(input); if (!sr) return false; var changed = editing.text != text, rs = reducedSelection; @@ -565,13 +606,10 @@ var CodeMirror = (function() { // so that you can, for example, press shift-up at the start of // your selection and have the right thing happen. if (rs) { - from = sr.start == rs.anchor ? to : from; - to = shiftSelecting ? sel.to : sr.start == rs.anchor ? from : to; - if (!posLess(from, to)) { - reducedSelection = null; - sel.inverted = false; - var tmp = from; from = to; to = tmp; - } + var head = sr.start == rs.anchor ? to : from; + var tail = shiftSelecting ? sel.to : sr.start == rs.anchor ? from : to; + if (sel.inverted = posLess(head, tail)) { from = head; to = tail; } + else { reducedSelection = null; from = tail; to = head; } } // In some cases (cursor on same line as before), we don't have @@ -591,8 +629,8 @@ var CodeMirror = (function() { var ch = nl > -1 ? start - nl : start, endline = editing.to - 1, edend = editing.text.length; for (;;) { c = editing.text.charAt(edend); - if (c == "\n") endline--; if (text.charAt(end) != c) {++end; ++edend; break;} + if (c == "\n") endline--; if (edend <= start || end <= start) break; --end; --edend; } @@ -731,8 +769,15 @@ var CodeMirror = (function() { updateGutter(); } - var textWidth = stringWidth(maxLine); - lineSpace.style.width = textWidth > scroller.clientWidth ? textWidth + "px" : ""; + if (maxWidth == null) maxWidth = stringWidth(maxLine); + if (maxWidth > scroller.clientWidth) { + lineSpace.style.width = maxWidth + "px"; + // Needed to prevent odd wrapping/hiding of widgets placed in here. + code.style.width = ""; + code.style.width = scroller.scrollWidth + "px"; + } else { + lineSpace.style.width = code.style.width = ""; + } // Since this is all rather error prone, it is honoured with the // only assertion in the whole file. @@ -807,7 +852,7 @@ var CodeMirror = (function() { var hText = mover.offsetHeight, hEditor = scroller.clientHeight; gutter.style.height = (hText - hEditor < 2 ? hEditor : hText) + "px"; var html = []; - for (var i = showingFrom; i < showingTo; ++i) { + for (var i = showingFrom; i < Math.max(showingTo, showingFrom + 1); ++i) { var marker = lines[i].gutterMarker; var text = options.lineNumbers ? i + options.firstLineNumber : null; if (marker && marker.text) @@ -850,10 +895,9 @@ var CodeMirror = (function() { if (posEq(sel.from, from) && posEq(sel.to, to)) return; if (posLess(to, from)) {var tmp = to; to = from; from = tmp;} - var startEq = posEq(sel.to, to), endEq = posEq(sel.from, from); if (posEq(from, to)) sel.inverted = false; - else if (startEq && !endEq) sel.inverted = true; - else if (endEq && !startEq) sel.inverted = false; + else if (posEq(from, sel.to)) sel.inverted = false; + else if (posEq(to, sel.from)) sel.inverted = true; // Some ugly logic used to only mark the lines that actually did // see a change in selection as changed, rather than the whole @@ -926,12 +970,17 @@ var CodeMirror = (function() { indentLine(sel.from.line, options.enterMode == "keep" ? "prev" : "smart"); } function handleTab(shift) { + function indentSelected(mode) { + if (posEq(sel.from, sel.to)) return indentLine(sel.from.line, mode); + var e = sel.to.line - (sel.to.ch ? 0 : 1); + for (var i = sel.from.line; i <= e; ++i) indentLine(i, mode); + } shiftSelecting = null; switch (options.tabMode) { case "default": return false; case "indent": - for (var i = sel.from.line, e = sel.to.line; i <= e; ++i) indentLine(i, "smart"); + indentSelected("smart"); break; case "classic": if (posEq(sel.from, sel.to)) { @@ -940,7 +989,7 @@ var CodeMirror = (function() { break; } case "shift": - for (var i = sel.from.line, e = sel.to.line; i <= e; ++i) indentLine(i, shift ? "subtract" : "add"); + indentSelected(shift ? "subtract" : "add"); break; } return true; @@ -1121,7 +1170,9 @@ var CodeMirror = (function() { function paddingLeft() {return lineSpace.offsetLeft;} function posFromMouse(e, liberal) { - var offW = eltOffset(scroller, true), x = e.e.clientX, y = e.e.clientY; + var offW = eltOffset(scroller, true), x, y; + // Fails unpredictably on IE[67] when mouse is dragged around quickly. + try { x = e.clientX; y = e.clientY; } catch (e) { return null; } // This is a mess of a heuristic to try and determine whether a // scroll-bar was clicked or not, and to return null if one was // (and !liberal). @@ -1135,18 +1186,21 @@ var CodeMirror = (function() { var pos = posFromMouse(e); if (!pos || window.opera) return; // Opera is difficult. if (posEq(sel.from, sel.to) || posLess(pos, sel.from) || !posLess(pos, sel.to)) - setCursor(pos.line, pos.ch); + operation(setCursor)(pos.line, pos.ch); var oldCSS = input.style.cssText; - input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.pageY() - 1) + - "px; left: " + (e.pageX() - 1) + "px; z-index: 1000; background: white; " + - "border-width: 0; outline: none; overflow: hidden;"; + inputDiv.style.position = "absolute"; + input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e_pageY(e) - 1) + + "px; left: " + (e_pageX(e) - 1) + "px; z-index: 1000; background: white; " + + "border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);"; + leaveInputAlone = true; var val = input.value = getSelection(); focusInput(); setSelRange(input, 0, input.value.length); - leaveInputAlone = true; function rehide() { - if (input.value != val) operation(replaceSelection)(input.value, "end"); + var newVal = splitLines(input.value).join("\n"); + if (newVal != val) operation(replaceSelection)(newVal, "end"); + inputDiv.style.position = "relative"; input.style.cssText = oldCSS; leaveInputAlone = false; prepareInput(); @@ -1154,7 +1208,7 @@ var CodeMirror = (function() { } if (gecko) { - e.stop() + e_stop(e); var mouseup = connect(window, "mouseup", function() { mouseup(); setTimeout(rehide, 20); @@ -1201,19 +1255,20 @@ var CodeMirror = (function() { } } } - for (var i = head.line, e = forward ? Math.min(i + 50, lines.length) : Math.max(-1, i - 50); i != e; i+=d) { + for (var i = head.line, e = forward ? Math.min(i + 100, lines.length) : Math.max(-1, i - 100); i != e; i+=d) { var line = lines[i], first = i == head.line; var found = scan(line, first && forward ? pos + 1 : 0, first && !forward ? pos : line.text.length); - if (found) { - var style = found.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket"; - var one = markText({line: head.line, ch: pos}, {line: head.line, ch: pos+1}, style), - two = markText({line: i, ch: found.pos}, {line: i, ch: found.pos + 1}, style); - var clear = operation(function(){one(); two();}); - if (autoclear) setTimeout(clear, 800); - else bracketHighlighted = clear; - break; - } + if (found) break; } + if (!found) found = {pos: null, match: false}; + var style = found.match ? "CodeMirror-matchingbracket" : "CodeMirror-nonmatchingbracket"; + var one = markText({line: head.line, ch: pos}, {line: head.line, ch: pos+1}, style), + two = found.pos != null + ? markText({line: i, ch: found.pos}, {line: i, ch: found.pos + 1}, style) + : function() {}; + var clear = operation(function(){one(); two();}); + if (autoclear) setTimeout(clear, 800); + else bracketHighlighted = clear; } // Finds the line to start with when starting a parse. Tries to @@ -1244,38 +1299,49 @@ var CodeMirror = (function() { line.highlight(mode, state); line.stateAfter = copyState(mode, state); } - if (!lines[n].stateAfter) work.push(n); + if (n < lines.length && !lines[n].stateAfter) work.push(n); return state; } + function highlightLines(start, end) { + var state = getStateBefore(start); + for (var i = start; i < end; ++i) { + var line = lines[i]; + line.highlight(mode, state); + line.stateAfter = copyState(mode, state); + } + } function highlightWorker() { var end = +new Date + options.workTime; - var didSomething = false; + var foundWork = work.length; while (work.length) { if (!lines[showingFrom].stateAfter) var task = showingFrom; else var task = work.pop(); if (task >= lines.length) continue; - didSomething = true; var start = findStartLine(task), state = start && lines[start-1].stateAfter; if (state) state = copyState(mode, state); else state = startState(mode); - var unchanged = 0; + var unchanged = 0, compare = mode.compareStates; for (var i = start, l = lines.length; i < l; ++i) { var line = lines[i], hadState = line.stateAfter; if (+new Date > end) { work.push(i); startWorker(options.workDelay); - changes.push({from: task, to: i}); + changes.push({from: task, to: i + 1}); return; } var changed = line.highlight(mode, state); line.stateAfter = copyState(mode, state); - if (changed || !hadState) unchanged = 0; - else if (++unchanged > 3) break; + if (compare) { + if (hadState && compare(hadState, state)) break; + } else { + if (changed || !hadState) unchanged = 0; + else if (++unchanged > 3) break; + } } - changes.push({from: task, to: i}); + changes.push({from: task, to: i + 1}); } - if (didSomething && options.onHighlightComplete) + if (foundWork && options.onHighlightComplete) options.onHighlightComplete(instance); } function startWorker(time) { @@ -1300,7 +1366,8 @@ var CodeMirror = (function() { // updateInput can be set to a boolean value to force/prevent an // update. - if (!leaveInputAlone && (updateInput === true || (updateInput !== false && selectionChanged))) + if (focused && !leaveInputAlone && + (updateInput === true || (updateInput !== false && selectionChanged))) prepareInput(); if (selectionChanged && options.matchBrackets) @@ -1427,9 +1494,21 @@ var CodeMirror = (function() { }, from: function() {if (this.atOccurrence) return copyPos(this.pos.from);}, - to: function() {if (this.atOccurrence) return copyPos(this.pos.to);} + to: function() {if (this.atOccurrence) return copyPos(this.pos.to);}, + + replace: function(newText) { + var self = this; + if (this.atOccurrence) + operation(function() { + self.pos.to = replaceRange(newText, self.pos.from, self.pos.to); + })(); + } }; + for (var ext in extensions) + if (extensions.propertyIsEnumerable(ext) && + !instance.propertyIsEnumerable(ext)) + instance[ext] = extensions[ext]; return instance; } // (end of function CodeMirror) @@ -1437,6 +1516,7 @@ var CodeMirror = (function() { CodeMirror.defaults = { value: "", mode: null, + theme: "default", indentUnit: 2, indentWithTabs: false, tabMode: "classic", @@ -1482,7 +1562,7 @@ var CodeMirror = (function() { return CodeMirror.getMode(options, "text/plain"); } return mfactory(options, config || {}); - } + }; CodeMirror.listModes = function() { var list = []; for (var m in modes) @@ -1496,6 +1576,11 @@ var CodeMirror = (function() { return list; }; + var extensions = {}; + CodeMirror.defineExtension = function(name, func) { + extensions[name] = func; + }; + CodeMirror.fromTextArea = function(textarea, options) { if (!options) options = {}; options.value = textarea.value; @@ -1727,7 +1812,7 @@ var CodeMirror = (function() { var str = st[i], l = str.length; if (ch + l > len) str = str.slice(0, len - ch); ch += l; - span(str, st[i+1]); + span(str, "cm-" + st[i+1]); } else { var pos = 0, i = 0, text = "", style, sg = 0; @@ -1759,12 +1844,12 @@ var CodeMirror = (function() { } for (;;) { var end = pos + text.length; - var apliedStyle = style; - if (extraStyle) apliedStyle = style ? style + extraStyle : extraStyle; - span(end > upto ? text.slice(0, upto - pos) : text, apliedStyle); + var appliedStyle = style; + if (extraStyle) appliedStyle = style ? style + extraStyle : extraStyle; + span(end > upto ? text.slice(0, upto - pos) : text, appliedStyle); if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;} pos = end; - text = st[i++]; style = st[i++]; + text = st[i++]; style = "cm-" + st[i++]; } } if (sfrom != null && sto == null) span(" ", "CodeMirror-selected"); @@ -1822,44 +1907,44 @@ var CodeMirror = (function() { } }; - // Event stopping compatibility wrapper. - function stopEvent() { - if (this.preventDefault) {this.preventDefault(); this.stopPropagation();} - else {this.returnValue = false; this.cancelBubble = true;} - } + function stopMethod() {e_stop(this);} // Ensure an event has a stop method. function addStop(event) { - if (!event.stop) event.stop = stopEvent; + if (!event.stop) event.stop = stopMethod; return event; } - // Event wrapper, exposing the few operations we need. - function Event(orig) {this.e = orig;} - Event.prototype = { - stop: function() {stopEvent.call(this.e);}, - target: function() {return this.e.target || this.e.srcElement;}, - button: function() { - if (this.e.which) return this.e.which; - else if (this.e.button & 1) return 1; - else if (this.e.button & 2) return 3; - else if (this.e.button & 4) return 2; - }, - pageX: function() { - if (this.e.pageX != null) return this.e.pageX; - var doc = this.target().ownerDocument; - return this.e.clientX + doc.body.scrollLeft + doc.documentElement.scrollLeft; - }, - pageY: function() { - if (this.e.pageY != null) return this.e.pageY; - var doc = this.target().ownerDocument; - return this.e.clientY + doc.body.scrollTop + doc.documentElement.scrollTop; - } - }; + function e_preventDefault(e) { + if (e.preventDefault) e.preventDefault(); + else e.returnValue = false; + } + function e_stopPropagation(e) { + if (e.stopPropagation) e.stopPropagation(); + else e.cancelBubble = true; + } + function e_stop(e) {e_preventDefault(e); e_stopPropagation(e);} + function e_target(e) {return e.target || e.srcElement;} + function e_button(e) { + if (e.which) return e.which; + else if (e.button & 1) return 1; + else if (e.button & 2) return 3; + else if (e.button & 4) return 2; + } + function e_pageX(e) { + if (e.pageX != null) return e.pageX; + var doc = e_target(e).ownerDocument; + return e.clientX + doc.body.scrollLeft + doc.documentElement.scrollLeft; + } + function e_pageY(e) { + if (e.pageY != null) return e.pageY; + var doc = e_target(e).ownerDocument; + return e.clientY + doc.body.scrollTop + doc.documentElement.scrollTop; + } // Event handler registration. If disconnect is true, it'll return a // function that unregisters the handler. function connect(node, type, handler, disconnect) { - function wrapHandler(event) {handler(new Event(event || window.event));} + function wrapHandler(event) {handler(event || window.event);} if (typeof node.addEventListener == "function") { node.addEventListener(type, wrapHandler, false); if (disconnect) return function() {node.removeEventListener(type, wrapHandler, false);}; @@ -1881,6 +1966,8 @@ var CodeMirror = (function() { })(); var gecko = /gecko\/\d{7}/i.test(navigator.userAgent); + var ie = /MSIE \d/.test(navigator.userAgent); + var safari = /Apple Computer/.test(navigator.vendor); var lineSep = "\n"; // Feature-detect whether newlines in textareas are converted to \r\n @@ -1910,17 +1997,21 @@ var CodeMirror = (function() { return n; } + function computedStyle(elt) { + if (elt.currentStyle) return elt.currentStyle; + return window.getComputedStyle(elt, null); + } // Find the position of an element by following the offsetParent chain. // If screen==true, it returns screen (rather than page) coordinates. function eltOffset(node, screen) { var doc = node.ownerDocument.body; - var x = 0, y = 0, hitDoc = false; + var x = 0, y = 0, skipDoc = false; for (var n = node; n; n = n.offsetParent) { x += n.offsetLeft; y += n.offsetTop; - // Fixed-position elements don't have the document in their offset chain - if (n == doc) hitDoc = true; + if (screen && computedStyle(n).position == "fixed") + skipDoc = true; } - var e = screen && hitDoc ? null : doc; + var e = screen && !skipDoc ? null : doc; for (var n = node.parentNode; n != e; n = n.parentNode) if (n.scrollLeft != null) { x -= n.scrollLeft; y -= n.scrollTop;} return {left: x, top: y}; @@ -1935,10 +2026,10 @@ var CodeMirror = (function() { function posLess(a, b) {return a.line < b.line || (a.line == b.line && a.ch < b.ch);} function copyPos(x) {return {line: x.line, ch: x.ch};} + var escapeElement = document.createElement("div"); function htmlEscape(str) { - return str.replace(/[<>&]/g, function(str) { - return str == "&" ? "&" : str == "<" ? "<" : ">"; - }); + escapeElement.innerText = escapeElement.textContent = str; + return escapeElement.innerHTML; } CodeMirror.htmlEscape = htmlEscape; @@ -1961,8 +2052,9 @@ var CodeMirror = (function() { // See if "".split is the broken IE version, if so, provide an // alternative way to split lines. + var splitLines, selRange, setSelRange; if ("\n\nb".split(/\n/).length != 3) - var splitLines = function(string) { + splitLines = function(string) { var pos = 0, nl, result = []; while ((nl = string.indexOf("\n", pos)) > -1) { result.push(string.slice(pos, string.charAt(nl-1) == "\r" ? nl - 1 : nl)); @@ -1972,23 +2064,39 @@ var CodeMirror = (function() { return result; }; else - var splitLines = function(string){return string.split(/\r?\n/);}; + splitLines = function(string){return string.split(/\r?\n/);}; CodeMirror.splitLines = splitLines; // Sane model of finding and setting the selection in a textarea if (window.getSelection) { - var selRange = function(te) { + selRange = function(te) { try {return {start: te.selectionStart, end: te.selectionEnd};} catch(e) {return null;} }; - var setSelRange = function(te, start, end) { - try {te.setSelectionRange(start, end);} - catch(e) {} // Fails on Firefox when textarea isn't part of the document - }; + if (safari) + // On Safari, selection set with setSelectionRange are in a sort + // of limbo wrt their anchor. If you press shift-left in them, + // the anchor is put at the end, and the selection expanded to + // the left. If you press shift-right, the anchor ends up at the + // front. This is not what CodeMirror wants, so it does a + // spurious modify() call to get out of limbo. + setSelRange = function(te, start, end) { + if (start == end) + te.setSelectionRange(start, end); + else { + te.setSelectionRange(start, end - 1); + window.getSelection().modify("extend", "forward", "character"); + } + }; + else + setSelRange = function(te, start, end) { + try {te.setSelectionRange(start, end);} + catch(e) {} // Fails on Firefox when textarea isn't part of the document + }; } // IE model. Don't ask. else { - var selRange = function(te) { + selRange = function(te) { try {var range = te.ownerDocument.selection.createRange();} catch(e) {return null;} if (!range || range.parentElement() != te) return null; @@ -2010,7 +2118,7 @@ var CodeMirror = (function() { for (var i = val.indexOf("\r"); i > -1 && i < end; i = val.indexOf("\r", i+1), end++) {} return {start: start, end: end}; }; - var setSelRange = function(te, start, end) { + setSelRange = function(te, start, end) { var range = te.createTextRange(); range.collapse(true); var endrange = range.duplicate(); @@ -2032,4 +2140,5 @@ var CodeMirror = (function() { CodeMirror.defineMIME("text/plain", "null"); return CodeMirror; -})(); +})() +; \ No newline at end of file From 402a832e93192a043b79bc379ff5be80a93a8da1 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Fri, 22 Jul 2011 12:59:49 +0100 Subject: [PATCH 099/107] Fixed bug #3375325 - Page list in navigation frame looks odd --- ChangeLog | 1 + themes/pmahomme/css/theme_left.css.php | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03daef06fb..5b028570c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 3.4.5.0 (not yet released) +- bug #3375325 [interface] Page list in navigation frame looks odd 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php index 467e70a255..990feebabb 100644 --- a/themes/pmahomme/css/theme_left.css.php +++ b/themes/pmahomme/css/theme_left.css.php @@ -113,15 +113,22 @@ ul#databaseList span { } ul#databaseList a { + color: #333; + background: url(./themes/pmahomme/img/database.png) no-repeat 0% 50% transparent; display: block; - padding:5px; + padding: 5px; font-style: normal; } +div#navidbpageselector { + margin: 0.1em; + text-align: center; +} + div#navidbpageselector a, -ul#databaseList a { - background:url(./themes/pmahomme/img/database.png) no-repeat 0% 50% transparent; - color: #333; +div#navidbpageselector select{ + color: #333; + margin: 0.2em; } ul#databaseList ul { From f45c4292c1eccbb10569e78219b2bb32eb139852 Mon Sep 17 00:00:00 2001 From: Thilanka Kaushalya Date: Wed, 27 Jul 2011 19:56:23 +0530 Subject: [PATCH 100/107] 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 2141b5fe81d71d08524a11251a38fe5663b51ac7 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Wed, 27 Jul 2011 17:20:14 +0200 Subject: [PATCH 101/107] 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 102/107] 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 103/107] 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 104/107] 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 105/107] 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 106/107] 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 107/107] 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); } }