Git June 2011

git@phpmyadmin.net

7 participants
281 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_3, updated. RELEASE_3_4_3RC1-8-gd3b67a3
by Marc Delisle 27 Jun '11

27 Jun '11

The branch, MAINT_3_4_3 has been updated via d3b67a35a0df4969273529501788c68b4fddcc24 (commit) via e21d6073e46d41afbf0a09ba9bd38cd19f37e968 (commit) from 79d924add8c5e2070f7ab0301e1c98ac42fee806 (commit) - Log ----------------------------------------------------------------- commit d3b67a35a0df4969273529501788c68b4fddcc24 Merge: e21d6073e46d41afbf0a09ba9bd38cd19f37e968 79d924add8c5e2070f7ab0301e1c98ac42fee806 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 08:23:05 2011 -0400 Merge branch 'MAINT_3_4_3' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into MAINT_3_4_3 commit e21d6073e46d41afbf0a09ba9bd38cd19f37e968 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 08:20:21 2011 -0400 3.4.3 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 2 +- libraries/Config.class.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3a7ff6..cb3ba9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ phpMyAdmin - ChangeLog ====================== -3.4.3.0 (not yet released) +3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize - patch #3304473 [setup] Redefine a lable that was wrong - bug #3304544 [parser] master is not a reserved word diff --git a/Documentation.html b/Documentation.html index fb2a881..576c1f0 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.3-rc1 - Documentation</title> + <title>phpMyAdmin 3.4.3 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.3-rc1 + 3.4.3 Documentation </h1> </div> diff --git a/README b/README index 53a08eb..02ad016 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.3-rc1 +Version 3.4.3 A set of PHP-scripts to manage MySQL over the web. diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 7081f83..cd1a0bf 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.3-rc1'); + $this->set('PMA_VERSION', '3.4.3'); /** * @deprecated */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6296-g5e05e80
by Marc Delisle 27 Jun '11

27 Jun '11

The branch, master has been updated via 5e05e80086c8621ce0abf8442005d2f44b93b0e3 (commit) from 29e778d8e225d74aa714e6780af0fed033db5e4a (commit) - Log ----------------------------------------------------------------- commit 5e05e80086c8621ce0abf8442005d2f44b93b0e3 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 08:21:46 2011 -0400 3.4.3 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 34d07c5..d9d455e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,7 +31,7 @@ phpMyAdmin - ChangeLog - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes - bug #3323101 [parser] Invalid escape sequence in SQL parser -3.4.3.0 (not yet released) +3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize - patch #3304473 [setup] Redefine a lable that was wrong - bug #3304544 [parser] master is not a reserved word hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3RC1-16-gedf46c8
by Marc Delisle 27 Jun '11

27 Jun '11

The branch, QA_3_4 has been updated via edf46c8022020099ac953b2e16f36f4f99687d87 (commit) from 43c7f939c31e9304cacbbc456d999d9d6afc8682 (commit) - Log ----------------------------------------------------------------- commit edf46c8022020099ac953b2e16f36f4f99687d87 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 08:21:06 2011 -0400 3.4.3 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70dab96..71db213 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes - bug #3323101 [parser] Invalid escape sequence in SQL parser -3.4.3.0 (not yet released) +3.4.3.0 (2011-06-27) - bug #3311170 [sync] Missing helper icons in Synchronize - patch #3304473 [setup] Redefine a lable that was wrong - bug #3304544 [parser] master is not a reserved word hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6295-g29e778d
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, master has been updated via 29e778d8e225d74aa714e6780af0fed033db5e4a (commit) via 43c7f939c31e9304cacbbc456d999d9d6afc8682 (commit) via 79d924add8c5e2070f7ab0301e1c98ac42fee806 (commit) from 7f9797bc6af1dc2348b5b748b557e387ec164319 (commit) - Log ----------------------------------------------------------------- commit 29e778d8e225d74aa714e6780af0fed033db5e4a Merge: 7f9797bc6af1dc2348b5b748b557e387ec164319 43c7f939c31e9304cacbbc456d999d9d6afc8682 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 13:56:29 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: tbl_structure.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index 5406e9f..4bb3a03 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -258,7 +258,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { // for the case ENUM('–','“') $type = htmlspecialchars($type); if(strlen($type) > $GLOBALS['cfg']['LimitChars']) { - $type = '<abbr title="full text">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; + $type = '<abbr title="' . htmlspecialchars($type) . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; } $type_nowrap = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3RC1-15-g43c7f93
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, QA_3_4 has been updated via 43c7f939c31e9304cacbbc456d999d9d6afc8682 (commit) via 79d924add8c5e2070f7ab0301e1c98ac42fee806 (commit) from 5e28dbea224d21b2c03cd325ef67f36b42d2b58d (commit) - Log ----------------------------------------------------------------- commit 43c7f939c31e9304cacbbc456d999d9d6afc8682 Merge: 5e28dbea224d21b2c03cd325ef67f36b42d2b58d 79d924add8c5e2070f7ab0301e1c98ac42fee806 Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 13:56:05 2011 +0200 Merge branch 'MAINT_3_4_3' into QA_3_4 ----------------------------------------------------------------------- Summary of changes: tbl_structure.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index ffdb0d2..077dbcf 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -252,7 +252,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { // for the case ENUM('–','“') $type = htmlspecialchars($type); if(strlen($type) > $GLOBALS['cfg']['LimitChars']) { - $type = '<abbr title="full text">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; + $type = '<abbr title="' . htmlspecialchars($type) . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; } $type_nowrap = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_3, updated. RELEASE_3_4_3RC1-6-g79d924a
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, MAINT_3_4_3 has been updated via 79d924add8c5e2070f7ab0301e1c98ac42fee806 (commit) from 4bec3b3bee31a1bd88a176f8c1cd5033c970fece (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: tbl_structure.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index ffdb0d2..077dbcf 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -252,7 +252,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { // for the case ENUM('–','“') $type = htmlspecialchars($type); if(strlen($type) > $GLOBALS['cfg']['LimitChars']) { - $type = '<abbr title="full text">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; + $type = '<abbr title="' . htmlspecialchars($type) . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>'; } $type_nowrap = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6292-g7f9797b
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, master has been updated via 7f9797bc6af1dc2348b5b748b557e387ec164319 (commit) from 93db9fdc127ff086d5fa4f15abb25b9fd973e401 (commit) - Log ----------------------------------------------------------------- commit 7f9797bc6af1dc2348b5b748b557e387ec164319 Author: Tyron Madlener <tyronx(a)gmail.com> Date: Wed Jun 22 20:45:14 2011 +0200 Hides the bookmarkoptions checkboxes when the bookmark label is empty ----------------------------------------------------------------------- Summary of changes: js/sql.js | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/js/sql.js b/js/sql.js index b89d48b..14f4c05 100644 --- a/js/sql.js +++ b/js/sql.js @@ -187,6 +187,13 @@ $(document).ready(function() { cache: 'false' }); + /* Hides the bookmarkoptions checkboxes when the bookmark label is empty */ + $('input#bkm_label').keyup(function() { + $('input#id_bkm_all_users, input#id_bkm_replace') + .parent() + .toggle($(this).attr('value').length > 0); + }).trigger('keyup'); + /** * current value of the direction in which the table is displayed * @type String hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6291-g93db9fd
by Marc Delisle 27 Jun '11

27 Jun '11

The branch, master has been updated via 93db9fdc127ff086d5fa4f15abb25b9fd973e401 (commit) via 7ecd11483e9d245b524cac0dfff00abd090c5985 (commit) via 1970c357a30c44c410578bd4513dfb77125d6126 (commit) via f7157a5fc6d449a95e347224b59fa95ce1860c46 (commit) via 1d9f5cdf7354d02db0a39ddfbd9a775fbbdaff1f (commit) via 610509e3841f57cd244d624148f8125b0d9e2d1e (commit) via 146a8da5e93c3a187dd7ef2f5715be777b0e2d9e (commit) from 6b06041f340459bbcbb2dc306c64988e11ae7a42 (commit) - Log ----------------------------------------------------------------- commit 93db9fdc127ff086d5fa4f15abb25b9fd973e401 Merge: 7ecd11483e9d245b524cac0dfff00abd090c5985 6b06041f340459bbcbb2dc306c64988e11ae7a42 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 07:44:20 2011 -0400 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 7ecd11483e9d245b524cac0dfff00abd090c5985 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 07:43:15 2011 -0400 ChangeLog entry commit 1970c357a30c44c410578bd4513dfb77125d6126 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 07:39:47 2011 -0400 These are jQuery objects commit f7157a5fc6d449a95e347224b59fa95ce1860c46 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Jun 27 07:32:14 2011 -0400 Typos commit 1d9f5cdf7354d02db0a39ddfbd9a775fbbdaff1f Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jun 26 23:28:34 2011 +0530 Fixed bugs in show error message ine multi row change in table structure commit 610509e3841f57cd244d624148f8125b0d9e2d1e Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jun 25 21:26:56 2011 +0530 Fixed bugs in multi column change in table structure commit 146a8da5e93c3a187dd7ef2f5715be777b0e2d9e Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sat Jun 25 16:57:54 2011 +0530 Ajaxified the multi column change in table structure ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/functions.js | 7 ++- js/tbl_structure.js | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++- tbl_alter.php | 3 +- tbl_structure.php | 16 ++++---- 5 files changed, 121 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16c8f88..34d07c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,7 @@ phpMyAdmin - ChangeLog + [display] More options for browsing GIS data + [interface] Support for spatial indexes + [display] GIS data visualization ++ AJAX for table structure multiple-columns change 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/js/functions.js b/js/functions.js index 436805c..397f248 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2013,6 +2013,10 @@ $(document).ready(function() { * Hides certain table structure actions, replacing them with the word "More". They are displayed * in a dropdown menu when the user hovers over the word "More." */ + displayMoreTableOpts(); +}); + +function displayMoreTableOpts() { // Remove the actions from the table cells (they are available by default for JavaScript-disabled browsers) // if the table is not a view or information_schema (otherwise there is only one action to hide and there's no point) if($("input[type='hidden'][name='table_type']").val() == "table") { @@ -2081,8 +2085,7 @@ $(document).ready(function() { } }); } -}); - +} $(document).ready(initTooltips); /* Displays tooltips */ diff --git a/js/tbl_structure.js b/js/tbl_structure.js index 352848c..d1a2676 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -145,5 +145,109 @@ $(document).ready(function() { }) // end $.get() }) // end $.PMA_confirm() }) //end Drop Primary Key/Index - + + /** + *Ajax event handler for muti column change + **/ + $("#fieldsForm.ajax .mult_submit[value=change]").live('click', function(event){ + event.preventDefault(); + + /*Check whether atleast one row is selected for change*/ + if($("#tablestructure tbody tr").hasClass("marked")){ + var div = $('<div id="change_column_dialog"></div>'); + + /** + * @var button_options Object that stores the options passed to jQueryUI + * dialog + */ + var button_options = {}; + // in the following function we need to use $(this) + button_options[PMA_messages['strCancel']] = function() {$(this).parent().dialog('close').remove();} + + var button_options_error = {}; + button_options_error[PMA_messages['strOK']] = function() {$(this).parent().dialog('close').remove();} + var $form = $("#fieldsForm"); + var $msgbox = PMA_ajaxShowMessage(); + + $.get( $form.attr('action') , $form.serialize()+"&ajax_request=true&submit_mult=change" , function(data) { + //in the case of an error, show the error message returned. + if (data.success != undefined && data.success == false) { + div + .append(data.error) + .dialog({ + title: PMA_messages['strChangeTbl'], + height: 230, + width: 900, + open: PMA_verifyTypeOfAllColumns, + buttons : button_options_error + })// end dialog options + } else { + div + .append(data) + .dialog({ + title: PMA_messages['strChangeTbl'], + height: 600, + width: 900, + open: PMA_verifyTypeOfAllColumns, + buttons : button_options + }) + //Remove the top menu container from the dialog + .find("#topmenucontainer").hide() + ; // end dialog options + $("#append_fields_form input[name=do_save_data]").addClass("ajax"); + } + PMA_ajaxRemoveMessage($msgbox); + }) // end $.get() + } else { + PMA_ajaxShowMessage(PMA_messages['strNoRowSelected']); + } + }); + + /** + *Ajax action for submitting the column change form + **/ + $("#append_fields_form input[name=do_save_data].ajax").live('click', function(event) { + event.preventDefault(); + /** + * @var the_form object referring to the export form + */ + var $form = $("#append_fields_form"); + + PMA_prepareForAjaxRequest($form); + //User wants to submit the form + $.post($form.attr('action'), $form.serialize()+"&do_save_data=Save", function(data) { + if ($("#sqlqueryresults").length != 0) { + $("#sqlqueryresults").remove(); + } else if ($(".error").length != 0) { + $(".error").remove(); + } + if (data.success == true) { + PMA_ajaxShowMessage(data.message); + $("<div id='sqlqueryresults'></div>").insertAfter("#topmenucontainer"); + $("#sqlqueryresults").html(data.sql_query); + $("#result_query .notice").remove(); + $("#result_query").prepend((data.message)); + if ($("#change_column_dialog").length > 0) { + $("#change_column_dialog").dialog("close").remove(); + } + /*Reload the field form*/ + $.post($("#fieldsForm").attr('action'), $("#fieldsForm").serialize()+"&ajax_request=true", function(form_data) { + $("#fieldsForm").remove(); + var $temp_div = $("<div id='temp_div'><div>").append(form_data); + if ($("#sqlqueryresults").length != 0) { + $temp_div.find("#fieldsForm").insertAfter("#sqlqueryresults"); + } else { + $temp_div.find("#fieldsForm").insertAfter(".error"); + } + /*Call the function to display the more options in table*/ + displayMoreTableOpts(); + }); + } else { + var $temp_div = $("<div id='temp_div'><div>").append(data); + var $error = $temp_div.find(".error code").addClass("error"); + PMA_ajaxShowMessage($error); + } + }) // end $.post() + }) // end insert table button "do_save_data" + }) // end $(document).ready() diff --git a/tbl_alter.php b/tbl_alter.php index 1c2d7fb..743e925 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -131,7 +131,8 @@ if (isset($_REQUEST['do_save_data'])) { } if( $GLOBALS['is_ajax_request'] == true) { - PMA_ajaxResponse($message, $message->isSuccess()); + $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); + PMA_ajaxResponse($message, $message->isSuccess(),$extra_data); } $active_page = 'tbl_structure.php'; diff --git a/tbl_structure.php b/tbl_structure.php index f3ce162..5406e9f 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -185,16 +185,16 @@ $hidden_titles['NoIdxFulltext'] = PMA_getIcon('bd_ftext.png', __('Add FUL // table header $i = 0; ?> -<form method="post" action="tbl_structure.php" name="fieldsForm" id="fieldsForm"> +<form method="post" action="tbl_structure.php" name="fieldsForm" id="fieldsForm" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : '');?>> <?php echo PMA_generate_common_hidden_inputs($db, $table); echo '<input type="hidden" name="table_type" value='; - if($db_is_information_schema) { - echo '"information_schema" />'; - } else if ($tbl_is_view) { - echo '"view" />'; - } else { - echo '"table" />'; - } ?> + if($db_is_information_schema) { + echo '"information_schema" />'; + } else if ($tbl_is_view) { + echo '"view" />'; + } else { + echo '"table" />'; + } ?> <table id="tablestructure" class="data"> <thead> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3RC1-6284-g6b06041
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, master has been updated via 6b06041f340459bbcbb2dc306c64988e11ae7a42 (commit) via 5e28dbea224d21b2c03cd325ef67f36b42d2b58d (commit) via 4bec3b3bee31a1bd88a176f8c1cd5033c970fece (commit) via 2c6666bf03c4a866d625955092fb1b4613e18f72 (commit) from 64c50006c390630090eac92ec4caebda988f41d2 (commit) - Log ----------------------------------------------------------------- commit 6b06041f340459bbcbb2dc306c64988e11ae7a42 Merge: 64c50006c390630090eac92ec4caebda988f41d2 5e28dbea224d21b2c03cd325ef67f36b42d2b58d Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 13:41:38 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' ----------------------------------------------------------------------- Summary of changes: scripts/remove-incomplete-mo | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/remove-incomplete-mo b/scripts/remove-incomplete-mo index d9e485c..ec7d3b3 100755 --- a/scripts/remove-incomplete-mo +++ b/scripts/remove-incomplete-mo @@ -8,7 +8,7 @@ set -e # # How many percent needs to be translated # -THRESHOLD=50 +THRESHOLD=40 # # Generated output file hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3RC1-13-g5e28dbe
by Michal Čihař 27 Jun '11

27 Jun '11

The branch, QA_3_4 has been updated via 5e28dbea224d21b2c03cd325ef67f36b42d2b58d (commit) via 4bec3b3bee31a1bd88a176f8c1cd5033c970fece (commit) via 2c6666bf03c4a866d625955092fb1b4613e18f72 (commit) from f09d19cfa3bd2f31185848adfdeb808576396851 (commit) - Log ----------------------------------------------------------------- commit 5e28dbea224d21b2c03cd325ef67f36b42d2b58d Merge: f09d19cfa3bd2f31185848adfdeb808576396851 4bec3b3bee31a1bd88a176f8c1cd5033c970fece Author: Michal Čihař <mcihar(a)suse.cz> Date: Mon Jun 27 13:40:49 2011 +0200 Merge branch 'MAINT_3_4_3' into QA_3_4 ----------------------------------------------------------------------- Summary of changes: po/ar.po | 164 ++++++++++++++++++++++-------------------- scripts/remove-incomplete-mo | 2 +- 2 files changed, 86 insertions(+), 80 deletions(-) diff --git a/po/ar.po b/po/ar.po index dc24a5f..c468cd2 100644 --- a/po/ar.po +++ b/po/ar.po @@ -2470,30 +2470,32 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" +"يعرف أي أدوات التعديل تستخدم مع الأعمدة CHAR و VARCHAR ,,[kbd]input[/kbd] - " +"تسمح بمدخل محدود الطول ,, [kbd]textarea[/kbd] - تسمح بتعدد الأسطر في العمود. " #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" -msgstr "" +msgstr "تعديل أعمدة CHAR" #: libraries/config/messages.inc.php:34 msgid "Number of columns for CHAR/VARCHAR textareas" -msgstr "" +msgstr "عدد أعمدة مربع النص لـCHAR/VARCHAR" #: libraries/config/messages.inc.php:35 msgid "CHAR textarea columns" -msgstr "" +msgstr "أعمدة مربع النص لـ CHAR" #: libraries/config/messages.inc.php:36 msgid "Number of rows for CHAR/VARCHAR textareas" -msgstr "" +msgstr "عدد صفوف مربع النص لـCHAR/VARCHAR" #: libraries/config/messages.inc.php:37 msgid "CHAR textarea rows" -msgstr "" +msgstr "صفوف مربع النص لـ CHAR" #: libraries/config/messages.inc.php:38 msgid "Check config file permissions" -msgstr "" +msgstr "تحقق من أذونات ملف التكوين" #: libraries/config/messages.inc.php:39 msgid "" @@ -2503,26 +2505,27 @@ msgstr "" #: libraries/config/messages.inc.php:40 msgid "Compress on the fly" -msgstr "" +msgstr "ضغط" #: libraries/config/messages.inc.php:41 setup/frames/config.inc.php:25 #: setup/frames/index.inc.php:153 msgid "Configuration file" -msgstr "" +msgstr "ملف التكوين" #: libraries/config/messages.inc.php:42 msgid "" "Whether a warning ("Are your really sure...") should be displayed " "when you're about to lose data" msgstr "" +"التحذير (" هل أنت متأكد " ) يظهر عندما تكون على وشك فقدان بيانات" #: libraries/config/messages.inc.php:43 msgid "Confirm DROP queries" -msgstr "" +msgstr "تأكيد إستعلامات DROP" #: libraries/config/messages.inc.php:44 msgid "Debug SQL" -msgstr "" +msgstr "تصحيح SQL" #: libraries/config/messages.inc.php:45 #, fuzzy @@ -2535,62 +2538,64 @@ msgid "" "[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates " "maximum number for which vertical model is used" msgstr "" +"[kbd]أفقي[/kbd] , [kbd]رأسي[/kbd] أو عدد يشير إلى أكبر عدد من الأعمدة " +"يستعمله النموذج" #: libraries/config/messages.inc.php:47 msgid "Display direction for altering/creating columns" -msgstr "" +msgstr "عرض الإتجاه لـ تعديل/إنشاء الأعمدة" #: libraries/config/messages.inc.php:48 msgid "Tab that is displayed when entering a database" -msgstr "" +msgstr "التبويب الذي يعرض عند الدخول إلى قاعدة البيانات" #: libraries/config/messages.inc.php:49 msgid "Default database tab" -msgstr "" +msgstr "تبويب قاعدة البيانات الإفتراضي" #: libraries/config/messages.inc.php:50 msgid "Tab that is displayed when entering a server" -msgstr "" +msgstr "التبويب الذي يعرض عند الدخول إلى الخادم" #: libraries/config/messages.inc.php:51 msgid "Default server tab" -msgstr "" +msgstr "تبويب الخادم الإفتراضي" #: libraries/config/messages.inc.php:52 msgid "Tab that is displayed when entering a table" -msgstr "" +msgstr "التبويب الذي يعرض عند الدخول إلى الجدول" #: libraries/config/messages.inc.php:53 msgid "Default table tab" -msgstr "" +msgstr "تبويب الجدول الإفتراضي" #: libraries/config/messages.inc.php:54 msgid "Show binary contents as HEX by default" -msgstr "" +msgstr "عرض البيانات الثنائية بالنظام الست عشري إفتراضياً" #: libraries/config/messages.inc.php:55 libraries/display_tbl.lib.php:590 msgid "Show binary contents as HEX" -msgstr "" +msgstr "عرض البيانات الثنائية بالنظام الست عشري" #: libraries/config/messages.inc.php:56 msgid "Show database listing as a list instead of a drop down" -msgstr "" +msgstr "إظهار قواعد البيانات كقائمة بدلاً من القائمة المنسدلة" #: libraries/config/messages.inc.php:57 msgid "Display databases as a list" -msgstr "" +msgstr "إظهار قواعد البيانات كقائمة" #: libraries/config/messages.inc.php:58 msgid "Show server listing as a list instead of a drop down" -msgstr "" +msgstr "إظهار الخوادم كقائمة بدلاً من القائمة المنسدلة" #: libraries/config/messages.inc.php:59 msgid "Display servers as a list" -msgstr "" +msgstr "إظهار الخوادم كقائمة" #: libraries/config/messages.inc.php:60 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "تعديل إستعلام SQL في نافذة منبثقة" #: libraries/config/messages.inc.php:61 #, fuzzy @@ -2612,7 +2617,7 @@ msgstr "أخطاء." #: libraries/config/messages.inc.php:64 msgid "Show icons for warning, error and information messages" -msgstr "" +msgstr "عرض الأيقونات لرسائل التحذير, الخطأ والمعلومات" #: libraries/config/messages.inc.php:65 #, fuzzy @@ -2624,11 +2629,11 @@ msgstr "أخطاء." msgid "" "Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no " "limit)" -msgstr "" +msgstr "ضع الوقت المحدد لعمل البرنامج ([kbd]0[/kbd]: لانهائي)" #: libraries/config/messages.inc.php:67 msgid "Maximum execution time" -msgstr "" +msgstr "وقت التنفيذ الأقصى" #: libraries/config/messages.inc.php:68 prefs_manage.php:299 msgid "Save as file" @@ -2636,7 +2641,7 @@ msgstr "حفظ كملف" #: libraries/config/messages.inc.php:69 libraries/config/messages.inc.php:237 msgid "Character set of the file" -msgstr "" +msgstr "مجموعة الأحرف للملف" #: libraries/config/messages.inc.php:70 libraries/config/messages.inc.php:86 #: tbl_printview.php:373 tbl_structure.php:831 @@ -2687,7 +2692,7 @@ msgstr "استبدل NULL بـ" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:82 msgid "Remove CRLF characters within columns" -msgstr "" +msgstr "حذف CRLF من الأعمدة" #: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:243 #: libraries/config/messages.inc.php:251 libraries/import/csv.php:62 @@ -2710,15 +2715,15 @@ msgstr "إصدارة إكسل" #: libraries/config/messages.inc.php:83 msgid "Database name template" -msgstr "" +msgstr "إسم قالب قاعدة البيانات" #: libraries/config/messages.inc.php:84 msgid "Server name template" -msgstr "" +msgstr "إسم قالب الخادم" #: libraries/config/messages.inc.php:85 msgid "Table name template" -msgstr "" +msgstr "إسم قالب الجدول" #: libraries/config/messages.inc.php:89 libraries/config/messages.inc.php:102 #: libraries/config/messages.inc.php:111 libraries/config/messages.inc.php:135 @@ -2767,7 +2772,7 @@ msgstr "نوع التصدير" #: libraries/config/messages.inc.php:112 libraries/config/messages.inc.php:114 msgid "Save on server" -msgstr "" +msgstr "حفظ في الخادم" #: libraries/config/messages.inc.php:113 libraries/config/messages.inc.php:115 #: libraries/display_export.lib.php:195 libraries/display_export.lib.php:221 @@ -2776,7 +2781,7 @@ msgstr "خزن على الملفات الموجودة أصلا" #: libraries/config/messages.inc.php:116 msgid "Remember file name template" -msgstr "" +msgstr "تذكر إسم قالب الملف" #: libraries/config/messages.inc.php:118 #, fuzzy @@ -2787,11 +2792,11 @@ msgstr "حماية أسماء الجداول و الحقول ب \"`\" " #: libraries/config/messages.inc.php:119 libraries/config/messages.inc.php:258 #: libraries/display_export.lib.php:353 msgid "SQL compatibility mode" -msgstr "" +msgstr "وضع توافق SQL" #: libraries/config/messages.inc.php:120 libraries/config/messages.inc.php:130 msgid "Syntax to use when inserting data" -msgstr "" +msgstr "بناء الجملة لإستخدامه عند إدخال البيانات" #: libraries/config/messages.inc.php:121 msgid "Creation/Update/Check dates" @@ -2803,11 +2808,11 @@ msgstr "استخدم الإضافات المتأخرة" #: libraries/config/messages.inc.php:123 libraries/export/sql.php:53 msgid "Disable foreign key checks" -msgstr "" +msgstr "تعطيل التحقق من المفتاح الغريب" #: libraries/config/messages.inc.php:126 msgid "Use hexadecimal for BLOB" -msgstr "" +msgstr "إستخدم النظام الست عشري لـ BLOB" #: libraries/config/messages.inc.php:128 #, fuzzy @@ -2817,7 +2822,7 @@ msgstr "استخدم الإضافات المتأخرة" #: libraries/config/messages.inc.php:131 libraries/export/sql.php:163 msgid "Maximal length of created query" -msgstr "" +msgstr "أقصى طول للإستعلام المنشئ" #: libraries/config/messages.inc.php:136 #, fuzzy @@ -2827,19 +2832,19 @@ msgstr "تصدير" #: libraries/config/messages.inc.php:137 libraries/export/sql.php:50 msgid "Enclose export in a transaction" -msgstr "" +msgstr "تضمين التصدير في العملية" #: libraries/config/messages.inc.php:138 msgid "Export time in UTC" -msgstr "" +msgstr "وقت التصدير (بالتوقيت العالمي)" #: libraries/config/messages.inc.php:146 msgid "Force secured connection while using phpMyAdmin" -msgstr "" +msgstr "فرض الإتصال الآمن عند إستخدام phpMyAdmin" #: libraries/config/messages.inc.php:147 msgid "Force SSL connection" -msgstr "" +msgstr "فرض إتصال SSL" #: libraries/config/messages.inc.php:148 msgid "" @@ -2849,30 +2854,30 @@ msgstr "" #: libraries/config/messages.inc.php:149 msgid "Foreign key dropdown order" -msgstr "" +msgstr "قائمة منسدلة مرتبة بالمفتاح الغريب" #: libraries/config/messages.inc.php:150 msgid "A dropdown will be used if fewer items are present" -msgstr "" +msgstr "سيتم إستخدام القائمة المنسدلة إذا وجد عدد أقل من العناصر" #: libraries/config/messages.inc.php:151 msgid "Foreign key limit" -msgstr "" +msgstr "حد المفتاح الغريب" #: libraries/config/messages.inc.php:152 msgid "Browse mode" -msgstr "" +msgstr "وضع الإستعراض" #: libraries/config/messages.inc.php:153 msgid "Customize browse mode" -msgstr "" +msgstr "تخصيص وضع الإستعراض" #: libraries/config/messages.inc.php:155 libraries/config/messages.inc.php:157 #: libraries/config/messages.inc.php:174 libraries/config/messages.inc.php:185 #: libraries/config/messages.inc.php:187 libraries/config/messages.inc.php:215 #: libraries/config/messages.inc.php:227 msgid "Customize default options" -msgstr "" +msgstr "تخصيص الخيارات الإفتراضية" #: libraries/config/messages.inc.php:156 libraries/config/setup.forms.php:232 #: libraries/config/setup.forms.php:311 @@ -2884,32 +2889,32 @@ msgstr "سي إس في" #: libraries/config/messages.inc.php:158 msgid "Developer" -msgstr "" +msgstr "مطور" #: libraries/config/messages.inc.php:159 msgid "Settings for phpMyAdmin developers" -msgstr "" +msgstr "إعدادات لمطوري phpMyAdmin" #: libraries/config/messages.inc.php:160 msgid "Edit mode" -msgstr "" +msgstr "وضع التعديل" #: libraries/config/messages.inc.php:161 msgid "Customize edit mode" -msgstr "" +msgstr "تخصيص وضع التعديل" #: libraries/config/messages.inc.php:163 msgid "Export defaults" -msgstr "" +msgstr "إفتراضيات التصدير" #: libraries/config/messages.inc.php:164 msgid "Customize default export options" -msgstr "" +msgstr "تخصيص خيارات التصدير الإفتراضي" #: libraries/config/messages.inc.php:165 libraries/config/messages.inc.php:207 #: setup/frames/menu.inc.php:16 msgid "Features" -msgstr "" +msgstr "مميزات" #: libraries/config/messages.inc.php:166 #, fuzzy @@ -2919,7 +2924,7 @@ msgstr "ولد" #: libraries/config/messages.inc.php:167 msgid "Set some commonly used options" -msgstr "" +msgstr "تعيين بعض الخيارات شائعة الإستخدام" #: libraries/config/messages.inc.php:168 libraries/db_links.inc.php:83 #: libraries/server_links.inc.php:73 libraries/tbl_links.inc.php:82 @@ -2929,19 +2934,19 @@ msgstr "استورد" #: libraries/config/messages.inc.php:169 msgid "Import defaults" -msgstr "" +msgstr "إفتراضيات الإستيراد" #: libraries/config/messages.inc.php:170 msgid "Customize default common import options" -msgstr "" +msgstr "تخصيص خيارات الإستيراد الإفتراضية" #: libraries/config/messages.inc.php:171 msgid "Import / export" -msgstr "" +msgstr "إستيراد / تصدير" #: libraries/config/messages.inc.php:172 msgid "Set import and export directories and compression options" -msgstr "" +msgstr "حدد عناوين الإستيراد والتصدير و خيارات الضغط" #: libraries/config/messages.inc.php:173 libraries/export/latex.php:26 msgid "LaTeX" @@ -2949,15 +2954,15 @@ msgstr "لاتكس" #: libraries/config/messages.inc.php:176 msgid "Databases display options" -msgstr "" +msgstr "خيارات عرض قواعد البيانات" #: libraries/config/messages.inc.php:177 setup/frames/menu.inc.php:18 msgid "Navigation frame" -msgstr "" +msgstr "إطار التصفح" #: libraries/config/messages.inc.php:178 msgid "Customize appearance of the navigation frame" -msgstr "" +msgstr "تخصيص مظهر إطار التصفح" #: libraries/config/messages.inc.php:179 libraries/select_server.lib.php:42 #: setup/frames/index.inc.php:98 @@ -2966,19 +2971,19 @@ msgstr "خوادم" #: libraries/config/messages.inc.php:180 msgid "Servers display options" -msgstr "" +msgstr "خيارات عرض الخوادم" #: libraries/config/messages.inc.php:182 msgid "Tables display options" -msgstr "" +msgstr "خيارات عرض الجداول" #: libraries/config/messages.inc.php:183 setup/frames/menu.inc.php:19 msgid "Main frame" -msgstr "" +msgstr "الإطار الرئيسي" #: libraries/config/messages.inc.php:184 msgid "Microsoft Office" -msgstr "" +msgstr "مايكروسوفت أوفيس" #: libraries/config/messages.inc.php:186 #, fuzzy @@ -2988,11 +2993,11 @@ msgstr "مستندات وثائقية" #: libraries/config/messages.inc.php:188 msgid "Other core settings" -msgstr "" +msgstr "الإعدادات الرئيسية الأخرى" #: libraries/config/messages.inc.php:189 msgid "Settings that didn't fit enywhere else" -msgstr "" +msgstr "الإعدادات التي لاتناسب في أي مكان آخر" #: libraries/config/messages.inc.php:190 #, fuzzy @@ -3016,21 +3021,22 @@ msgstr "نافذة الاستعلام" #: libraries/config/messages.inc.php:193 msgid "Customize query window options" -msgstr "" +msgstr "تخصيص خيارات نافذة الإستعلام" #: libraries/config/messages.inc.php:194 msgid "Security" -msgstr "" +msgstr "الأمان" #: libraries/config/messages.inc.php:195 msgid "" "Please note that phpMyAdmin is just a user interface and its features do not " "limit MySQL" msgstr "" +"فضلاً , تذكر أن phpMyAdmin هي واجة إستخدام فقط ولا يمكن أن تتجاوز حدود MySQL" #: libraries/config/messages.inc.php:196 msgid "Basic settings" -msgstr "" +msgstr "الإعدادات الأساسية" #: libraries/config/messages.inc.php:197 #, fuzzy @@ -3040,25 +3046,25 @@ msgstr "مستندات وثائقية" #: libraries/config/messages.inc.php:198 msgid "Authentication settings" -msgstr "" +msgstr "خيارات المصادقة" #: libraries/config/messages.inc.php:199 msgid "Server configuration" -msgstr "" +msgstr "إعداد الخادم" #: libraries/config/messages.inc.php:200 msgid "" "Advanced server configuration, do not change these options unless you know " "what they are for" -msgstr "" +msgstr "إعداد متقدم للخادم , لاتغير أي من هذه القيم حتى تعلم وظيفتها" #: libraries/config/messages.inc.php:201 msgid "Enter server connection parameters" -msgstr "" +msgstr "أدخل معلومات إتصال الخادم" #: libraries/config/messages.inc.php:202 msgid "Configuration storage" -msgstr "" +msgstr "إعداد التخزين" #: libraries/config/messages.inc.php:203 msgid "" @@ -5547,7 +5553,7 @@ msgstr "أوامر" #: libraries/export/sql.php:111 msgid "<code>CREATE TABLE</code> options:" -msgstr "" +msgstr "خيارات <code>CREATE TABLE</code> :" #: libraries/export/sql.php:123 msgid "" diff --git a/scripts/remove-incomplete-mo b/scripts/remove-incomplete-mo index d9e485c..ec7d3b3 100755 --- a/scripts/remove-incomplete-mo +++ b/scripts/remove-incomplete-mo @@ -8,7 +8,7 @@ set -e # # How many percent needs to be translated # -THRESHOLD=50 +THRESHOLD=40 # # Generated output file hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git June 2011