Git August 2011

git@phpmyadmin.net

8 participants
476 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12870-g663d073
by Marc Delisle 02 Aug '11

02 Aug '11

The branch, master has been updated via 663d073e6be9630bd99e3684705d9182c36112b1 (commit) via 3f7c35cd69bfe6d353b992fc96f871b525be132a (commit) via 5ee97c77870dc72003e19dc36f4add9cffb8879e (commit) via 18310f6b406644fcb1798a0be4dcf444ffdb0ac6 (commit) via 4796a6ccd05b22ee4a04f907f2bf83d034541cf3 (commit) via 66fbb2da266c19cd6631eef9f80dc38fef4b84dd (commit) via 6bde6363bbaeab88cdb3a026df0c5c1e4183800b (commit) via 278469515403a219f2d4f9dd11544670d5eb68da (commit) from 85d729ac5f9b8769ea791a34fefdd6f7c63e50a9 (commit) - Log ----------------------------------------------------------------- commit 663d073e6be9630bd99e3684705d9182c36112b1 Author: Marc Delisle <marc(a)infomarc.info> Date: Tue Aug 2 12:32:51 2011 -0400 ChangeLog entry commit 3f7c35cd69bfe6d353b992fc96f871b525be132a Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Tue Aug 2 21:39:58 2011 +0530 Fixed bug in refresing the navigation after table operations commit 5ee97c77870dc72003e19dc36f4add9cffb8879e Merge: 18310f6b406644fcb1798a0be4dcf444ffdb0ac6 85d729ac5f9b8769ea791a34fefdd6f7c63e50a9 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Tue Aug 2 21:34:28 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 18310f6b406644fcb1798a0be4dcf444ffdb0ac6 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Tue Aug 2 21:33:47 2011 +0530 Fixed bug in refresing the navigation after table operations commit 4796a6ccd05b22ee4a04f907f2bf83d034541cf3 Merge: 66fbb2da266c19cd6631eef9f80dc38fef4b84dd 19178070b652faea2b8091f72f10c700c015a805 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jul 31 22:55:12 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 66fbb2da266c19cd6631eef9f80dc38fef4b84dd Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jul 31 22:53:02 2011 +0530 Fixed the bugs in table copy of table operations commit 6bde6363bbaeab88cdb3a026df0c5c1e4183800b Merge: 278469515403a219f2d4f9dd11544670d5eb68da e3b91b7a0bfcb6bc525c9cfb27c8fc7570457b95 Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jul 31 12:21:06 2011 +0530 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 278469515403a219f2d4f9dd11544670d5eb68da Author: Thilanka Kaushalya <lgtkaushalya(a)gmail.com> Date: Sun Jul 31 12:20:17 2011 +0530 Ajaxify the table coppy option in table operations ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/functions.js | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- tbl_alter.php | 4 ++-- tbl_move_copy.php | 7 +++++++ tbl_operations.php | 6 +++--- 5 files changed, 64 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 151e85f..3cd0d8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ phpMyAdmin - ChangeLog + [interface] Improved support for triggers + [interface] Improved server monitoring + AJAX for table Structure column Add ++ AJAX for table Operations copy table 3.4.5.0 (not yet released) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/js/functions.js b/js/functions.js index 2094a0a..bc94a89 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1972,6 +1972,9 @@ $(document).ready(function() { if ($("#sqlqueryresults").length != 0) { $("#sqlqueryresults").remove(); } + if ($("#result_query").length != 0) { + $("#result_query").remove(); + } if (data.success == true) { PMA_ajaxShowMessage(data.message); $("<div id='sqlqueryresults'></div>").insertAfter("#topmenucontainer"); @@ -1979,10 +1982,57 @@ $(document).ready(function() { $("#result_query .notice").remove(); $("#result_query").prepend((data.message)); } else { - PMA_ajaxShowMessage(data.error); + $temp_div = $("<div id='temp_div'></div>") + $temp_div.html(data.error); + $error = $temp_div.find("code").addClass("error"); + PMA_ajaxShowMessage($error); } }) // end $.post() });//end of alterTableOrderby ajax submit + + /** + *Ajax action for submitting the "Copy table" + **/ + $("#copyTable.ajax input[name='submit_copy']").live('click', function(event) { + event.preventDefault(); + $form = $("#copyTable"); + if($form.find("input[name='switch_to_new']").attr('checked')) { + $form.append('<input type="hidden" name="submit_copy" value="Go" />'); + $form.removeClass('ajax'); + $form.find("#ajax_request_hidden").remove(); + $form.submit(); + } else { + PMA_prepareForAjaxRequest($form); + /*variables which stores the common attributes*/ + $.post($form.attr('action'), $form.serialize()+"&submit_copy=Go", function(data) { + if ($("#sqlqueryresults").length != 0) { + $("#sqlqueryresults").remove(); + } + if ($("#result_query").length != 0) { + $("#result_query").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)); + $("#copyTable").find("select[name='target_db'] option[value="+data.db+"]").attr('selected', 'selected'); + + //Refresh navigation frame when the table is coppied + if (window.parent && window.parent.frame_navigation) { + window.parent.frame_navigation.location.reload(); + } + } else { + $temp_div = $("<div id='temp_div'></div>") + $temp_div.html(data.error); + $error = $temp_div.find("code").addClass("error"); + PMA_ajaxShowMessage($error); + } + }) // end $.post() + } + });//end of copyTable ajax submit + }, 'top.frame_content'); //end $(document).ready for 'Table operations' diff --git a/tbl_alter.php b/tbl_alter.php index 807a39e..6c46c9f 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -130,9 +130,9 @@ if (isset($_REQUEST['do_save_data'])) { } } - if ( $GLOBALS['is_ajax_request'] == true) { + if ( $_REQUEST['ajax_request'] == true) { $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); - PMA_ajaxResponse($message, $message->isSuccess(),$extra_data); + PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); } $active_page = 'tbl_structure.php'; diff --git a/tbl_move_copy.php b/tbl_move_copy.php index 330edcc..58d90f3 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -65,6 +65,13 @@ if (PMA_isValid($_REQUEST['new_name'])) { $db = $_REQUEST['target_db']; $table = $_REQUEST['new_name']; } + + if ( $_REQUEST['ajax_request'] == true) { + $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); + $extra_data['db'] = $GLOBALS['db']; + PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); + } + $reload = 1; } } else { diff --git a/tbl_operations.php b/tbl_operations.php index 3481fd1..3e9bdeb 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -229,7 +229,7 @@ if (isset($result) && empty($message_to_show)) { $_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) { + if ( $_REQUEST['ajax_request'] == true) { $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query); PMA_ajaxResponse($_message,$_message->isSuccess() ,$extra_data); } @@ -238,7 +238,7 @@ if (isset($result) && empty($message_to_show)) { $_message = new PMA_Message; $_message->addMessages($warning_messages); $_message->isError(true); - if ( $GLOBALS['is_ajax_request'] == true) { + if ( $_REQUEST['ajax_request'] == true) { PMA_ajaxResponse($_message, false); } unset($warning_messages); @@ -532,7 +532,7 @@ if (isset($possible_row_formats[$tbl_type])) {  <div class="operations_half_width"> -<form method="post" action="tbl_operations.php" +<form method="post" action="tbl_operations.php" name="copyTable" id="copyTable" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : '');?> onsubmit="return emptyFormElements(this, 'new_name')"> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> <input type="hidden" name="reload" value="1" /> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12862-g85d729a
by Michal Čihař 02 Aug '11

02 Aug '11

The branch, master has been updated via 85d729ac5f9b8769ea791a34fefdd6f7c63e50a9 (commit) from f4b86a21d0364e57db51a884904df36899a9702b (commit) - Log ----------------------------------------------------------------- commit 85d729ac5f9b8769ea791a34fefdd6f7c63e50a9 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Aug 2 16:57:32 2011 +0200 Coding style adjustments ----------------------------------------------------------------------- Summary of changes: setup/lib/index.lib.php | 120 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 91 insertions(+), 29 deletions(-) diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index a7e33a9..334953f 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -115,14 +115,20 @@ function PMA_version_check() $data = curl_exec($ch); curl_close($ch); } else { - messages_set('error', $message_id, __('Version check'), + messages_set( + 'error', + $message_id, + __('Version check'), __('Neither URL wrapper nor CURL is available. Version check is not possible.')); return; } } if (empty($data)) { - messages_set('error', $message_id, __('Version check'), + messages_set( + 'error', + $message_id, + __('Version check'), __('Reading of version failed. Maybe you\'re offline or the upgrade server does not respond.')); return; } @@ -139,14 +145,20 @@ function PMA_version_check() $version_upstream = version_to_int($version); if ($version_upstream === false) { - messages_set('error', $message_id, __('Version check'), + messages_set( + 'error', + $message_id, + __('Version check'), __('Got invalid version string from server')); return; } $version_local = version_to_int($GLOBALS['PMA_Config']->get('PMA_VERSION')); if ($version_local === false) { - messages_set('error', $message_id, __('Version check'), + messages_set( + 'error', + $message_id, + __('Version check'), __('Unparsable version string')); return; } @@ -154,14 +166,23 @@ function PMA_version_check() if ($version_upstream > $version_local) { $version = htmlspecialchars($version); $date = htmlspecialchars($date); - messages_set('notice', $message_id, __('Version check'), + messages_set( + 'notice', + $message_id, + __('Version check'), sprintf(__('A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.'), $version, $date)); } else { if ($version_local % 100 == 0) { - messages_set('notice', $message_id, __('Version check'), + messages_set( + 'notice', + $message_id, + __('Version check'), PMA_sanitize(sprintf(__('You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable version is %s, released on %s.'), $version, $date))); } else { - messages_set('notice', $message_id, __('Version check'), + messages_set( + 'notice', + $message_id, + __('Version check'), __('No newer stable version is available')); } } @@ -197,7 +218,10 @@ function version_to_int($version) $added = 0; break; default: - messages_set('notice', 'version_match', __('Version check'), + messages_set( + 'notice', + 'version_match', + __('Version check'), 'Unknown version part: ' . htmlspecialchars($matches[6])); $added = 0; break; @@ -292,7 +316,10 @@ function perform_config_checks() // if (!$cf->getValue("Servers/$i/ssl")) { $title = PMA_lang(PMA_lang_name('Servers/1/ssl')) . " ($server_name)"; - messages_set('notice', "Servers/$i/ssl", $title, + messages_set( + 'notice', + "Servers/$i/ssl", + $title, __('You should use SSL connections if your web server supports it.')); } @@ -302,7 +329,10 @@ function perform_config_checks() // if ($cf->getValue("Servers/$i/extension") == 'mysql') { $title = PMA_lang(PMA_lang_name('Servers/1/extension')) . " ($server_name)"; - messages_set('notice', "Servers/$i/extension", $title, + messages_set( + 'notice', + "Servers/$i/extension", + $title, __('You should use mysqli for performance reasons.')); } @@ -314,9 +344,12 @@ function perform_config_checks() && $cf->getValue("Servers/$i/user") != '' && $cf->getValue("Servers/$i/password") != '') { $title = PMA_lang(PMA_lang_name('Servers/1/auth_type')) . " ($server_name)"; - messages_set('notice', "Servers/$i/auth_type", $title, - PMA_lang($strServerAuthConfigMsg, $i) . ' ' . - PMA_lang($strSecurityInfoMsg, $i)); + messages_set( + 'notice', + "Servers/$i/auth_type", + $title, + PMA_lang($strServerAuthConfigMsg, $i) . ' ' . + PMA_lang($strSecurityInfoMsg, $i)); } // @@ -327,9 +360,12 @@ function perform_config_checks() if ($cf->getValue("Servers/$i/AllowRoot") && $cf->getValue("Servers/$i/AllowNoPassword")) { $title = PMA_lang(PMA_lang_name('Servers/1/AllowNoPassword')) . " ($server_name)"; - messages_set('notice', "Servers/$i/AllowNoPassword", $title, - __('You allow for connecting to the server without a password.') . ' ' . - PMA_lang($strSecurityInfoMsg, $i)); + messages_set( + 'notice', + "Servers/$i/AllowNoPassword", + $title, + __('You allow for connecting to the server without a password.') . ' ' . + PMA_lang($strSecurityInfoMsg, $i)); } } @@ -340,7 +376,9 @@ function perform_config_checks() if ($cookie_auth_used) { if ($blowfish_secret_set) { // 'cookie' auth used, blowfish_secret was generated - messages_set('notice', 'blowfish_secret_created', + messages_set( + 'notice', + 'blowfish_secret_created', PMA_lang(PMA_lang_name('blowfish_secret')), $strBlowfishSecretMsg); } else { @@ -358,7 +396,9 @@ function perform_config_checks() $blowfish_warnings[] = PMA_lang(__('Key should contain letters, numbers [em]and[/em] special characters.')); } if (!empty($blowfish_warnings)) { - messages_set('error', 'blowfish_warnings' . count($blowfish_warnings), + messages_set( + 'error', + 'blowfish_warnings' . count($blowfish_warnings), PMA_lang(PMA_lang_name('blowfish_secret')), implode('<br />', $blowfish_warnings)); } @@ -370,7 +410,9 @@ function perform_config_checks() // should be enabled if possible // if (!$cf->getValue('ForceSSL')) { - messages_set('notice', 'ForceSSL', + messages_set( + 'notice', + 'ForceSSL', PMA_lang(PMA_lang_name('ForceSSL')), PMA_lang($strForceSSLNotice)); } @@ -380,7 +422,9 @@ function perform_config_checks() // should be disabled // if ($cf->getValue('AllowArbitraryServer')) { - messages_set('notice', 'AllowArbitraryServer', + messages_set( + 'notice', + 'AllowArbitraryServer', PMA_lang(PMA_lang_name('AllowArbitraryServer')), PMA_lang($strAllowArbitraryServerWarning)); } @@ -394,7 +438,9 @@ function perform_config_checks() $message_type = $cf->getValue('LoginCookieValidity') > ini_get('session.gc_maxlifetime') ? 'error' : 'notice'; - messages_set($message_type, 'LoginCookieValidity', + messages_set( + $message_type, + 'LoginCookieValidity', PMA_lang(PMA_lang_name('LoginCookieValidity')), PMA_lang($strLoginCookieValidityWarning)); } @@ -404,7 +450,9 @@ function perform_config_checks() // should be at most 1800 (30 min) // if ($cf->getValue('LoginCookieValidity') > 1800) { - messages_set('notice', 'LoginCookieValidity', + messages_set( + 'notice', + 'LoginCookieValidity', PMA_lang(PMA_lang_name('LoginCookieValidity')), PMA_lang($strLoginCookieValidityWarning2)); } @@ -415,7 +463,9 @@ function perform_config_checks() // LoginCookieValidity must be less or equal to LoginCookieStore // if ($cf->getValue('LoginCookieStore') != 0 && $cf->getValue('LoginCookieValidity') > $cf->getValue('LoginCookieStore')) { - messages_set('error', 'LoginCookieValidity', + messages_set( + 'error', + 'LoginCookieValidity', PMA_lang(PMA_lang_name('LoginCookieValidity')), PMA_lang($strLoginCookieValidityWarning3)); } @@ -425,7 +475,9 @@ function perform_config_checks() // should not be world-accessible // if ($cf->getValue('SaveDir') != '') { - messages_set('notice', 'SaveDir', + messages_set( + 'notice', + 'SaveDir', PMA_lang(PMA_lang_name('SaveDir')), PMA_lang($strDirectoryNotice)); } @@ -435,7 +487,9 @@ function perform_config_checks() // should not be world-accessible // if ($cf->getValue('TempDir') != '') { - messages_set('notice', 'TempDir', + messages_set( + 'notice', + 'TempDir', PMA_lang(PMA_lang_name('TempDir')), PMA_lang($strDirectoryNotice)); } @@ -446,7 +500,9 @@ function perform_config_checks() // if ($cf->getValue('GZipDump') && (@!function_exists('gzopen') || @!function_exists('gzencode'))) { - messages_set('error', 'GZipDump', + messages_set( + 'error', + 'GZipDump', PMA_lang(PMA_lang_name('GZipDump')), PMA_lang($strGZipDumpWarning, 'gzencode')); } @@ -463,7 +519,9 @@ function perform_config_checks() $functions .= @function_exists('bzcompress') ? '' : ($functions ? ', ' : '') . 'bzcompress'; - messages_set('error', 'BZipDump', + messages_set( + 'error', + 'BZipDump', PMA_lang(PMA_lang_name('BZipDump')), PMA_lang($strBZipDumpWarning, $functions)); } @@ -473,7 +531,9 @@ function perform_config_checks() // requires zip_open in import // if ($cf->getValue('ZipDump') && !@function_exists('zip_open')) { - messages_set('error', 'ZipDump_import', + messages_set( + 'error', + 'ZipDump_import', PMA_lang(PMA_lang_name('ZipDump')), PMA_lang($strZipDumpImportWarning, 'zip_open')); } @@ -483,7 +543,9 @@ function perform_config_checks() // requires gzcompress in export // if ($cf->getValue('ZipDump') && !@function_exists('gzcompress')) { - messages_set('error', 'ZipDump_export', + messages_set( + 'error', + 'ZipDump_export', PMA_lang(PMA_lang_name('ZipDump')), PMA_lang($strZipDumpExportWarning, 'gzcompress')); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12861-gf4b86a2
by Michal Čihař 02 Aug '11

02 Aug '11

The branch, master has been updated via f4b86a21d0364e57db51a884904df36899a9702b (commit) via c36df906f0a02512904d1c066f902fc980df3659 (commit) via bbaa465a67f4b17acc6b9cd553ef96e6c2d3b927 (commit) via 2e6421038a300f153e48a8446f0b43f55a0b5e4e (commit) via 1657409d567c68adf9d8e8554e07ff819f001b2c (commit) via c3cd4aba622989f00399bc951bb90259925adfa8 (commit) via 44991badfc02064516b3f2fbe9699ca820e6a6c8 (commit) via 233092543b40e8094c084fe47a5ce0689e948928 (commit) via 2abffe5682209c8e5a75d3330f5980271fd0ad11 (commit) via 43f18b93cf531bf4e1390318cb8a96f153a80ede (commit) via 3c75861e5145b3323b039f7d3a16b8475d63a2c4 (commit) via 9d9c1fc90430cdd330707e973b5d6d729c1e339d (commit) from 8f262140fa95c1ed5d3279d05c9c07acac26423e (commit) - Log ----------------------------------------------------------------- commit f4b86a21d0364e57db51a884904df36899a9702b Merge: 8f262140fa95c1ed5d3279d05c9c07acac26423e c36df906f0a02512904d1c066f902fc980df3659 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Aug 2 16:51:07 2011 +0200 Merge remote-tracking branch 'pootle/master' commit c36df906f0a02512904d1c066f902fc980df3659 Merge: bbaa465a67f4b17acc6b9cd553ef96e6c2d3b927 46cec0c8da0e7c1dafe37f9a9384f7666117c7ba Author: Pootle server <pootle(a)cihar.com> Date: Tue Aug 2 16:40:26 2011 +0200 Merge remote-tracking branch 'origin/master' commit bbaa465a67f4b17acc6b9cd553ef96e6c2d3b927 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 16:09:12 2011 +0200 Translation update done using Pootle. commit 2e6421038a300f153e48a8446f0b43f55a0b5e4e Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 16:08:30 2011 +0200 Translation update done using Pootle. commit 1657409d567c68adf9d8e8554e07ff819f001b2c Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 16:08:01 2011 +0200 Translation update done using Pootle. commit c3cd4aba622989f00399bc951bb90259925adfa8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 16:06:47 2011 +0200 Translation update done using Pootle. commit 44991badfc02064516b3f2fbe9699ca820e6a6c8 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 15:55:07 2011 +0200 Translation update done using Pootle. commit 233092543b40e8094c084fe47a5ce0689e948928 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 15:54:54 2011 +0200 Translation update done using Pootle. commit 2abffe5682209c8e5a75d3330f5980271fd0ad11 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 15:47:59 2011 +0200 Translation update done using Pootle. commit 43f18b93cf531bf4e1390318cb8a96f153a80ede Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 15:46:46 2011 +0200 Translation update done using Pootle. commit 3c75861e5145b3323b039f7d3a16b8475d63a2c4 Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 15:45:17 2011 +0200 Translation update done using Pootle. commit 9d9c1fc90430cdd330707e973b5d6d729c1e339d Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp> Date: Tue Aug 2 15:43:18 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ja.po | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/po/ja.po b/po/ja.po index 902574b..a6d0479 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-30 14:14-0400\n" -"PO-Revision-Date: 2011-08-02 12:41+0200\n" +"PO-Revision-Date: 2011-08-02 16:09+0200\n" "Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n" "Language-Team: japanese <jp(a)li.org>\n" "Language: ja\n" @@ -1230,11 +1230,13 @@ msgid "" "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, " "depending on your system." msgstr "" +"slow_query_log は有効になっていますが、サーバは %d " +"秒より長くかかるクエリだけをログに記録します。お使いのシステムによっては、long_query_time を 0～2 秒に設定したほうがいいでしょう。" #: js/messages.php:121 #, php-format msgid "long_query_time is set to %d second(s)." -msgstr "" +msgstr "long_query_time は %d 秒に設定されています。" #: js/messages.php:122 msgid "" @@ -1267,7 +1269,7 @@ msgstr "%s を無効にする" #: js/messages.php:130 #, php-format msgid "Set long_query_time to %ds" -msgstr "" +msgstr "long_query_time を %d 秒に設定する" #: js/messages.php:131 msgid "" @@ -9780,10 +9782,9 @@ msgid "Start Monitor" msgstr "モニタ開始" #: server_status.php:1328 -#, fuzzy #| msgid "Introduction" msgid "Instructions/Setup" -msgstr "はじめに" +msgstr "使用方法／セットアップ" #: server_status.php:1332 msgid "Done rearranging/editing charts" @@ -9810,10 +9811,9 @@ msgid "Clear monitor config" msgstr "モニタ設定のクリア" #: server_status.php:1363 -#, fuzzy #| msgid "Introduction" msgid "Monitor Instructions" -msgstr "はじめに" +msgstr "モニタの使用方法" #: server_status.php:1364 #| msgid "" @@ -9833,7 +9833,7 @@ msgid "" msgstr "" "phpMyAdmin モニタは、サーバ構成の最適化を支援し、時間のかかるクエリを追跡することができます。後者の場合には、テーブルに log_output " "を設定し、slow_query_log または general_log のいずれかを有効にする必要があります。なお、general_log " -"を大量のデータを生成し、サーバの負荷を 15% 増加させますので、注意するようにしてください。" +"は大量のデータを生成し、サーバの負荷を 15% 増加させますので、注意するようにしてください。" #: server_status.php:1371 msgid "" @@ -9923,10 +9923,9 @@ msgid "Loading logs" msgstr "ログの読み込み" #: server_status.php:1448 -#, fuzzy #| msgid "Show statistics" msgid "Log statistics" -msgstr "統計を表示する" +msgstr "ログの統計" #: server_status.php:1449 #| msgid "Select page" @@ -9945,7 +9944,7 @@ msgstr "" msgid "" "<p>Choose from which log you want the statistics to be generated from.</p> " "Results are grouped by query text." -msgstr "" +msgstr "<p>ログの統計元を選択することができます。</p>結果はクエリ文でグループ化されます。" #: server_status.php:1465 #, fuzzy hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12849-g8f26214
by Michal Čihař 02 Aug '11

02 Aug '11

The branch, master has been updated via 8f262140fa95c1ed5d3279d05c9c07acac26423e (commit) from b4a0b3f776505e48c87470d13303f57e5860129a (commit) - Log ----------------------------------------------------------------- commit 8f262140fa95c1ed5d3279d05c9c07acac26423e Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Aug 2 16:48:57 2011 +0200 Improve coding style ----------------------------------------------------------------------- Summary of changes: js/functions.js | 48 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 33 insertions(+), 15 deletions(-) diff --git a/js/functions.js b/js/functions.js index f121f65..2094a0a 100644 --- a/js/functions.js +++ b/js/functions.js @@ -212,8 +212,9 @@ function confirmLink(theLink, theSqlQuery) if (is_confirmed) { if ( $(theLink).hasClass('formLinkSubmit') ) { var name = 'is_js_confirmed'; - if($(theLink).attr('href').indexOf('usesubform') != -1) + if ($(theLink).attr('href').indexOf('usesubform') != -1) { name = 'subform[' + $(theLink).attr('href').substr('#').match(/usesubform\[(\d+)\]/i)[1] + '][is_js_confirmed]'; + } $(theLink).parents('form').append('<input type="hidden" name="' + name + '" value="1" />'); } else if ( typeof(theLink.href) != 'undefined' ) { @@ -848,10 +849,11 @@ function insertValueQuery() { var chaineAj = ""; var NbSelect = 0; for(var i=0; i<myListBox.options.length; i++) { - if (myListBox.options[i].selected){ + if (myListBox.options[i].selected) { NbSelect++; - if (NbSelect > 1) + if (NbSelect > 1) { chaineAj += ", "; + } chaineAj += myListBox.options[i].value; } } @@ -1139,12 +1141,14 @@ function pdfPaperSize(format, axis) { function popupBSMedia(url_params, bs_ref, m_type, is_cust_type, w_width, w_height) { // if width not specified, use default - if (w_width == undefined) + if (w_width == undefined) { w_width = 640; + } // if height not specified, use default - if (w_height == undefined) + if (w_height == undefined) { w_height = 480; + } // open popup window (for displaying video/playing audio) var mediaWin = window.open('bs_play_media.php?' + url_params + '&bs_reference=' + bs_ref + '&media_type=' + m_type + '&custom_type=' + is_cust_type, 'viewBSMedia', 'width=' + w_width + ', height=' + w_height + ', resizable=1, scrollbars=1, status=0'); @@ -1161,15 +1165,17 @@ function popupBSMedia(url_params, bs_ref, m_type, is_cust_type, w_width, w_heigh function requestMIMETypeChange(db, table, reference, current_mime_type) { // no mime type specified, set to default (nothing) - if (undefined == current_mime_type) + if (undefined == current_mime_type) { current_mime_type = ""; + } // prompt user for new mime type var new_mime_type = prompt("Enter custom MIME type", current_mime_type); // if new mime_type is specified and is not the same as the previous type, request for mime type change - if (new_mime_type && new_mime_type != current_mime_type) + if (new_mime_type && new_mime_type != current_mime_type) { changeMIMEType(db, table, reference, new_mime_type); + } } /** @@ -1470,8 +1476,11 @@ function PMA_createChart(passedSettings) { return; } - if(lastValue==null) diff = curValue.x - thisChart.xAxis[0].getExtremes().max; - else diff = parseInt(curValue.x - lastValue.x); + if (lastValue==null) { + diff = curValue.x - thisChart.xAxis[0].getExtremes().max; + } else { + diff = parseInt(curValue.x - lastValue.x); + } thisChart.xAxis[0].setExtremes( thisChart.xAxis[0].getExtremes().min+diff, @@ -1485,7 +1494,9 @@ function PMA_createChart(passedSettings) { numLoadedPoints++; // Timeout has been cleared => don't start a new timeout - if(chart_activeTimeouts[container] == null) return; + if (chart_activeTimeouts[container] == null) { + return; + } chart_activeTimeouts[container] = setTimeout( thisChart.options.realtime.timeoutCallBack, @@ -1537,11 +1548,13 @@ function PMA_createChart(passedSettings) { /* Set/Get realtime chart default values */ if(passedSettings.realtime) { - if(!passedSettings.realtime.refreshRate) + if(!passedSettings.realtime.refreshRate) { passedSettings.realtime.refreshRate = 5000; + } - if(!passedSettings.realtime.numMaxPoints) + if(!passedSettings.realtime.numMaxPoints) { passedSettings.realtime.numMaxPoints = 30; + } // Allow custom POST vars to be added passedSettings.realtime.postData = $.extend(false,{ ajax_request: true, chart_data: 1, type: passedSettings.realtime.type },passedSettings.realtime.postData); @@ -1597,10 +1610,15 @@ function PMA_createProfilingChart(data, options) { // Formats a profiling duration nicely. Used in PMA_createProfilingChart() and server_status.js function PMA_prettyProfilingNum(num, acc) { - if(!acc) acc = 1; + if (!acc) { + acc = 1; + } acc = Math.pow(10,acc); - if(num*1000 < 0.1) num = Math.round(acc*(num*1000*1000))/acc + 'µ' - else if(num < 0.1) num = Math.round(acc*(num*1000))/acc + 'm' + if (num*1000 < 0.1) { + num = Math.round(acc*(num*1000*1000))/acc + 'µ' + } else if (num < 0.1) { + num = Math.round(acc*(num*1000))/acc + 'm' + } return num + 's'; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12848-gb4a0b3f
by Michal Čihař 02 Aug '11

02 Aug '11

The branch, master has been updated via b4a0b3f776505e48c87470d13303f57e5860129a (commit) from 46cec0c8da0e7c1dafe37f9a9384f7666117c7ba (commit) - Log ----------------------------------------------------------------- commit b4a0b3f776505e48c87470d13303f57e5860129a Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Aug 2 16:45:00 2011 +0200 Remove tabs, remove dead code ----------------------------------------------------------------------- Summary of changes: js/functions.js | 4 +- pmd/scripts/history.js | 150 +++++++++++++++++++++++++----------------------- pmd/scripts/move.js | 52 ++++++++-------- 3 files changed, 106 insertions(+), 100 deletions(-) diff --git a/js/functions.js b/js/functions.js index bbe00b5..f121f65 100644 --- a/js/functions.js +++ b/js/functions.js @@ -211,9 +211,9 @@ function confirmLink(theLink, theSqlQuery) var is_confirmed = confirm(PMA_messages['strDoYouReally'] + ' :\n' + theSqlQuery); if (is_confirmed) { if ( $(theLink).hasClass('formLinkSubmit') ) { - var name = 'is_js_confirmed'; + var name = 'is_js_confirmed'; if($(theLink).attr('href').indexOf('usesubform') != -1) - name = 'subform[' + $(theLink).attr('href').substr('#').match(/usesubform\[(\d+)\]/i)[1] + '][is_js_confirmed]'; + name = 'subform[' + $(theLink).attr('href').substr('#').match(/usesubform\[(\d+)\]/i)[1] + '][is_js_confirmed]'; $(theLink).parents('form').append('<input type="hidden" name="' + name + '" value="1" />'); } else if ( typeof(theLink.href) != 'undefined' ) { diff --git a/pmd/scripts/history.js b/pmd/scripts/history.js index 478bd82..7caeea9 100644 --- a/pmd/scripts/history.js +++ b/pmd/scripts/history.js @@ -6,7 +6,7 @@ * @requires moves.js * @version $Id$ */ - + var history_array = []; // Global array to store history objects var select_field = []; // Global array to store informaation for columns which are used in select clause var g_index; @@ -14,12 +14,12 @@ var g_index; /** * function for panel, hides and shows toggle_container <div>,which is for history elements uses {@link JQuery}. * - * @param index has value 1 or 0,decides wheter to hide toggle_container on load. + * @param index has value 1 or 0,decides wheter to hide toggle_container on load. **/ function panel(index) { if (!index) { - $(".toggle_container").hide(); + $(".toggle_container").hide(); } $("h2.tiger").click(function(){ $(this).toggleClass("active").next().slideToggle("slow"); @@ -31,18 +31,18 @@ function panel(index) { * clubbing all objects of same tables together * This function is called whenever changes are made in history_array[] * - * @uses and_or() - * @uses history_edit() - * @uses history_delete() - * - * @param {int} init starting index of unsorted array - * @param {int} final last index of unsorted array + * @uses and_or() + * @uses history_edit() + * @uses history_delete() + * + * @param {int} init starting index of unsorted array + * @param {int} final last index of unsorted array * **/ function display(init,final) { var str,i,j,k,sto; - // this part sorts the history array based on table name,this is needed for clubbing all object of same name together. + // this part sorts the history array based on table name,this is needed for clubbing all object of same name together. for (i = init;i < final;i++) { sto = history_array[i]; var temp = history_array[i].get_tab() ;//+ '.' + history_array[i].get_obj_no(); for Self JOINS @@ -60,7 +60,7 @@ function display(init,final) { str =''; // string to store Html code for history tab for ( var i=0; i < history_array.length; i++){ var temp = history_array[i].get_tab(); //+ '.' + history_array[i].get_obj_no(); for Self JOIN - str += '<h2 class="tiger"><a href="#">' + temp + '</a></h2>'; + str += '<h2 class="tiger"><a href="#">' + temp + '</a></h2>'; str += '<div class="toggle_container">\n'; while((history_array[i].get_tab()) == temp) { //+ '.' + history_array[i].get_obj_no()) == temp) { str +='<div class="block"> <table width ="250">'; @@ -76,7 +76,7 @@ function display(init,final) { str += '</td><td align="center"><img class="icon ic_b_info" src="themes/dot.gif" title="'+detail(i)+'"/><td title="' + detail(i) +'">' + history_array[i].get_type() + '</td></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img class="icon ic_b_drop" src="themes/dot.gif" title="Delete"></td></tr></thead>'; } else { - str += '</td><td align="center"><img class="icon ic_b_info" src="themes/dot.gif" title="'+detail(i)+'"/></td><td title="' + detail(i) +'">' + history_array[i]. get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')><img class="icon ic_b_edit" src="themes/dot.gif" title="Edit"/></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>'; + str += '</td><td align="center"><img class="icon ic_b_info" src="themes/dot.gif" title="'+detail(i)+'"/></td><td title="' + detail(i) +'">' + history_array[i]. get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')><img class="icon ic_b_edit" src="themes/dot.gif" title="Edit"/></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>'; } i++; if(i >= history_array.length) { @@ -91,9 +91,9 @@ function display(init,final) { } /** - * To change And/Or relation in history tab - * - * @uses panel() + * To change And/Or relation in history tab + * + * @uses panel() * * @param {int} index of history_array where change is to be made * @@ -113,8 +113,8 @@ function and_or(index) { /** * To display details of obects(where,rename,Having,aggregate,groupby,orderby,having) - * - * @param index index of history_array where change is to be made + * + * @param index index of history_array where change is to be made * **/ @@ -152,16 +152,16 @@ function detail (index) { /** * Deletes entry in history_array * - * @uses panel() - * @uses display() - * @param index index of history_array[] which is to be deleted + * @uses panel() + * @uses display() + * @param index index of history_array[] which is to be deleted * **/ function history_delete(index) { for(var k =0 ;k < from_array.length;k++){ - if(from_array[k] == history_array[index].get_tab()){ - from_array.splice(k,1); + if(from_array[k] == history_array[index].get_tab()){ + from_array.splice(k,1); break; } } @@ -173,8 +173,8 @@ function history_delete(index) { /** * To show where,rename,aggregate,having forms to edit a object - * - * @param{int} index index of history_array where change is to be made + * + * @param{int} index index of history_array where change is to be made * **/ @@ -219,10 +219,10 @@ function history_edit(index) { /** * Make changes in history_array when Edit button is clicked * checks for the type of object and then sets the new value - * @uses panel() - * @uses display() + * @uses panel() + * @uses display() * - * @param index index of history_array where change is to be made + * @param index index of history_array where change is to be made **/ function edit(type) { @@ -261,13 +261,13 @@ function edit(type) { } /** - * history object closure + * history object closure * - * @param ncolumn_name name of the column on which conditions are put - * @param nobj object details(where,rename,orderby,groupby,aggregate) - * @param ntab table name of the column on which conditions are applied - * @param nobj_no object no used for inner join - * @param ntype type of object + * @param ncolumn_name name of the column on which conditions are put + * @param nobj object details(where,rename,orderby,groupby,aggregate) + * @param ntab table name of the column on which conditions are applied + * @param nobj_no object no used for inner join + * @param ntype type of object * **/ @@ -328,8 +328,8 @@ function history(ncolumn_name,nobj,ntab,nobj_no,ntype) { /** * where object closure, makes an object with all information of where * - * @param nrelation_operator type of relation operator to be applied - * @param nquery stores value of value/sub-query + * @param nrelation_operator type of relation operator to be applied + * @param nquery stores value of value/sub-query * **/ @@ -357,8 +357,8 @@ var where = function (nrelation_operator,nquery) { /** * Having object closure, makes an object with all information of where * - * @param nrelation_operator type of relation operator to be applied - * @param nquery stores value of value/sub-query + * @param nrelation_operator type of relation operator to be applied + * @param nquery stores value of value/sub-query * **/ @@ -392,7 +392,7 @@ var having = function (nrelation_operator,nquery,noperator) { /** * rename object closure,makes an object with all information of rename * - * @param nrename_to new name information + * @param nrename_to new name information * **/ @@ -410,7 +410,7 @@ var rename = function(nrename_to) { /** * aggregate object closure * - * @param noperator aggregte operator + * @param noperator aggregte operator * **/ @@ -435,10 +435,10 @@ var aggregate = function(noperator) { function unique(arrayName) { var newArray=new Array(); label:for(var i=0; i<arrayName.length;i++ ) - { + { for(var j=0; j<newArray.length;j++ ) { - if(newArray[j]==arrayName[i]) + if(newArray[j]==arrayName[i]) continue label; } newArray[newArray.length] = arrayName[i]; @@ -453,27 +453,27 @@ function unique(arrayName) { * @param arrayName array * @param value value which is to be searched in the array */ - + function found(arrayName,value) { for(var i=0; i<arrayName.length; i++) { if(arrayName[i] == value) { return 1;} } return -1; } - + /** * This function is the main function for query building. * uses history object details for this. * * @ uses query_where() * @ uses query_groupby() - * @ uses query_having() + * @ uses query_having() * @ uses query_orderby() - * + * * @param formtitle title for the form - * @param fadin + * @param fadin */ - + function build_query(formtitle, fadin) { var q_select = "SELECT "; var temp; @@ -486,19 +486,19 @@ function build_query(formtitle, fadin) { } else { temp = check_rename(select_field[i]); - q_select += select_field[i] + temp +","; + q_select += select_field[i] + temp +","; } } q_select = q_select.substring(0,q_select.length - 1); q_select += " FROM " + query_from(); if(query_where() != "") { q_select +="\n WHERE"; - q_select += query_where(); + q_select += query_where(); } if(query_groupby() != "") { q_select += "\nGROUP BY " + query_groupby(); } if(query_having() != "") { q_select += "\nHAVING " + query_having(); } if(query_orderby() != "") { q_select += "\nORDER BY " + query_orderby(); } - var box = document.getElementById('box'); + var box = document.getElementById('box'); document.getElementById('filter').style.display='block'; var btitle = document.getElementById('boxtitle'); btitle.innerHTML = 'SELECT';//formtitle; @@ -506,21 +506,21 @@ function build_query(formtitle, fadin) { gradient("box", 0); fadein("box"); } - else{ + else{ box.style.display='block'; - } + } document.getElementById('textSqlquery').innerHTML = q_select; } /** * This function builds from clause of query * makes automatic joins. - * + * * @uses unique * @uses add_array * @uses remove_array * */ - + function query_from() { var i =0; @@ -543,12 +543,12 @@ function query_from() { temp = tab_left.shift(); quer = temp; tab_used.push(temp); - // if master table (key2) matches with tab used get all keys and check if tab_left matches - //after this check if master table (key2) matches with tab left then check if any foriegn matches with master . - for( i =0; i<2 ; i++) { + // if master table (key2) matches with tab used get all keys and check if tab_left matches + //after this check if master table (key2) matches with tab left then check if any foriegn matches with master . + for( i =0; i<2 ; i++) { for (K in contr){ for (key in contr[K]){// contr name - for (key2 in contr[K][key]){// table name + for (key2 in contr[K][key]){// table name parts = key2.split("."); if(found(tab_used,parts[1]) > 0) { for (key3 in contr[K][key][key2]) { @@ -564,7 +564,7 @@ function query_from() { } } } - } + } K = 0; t_tab_left = unique (t_tab_left); tab_used = add_array(t_tab_left,tab_used); @@ -574,7 +574,7 @@ function query_from() { for (key in contr[K]) { for (key2 in contr[K][key]){// table name parts = key2.split("."); - if(found(tab_left,parts[1]) > 0){ + if(found(tab_left,parts[1]) > 0){ for (key3 in contr[K][key][key2]){ parts1 = contr[K][key][key2][key3][0].split("."); if(found(tab_used,parts1[1]) > 0) { @@ -601,9 +601,7 @@ function query_from() { from_array = t_array; return query; } - /* document.write(key3+";"); //master_field - document.write(contr[K][key][key2][key3][0]+";"); // foreign_table - document.write(contr[K][key][key2][key3][1]+";"); //forieign_feild */ + /** * This function concatenates two array * @@ -616,7 +614,7 @@ function add_array(add,arr){ } return arr; } - + /* This fucntion removes all elements present in one array from the other. * * @params rem array from which each element is removed from other array. @@ -635,7 +633,7 @@ function remove_array(rem,arr){ * This function builds the groupby clause from history object * */ - + function query_groupby() { var i = 0; var str = ""; @@ -658,7 +656,7 @@ function query_having() { if(history_array[i].get_type() == "Having") { if (history_array[i].get_obj().get_operator() != 'None') { and += history_array[i].get_obj().get_operator() + "(" + history_array[i].get_column_name() + " ) " + history_array[i].get_obj().getrelation_operator(); - and += " " + history_array[i].get_obj().getquery() + ", " ; + and += " " + history_array[i].get_obj().getquery() + ", " ; } else { and += history_array[i].get_column_name() + " " + history_array[i].get_obj().getrelation_operator() + " " + history_array[i].get_obj().getquery() + ", "; @@ -707,11 +705,19 @@ function query_where(){ } } } - if ( or != "(") { or = or.substring(0,(or.length - 4 )) + ")"; } - else { or = "" ;} - if (and !="(") {and = and.substring(0,(and.length - 5)) + ")"; } - else {and = "" ;} - if ( or != "" ) { and = and + " OR " + or + " )"; } + if ( or != "(") { + or = or.substring(0,(or.length - 4 )) + ")"; + } else { + or = "" ; + } + if (and !="(") { + and = and.substring(0,(and.length - 5)) + ")"; + } else { + and = "" ; + } + if ( or != "" ) { + and = and + " OR " + or + " )"; + } return and; } @@ -749,7 +755,7 @@ function gradient(id, level) } -function fadein(id) +function fadein(id) { var level = 0; while(level <= 1){ diff --git a/pmd/scripts/move.js b/pmd/scripts/move.js index 1ce18a1..71eb037 100644 --- a/pmd/scripts/move.js +++ b/pmd/scripts/move.js @@ -26,20 +26,20 @@ eval (hrefscript); return false; }).attr('href', '#'); -}); +}); // Below is the function to bind onbeforeunload events with the content_frame as well as the top window. $(document).ready(function(){ $(window).bind('beforeunload', function(){ // onbeforeunload for the frame window. - if (_change == 1 && _staying == 0) + if (_change == 1 && _staying == 0) return PMA_messages['strLeavingDesigner']; - else if (_change == 1 && _staying == 1) + else if (_change == 1 && _staying == 1) _staying = 0; }); $(window).unload(function(){ _change = 0; - }); + }); window.top.onbeforeunload = function(){ // onbeforeunload for the browser main window. if (_change == 1 && _staying == 0){ _staying = 1; // Helps if the user stays on the page as there @@ -48,7 +48,7 @@ } }; }); - + function make_zero(){ // Function called if the user stays after seeing the confirmation prompt. _staying = 0; } @@ -1015,7 +1015,7 @@ function getColorByTarget( target ) return color; } -function Click_option(id_this,column_name,table_name) +function Click_option(id_this,column_name,table_name) { var left = Glob_X - (document.getElementById(id_this).offsetWidth>>1); document.getElementById(id_this).style.left = left + 'px'; @@ -1044,10 +1044,10 @@ function Select_all(id_this,owner) parent.elements[i].checked = true; parent.elements[i].disabled = true; var temp = '`' + id_this.substring(owner.length +1) + '`.*'; - } + } else { parent.elements[i].checked = false; - parent.elements[i].disabled = false; + parent.elements[i].disabled = false; } } } @@ -1063,8 +1063,8 @@ function Select_all(id_this,owner) } } for(k =0 ;k < from_array.length;k++){ - if(from_array[k] == id_this){ - from_array.splice(k,1); + if(from_array[k] == id_this){ + from_array.splice(k,1); break; } } @@ -1096,7 +1096,7 @@ function store_column(id_this,owner,col) { var i = 0; var k = 0; if (document.getElementById('select_' + owner + '.' + id_this + '._' + col).checked == true) { - select_field.push('`' + id_this + '`.`' + col +'`'); + select_field.push('`' + id_this + '`.`' + col +'`'); from_array.push(id_this); } else { @@ -1107,9 +1107,9 @@ function store_column(id_this,owner,col) { } } for(k =0 ;k < from_array.length;k++){ - if(from_array[k] == id_this){ - from_array.splice(k,1); - break; + if(from_array[k] == id_this){ + from_array.splice(k,1); + break; } } } @@ -1119,13 +1119,13 @@ function store_column(id_this,owner,col) { * This function builds object and adds them to history_array * first it does a few checks on each object, then makes an object(where,rename,groupby,aggregate,orderby) * then a new history object is made and finally all these history objects are addded to history_array[] - * - * @uses where() - * @uses history() - * @uses aggregate() - * @uses rename() - * @uses panel() - * @uses display() + * + * @uses where() + * @uses history() + * @uses aggregate() + * @uses rename() + * @uses panel() + * @uses display() **/ function add_object() { @@ -1151,18 +1151,18 @@ function add_object() { sum = sum + 1; document.getElementById('new_name').value = "" ; } - if (document.getElementById('operator').value != '---') { + if (document.getElementById('operator').value != '---') { var aggregate_obj = new aggregate(document.getElementById('operator').value) ; history_array.push(new history(col_name,aggregate_obj,tab_name,h_tabs[downer + '.' + tab_name],"Aggregate")); sum = sum + 1; document.getElementById('operator').value = '---'; - //make aggregate operator + //make aggregate operator } if (document.getElementById('groupby').checked == true ) { history_array.push(new history(col_name,'GroupBy',tab_name,h_tabs[downer + '.' +tab_name],"GroupBy")); sum = sum + 1; document.getElementById('groupby').checked = false; - //make groupby + //make groupby } if (document.getElementById('h_rel_opt').value != '--') { if (document.getElementById('having').value == "") { @@ -1182,11 +1182,11 @@ function add_object() { history_array.push(new history(col_name,'OrderBy',tab_name,h_tabs[downer + '.' + tab_name],"OrderBy")); sum = sum + 1; document.getElementById('orderby').checked = false; - //make orderby + //make orderby } document.getElementById('hint').innerHTML = sum + "object created" ; document.getElementById('hint').style.visibility = "visible"; - //output sum new objects created + //output sum new objects created var existingDiv = document.getElementById('ab'); existingDiv.innerHTML = display(init,history_array.length); Close_option(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12847-g46cec0c
by Michal Čihař 02 Aug '11

02 Aug '11

The branch, master has been updated via 46cec0c8da0e7c1dafe37f9a9384f7666117c7ba (commit) via 78fdc7d3f4079dfe98cb648deb503557b0d7c62a (commit) via e466dec53b4fca185e03d0a66b434f491355c274 (commit) via c17add38ed40312f934451e1d1cf1f0b0ef8240e (commit) from 9fcb5e7c8662e5f9a71babe684a9a87b37208a46 (commit) - Log ----------------------------------------------------------------- commit 46cec0c8da0e7c1dafe37f9a9384f7666117c7ba Merge: 78fdc7d3f4079dfe98cb648deb503557b0d7c62a e466dec53b4fca185e03d0a66b434f491355c274 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Aug 2 16:22:04 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' commit 78fdc7d3f4079dfe98cb648deb503557b0d7c62a Merge: 9fcb5e7c8662e5f9a71babe684a9a87b37208a46 c17add38ed40312f934451e1d1cf1f0b0ef8240e Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Aug 2 16:21:56 2011 +0200 Merge commit 'c17add38ed40312f934451e1d1cf1f0b0ef8240e' Conflicts: js/sql.js ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 319658a..151e85f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ phpMyAdmin - ChangeLog 3.4.5.0 (not yet released) - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced +- bug #3374802 [interface] Comment on a column breaks inline editing 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-60-ge466dec
by Michal Čihař 02 Aug '11

02 Aug '11

The branch, QA_3_4 has been updated via e466dec53b4fca185e03d0a66b434f491355c274 (commit) from c17add38ed40312f934451e1d1cf1f0b0ef8240e (commit) - Log ----------------------------------------------------------------- commit e466dec53b4fca185e03d0a66b434f491355c274 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Aug 2 16:18:21 2011 +0200 Update from master ----------------------------------------------------------------------- Summary of changes: po/af.po | 2 +- po/ar.po | 62 ++++++++++++++++++++++++++++---------------------------- po/az.po | 2 +- po/be.po | 2 +- po/be(a)latin.po | 2 +- po/bg.po | 2 +- po/bn.po | 2 +- po/br.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en_GB.po | 2 +- po/es.po | 2 +- po/et.po | 2 +- po/eu.po | 2 +- po/fa.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/id.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ka.po | 2 +- po/ko.po | 2 +- po/lt.po | 2 +- po/lv.po | 2 +- po/mk.po | 2 +- po/ml.po | 2 +- po/mn.po | 2 +- po/ms.po | 2 +- po/nb.po | 2 +- po/nl.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 40 ++++++++++++++++++++++++----------- po/ro.po | 2 +- po/ru.po | 2 +- po/si.po | 2 +- po/sk.po | 11 +++++++-- po/sl.po | 2 +- po/sq.po | 2 +- po/sr.po | 2 +- po/sr(a)latin.po | 2 +- po/sv.po | 2 +- po/ta.po | 2 +- po/te.po | 2 +- po/th.po | 4 +- po/tr.po | 2 +- po/tt.po | 2 +- po/ug.po | 2 +- po/uk.po | 2 +- po/ur.po | 2 +- po/uz.po | 2 +- po/uz(a)latin.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 64 files changed, 128 insertions(+), 109 deletions(-) diff --git a/po/af.po b/po/af.po index 02eee9b..c9ce260 100644 --- a/po/af.po +++ b/po/af.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-30 23:04+0200\n" diff --git a/po/ar.po b/po/ar.po index 17f9824..c6b474b 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-21 13:56+0200\n" @@ -9441,7 +9441,7 @@ msgstr "صيانة الجدول" #: tbl_operations.php:610 msgid "Defragment table" -msgstr "" +msgstr "إلغاء تجزئة الجدول" #: tbl_operations.php:658 #, php-format @@ -9462,7 +9462,7 @@ msgstr "إرجاع أو استيراد بيانات الجدول" #: tbl_operations.php:688 msgid "Empty the table (TRUNCATE)" -msgstr "" +msgstr "إفراغ الجدول (TRUNCATE)" #: tbl_operations.php:708 #, fuzzy @@ -9477,7 +9477,7 @@ msgstr "" #: tbl_operations.php:737 #, php-format msgid "Partition %s" -msgstr "" +msgstr "تقسيم %s" #: tbl_operations.php:740 msgid "Analyze" @@ -9489,11 +9489,11 @@ msgstr "تحقق" #: tbl_operations.php:742 msgid "Optimize" -msgstr "" +msgstr "تحسين" #: tbl_operations.php:743 msgid "Rebuild" -msgstr "" +msgstr "إعادة بناء" #: tbl_operations.php:744 msgid "Repair" @@ -9501,7 +9501,7 @@ msgstr "صلح" #: tbl_operations.php:756 msgid "Remove partitioning" -msgstr "" +msgstr "إزالة التقسيم" #: tbl_operations.php:782 msgid "Check referential integrity:" @@ -9566,7 +9566,7 @@ msgstr "" #: tbl_relation.php:410 msgid "Foreign key constraint" -msgstr "" +msgstr "قيود المفتاح الغريب" #: tbl_row_action.php:28 msgid "No rows selected" @@ -9596,11 +9596,11 @@ msgstr "ترتيب العرض:" #: tbl_structure.php:161 tbl_structure.php:165 msgid "Browse distinct values" -msgstr "" +msgstr "إستعرض القيم المميزة" #: tbl_structure.php:166 tbl_structure.php:167 msgid "Add primary key" -msgstr "" +msgstr "إضافة مفتاح رئيسي" #: tbl_structure.php:168 tbl_structure.php:169 #, fuzzy @@ -9610,7 +9610,7 @@ msgstr "إضافة حقل جديد" #: tbl_structure.php:170 tbl_structure.php:171 msgid "Add unique index" -msgstr "" +msgstr "إضافة فهرس مميز" #: tbl_structure.php:172 tbl_structure.php:173 msgid "Add FULLTEXT index" @@ -9681,31 +9681,31 @@ msgstr "تصميم فهرسه على %s عمود" #: tbl_structure.php:850 msgid "partitioned" -msgstr "" +msgstr "مقسم" #: tbl_tracking.php:109 #, php-format msgid "Tracking report for table `%s`" -msgstr "" +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 msgid "Tracking for %s.%s , version %s is deactivated." -msgstr "" +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." -msgstr "" +msgstr "تم تنفيذ جمل SQL." #: tbl_tracking.php:215 msgid "" @@ -9761,16 +9761,16 @@ msgstr "" #: tbl_tracking.php:503 msgid "SQL execution" -msgstr "" +msgstr "تنفيذ SQL" #: tbl_tracking.php:515 #, php-format msgid "Export as %s" -msgstr "" +msgstr "تصدير كـ %s" #: tbl_tracking.php:555 msgid "Show versions" -msgstr "" +msgstr "عرض الإصدارات" #: tbl_tracking.php:587 msgid "Version" @@ -9779,48 +9779,48 @@ msgstr "نسخة" #: tbl_tracking.php:635 #, php-format msgid "Deactivate tracking for %s.%s" -msgstr "" +msgstr "تعطيل التتبع لـ %s.%s" #: tbl_tracking.php:637 msgid "Deactivate now" -msgstr "" +msgstr "تعطيل الآن" #: tbl_tracking.php:648 #, php-format msgid "Activate tracking for %s.%s" -msgstr "" +msgstr "تنشيط التتبع لـ %s.%s" #: tbl_tracking.php:650 msgid "Activate now" -msgstr "" +msgstr "تنشيط الآن" #: tbl_tracking.php:663 #, php-format msgid "Create version %s of %s.%s" -msgstr "" +msgstr "انشئ إصدار %s لـ %s.s%s" #: tbl_tracking.php:667 msgid "Track these data definition statements:" -msgstr "" +msgstr "تتبع تقارير تعريف البيانات:" #: tbl_tracking.php:675 msgid "Track these data manipulation statements:" -msgstr "" +msgstr "تتبع تقارير التلاعب بالبيانات:" #: tbl_tracking.php:683 msgid "Create version" -msgstr "" +msgstr "إنشاء إصدار" #: themes.php:31 #, php-format 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!" -msgstr "" +msgstr "الحصول على سمات جديدة!" #: transformation_overview.php:24 msgid "Available MIME types" @@ -9852,7 +9852,7 @@ msgstr "لقد تم تجديد العرض الجانبي." #: view_create.php:141 msgid "VIEW name" -msgstr "" +msgstr "اسم VIEW" #: view_operations.php:91 msgid "Rename view to" diff --git a/po/az.po b/po/az.po index 2fb5863..a4aaf0e 100644 --- a/po/az.po +++ b/po/az.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" diff --git a/po/be.po b/po/be.po index 4c12a88..eaa54d9 100644 --- a/po/be.po +++ b/po/be.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 6955f65..9fb80ee 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-30 23:09+0200\n" diff --git a/po/bg.po b/po/bg.po index 3fde37c..2ce1edd 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-22 12:51+0200\n" diff --git a/po/bn.po b/po/bn.po index 93699c1..03e9746 100644 --- a/po/bn.po +++ b/po/bn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-10-21 01:36+0200\n" diff --git a/po/br.po b/po/br.po index a82256a..2de459d 100644 --- a/po/br.po +++ b/po/br.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-07-02 22:10+0200\n" diff --git a/po/bs.po b/po/bs.po index 6d0dbc9..2f5c73a 100644 --- a/po/bs.po +++ b/po/bs.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/ca.po b/po/ca.po index 1b8826e..83f1b58 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-23 09:57+0200\n" diff --git a/po/cs.po b/po/cs.po index 8604cd5..1764229 100644 --- a/po/cs.po +++ b/po/cs.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/cy.po b/po/cy.po index 0707a48..03461b3 100644 --- a/po/cy.po +++ b/po/cy.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-06-07 20:23+0200\n" diff --git a/po/da.po b/po/da.po index e83dbef..56c0148 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-07 01:17+0200\n" diff --git a/po/de.po b/po/de.po index dc8e812..021f3f1 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-23 04:28+0200\n" diff --git a/po/el.po b/po/el.po index c6648e4..78a88b7 100644 --- a/po/el.po +++ b/po/el.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 11:15+0200\n" diff --git a/po/en_GB.po b/po/en_GB.po index 874308d..15a68ba 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 16:24+0200\n" diff --git a/po/es.po b/po/es.po index bdd3262..8c56f78 100644 --- a/po/es.po +++ b/po/es.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-02 11:10+0200\n" diff --git a/po/et.po b/po/et.po index cc565f2..c869af9 100644 --- a/po/et.po +++ b/po/et.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/eu.po b/po/eu.po index 7a353e7..cd4d75c 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:53+0200\n" diff --git a/po/fa.po b/po/fa.po index 705e531..c12c226 100644 --- a/po/fa.po +++ b/po/fa.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-05-19 03:54+0200\n" diff --git a/po/fi.po b/po/fi.po index 7a56ba9..e67822e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-11-26 21:29+0200\n" diff --git a/po/fr.po b/po/fr.po index 986e585..7ad362e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 19:23+0200\n" diff --git a/po/gl.po b/po/gl.po index 1c1f5e2..978a189 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:50+0200\n" diff --git a/po/he.po b/po/he.po index 21c4435..f362cf6 100644 --- a/po/he.po +++ b/po/he.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-02 20:17+0200\n" diff --git a/po/hi.po b/po/hi.po index f935098..be1d45e 100644 --- a/po/hi.po +++ b/po/hi.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-24 00:23+0200\n" diff --git a/po/hr.po b/po/hr.po index 6d62ad0..9245664 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:54+0200\n" diff --git a/po/hu.po b/po/hu.po index b0a1dc5..840fb96 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-05 12:49+0200\n" diff --git a/po/id.po b/po/id.po index c7cb752..628ceb1 100644 --- a/po/id.po +++ b/po/id.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-16 22:04+0200\n" diff --git a/po/it.po b/po/it.po index d296dbc..1fa8902 100644 --- a/po/it.po +++ b/po/it.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 14:27+0200\n" diff --git a/po/ja.po b/po/ja.po index b80ddcc..39a71e7 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-05 11:38+0200\n" diff --git a/po/ka.po b/po/ka.po index e8e6bea..8b078d1 100644 --- a/po/ka.po +++ b/po/ka.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/ko.po b/po/ko.po index 884aebf..0cfd870 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-06-16 18:18+0200\n" diff --git a/po/lt.po b/po/lt.po index 86f0b86..3a0b6da 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 15:52+0200\n" diff --git a/po/lv.po b/po/lv.po index 5add506..25830d1 100644 --- a/po/lv.po +++ b/po/lv.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" diff --git a/po/mk.po b/po/mk.po index b8e2e47..e114871 100644 --- a/po/mk.po +++ b/po/mk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" diff --git a/po/ml.po b/po/ml.po index ecf8234..41621f0 100644 --- a/po/ml.po +++ b/po/ml.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the phpMyAdmin package. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/mn.po b/po/mn.po index 8041182..8b9eb6c 100644 --- a/po/mn.po +++ b/po/mn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" diff --git a/po/ms.po b/po/ms.po index 9d20d13..8d57299 100644 --- a/po/ms.po +++ b/po/ms.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" diff --git a/po/nb.po b/po/nb.po index 76846ff..2e18bab 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-07 11:21+0200\n" diff --git a/po/nl.po b/po/nl.po index 774df59..0d28880 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-16 20:18+0200\n" diff --git a/po/pl.po b/po/pl.po index fe6eaa2..2a598d6 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-24 16:21+0200\n" diff --git a/po/pt.po b/po/pt.po index e221ac2..b0ac165 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-26 03:23+0200\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index b1e1fed..4e8c1a0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-14 17:44+0200\n" @@ -9062,7 +9062,7 @@ msgstr "Aplicar mudanças selecionadas" #: server_synchronize.php:450 server_synchronize.php:895 msgid "Synchronize Databases" -msgstr "" +msgstr "Sincronizar Bando de Dados" #: server_synchronize.php:463 msgid "Selected target tables have been synchronized with source tables." @@ -9133,6 +9133,8 @@ msgid "" "You are not using a secure connection; all data (including potentially " "sensitive information, like passwords) is transferred unencrypted!" msgstr "" +"Você não está usando conexão segura; todos dados (incluindo possíveis " +"informações sensíveis, como senhas) são transferidos sem criptografia." #: setup/frames/index.inc.php:60 #, php-format @@ -9140,6 +9142,8 @@ msgid "" "If your server is also configured to accept HTTPS requests follow [a@%s]this " "link[/a] to use a secure connection." msgstr "" +"Se o seu servidor também está configurado para aceitar requisições HTTPS " +"siga [a@%s]este link[/a] para usar uma conexão segura." #: setup/frames/index.inc.php:64 msgid "Insecure connection" @@ -9236,6 +9240,8 @@ msgid "" "Reading of version failed. Maybe you're offline or the upgrade server does " "not respond." msgstr "" +"Leitura de versão falhou. Você pode estar offline ou o servidor de " +"atualização não responde." #: setup/lib/index.lib.php:143 msgid "Got invalid version string from server" @@ -9251,10 +9257,12 @@ msgid "" "You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable " "version is %s, released on %s." msgstr "" +"Se você estiver usando versão do Gir, execute [kbd]git pull[/kbd] :-)[br]A " +"versão estável mais nova é %s, lançada em %s." #: setup/lib/index.lib.php:165 msgid "No newer stable version is available" -msgstr "" +msgstr "Não existe nenhuma versão estável mais nova." #: setup/lib/index.lib.php:250 #, php-format @@ -9284,11 +9292,13 @@ msgid "" "This value should be double checked to ensure that this directory is neither " "world accessible nor readable or writable by other users on your server." msgstr "" +"Este valor deve ser verificado com atenção para garantir que este diretório " +"não seja acessado ou escrito por outros usuários no seu servidor." #: setup/lib/index.lib.php:256 #, php-format msgid "This %soption%s should be enabled if your web server supports it." -msgstr "" +msgstr "Esta %sopção%s deveria estar habilitada se seu navegador tem suporter." #: setup/lib/index.lib.php:258 #, php-format @@ -9384,7 +9394,7 @@ msgstr "Visualizar valores estrangeiros" #: sql.php:163 #, php-format msgid "Using bookmark \"%s\" as default browse query." -msgstr "" +msgstr "Usando marcador \"%s\" como padrão." #: sql.php:600 tbl_replace.php:387 #, php-format @@ -9427,7 +9437,7 @@ msgstr "Por causa da sua largura,<br /> esse campo pode não ser editável" #: tbl_change.php:875 msgid "Remove BLOB Repository Reference" -msgstr "" +msgstr "Remover referência a repositório BLOB" #: tbl_change.php:881 msgid "Binary - do not edit" @@ -9535,7 +9545,7 @@ msgstr "Mar" #: tbl_chart.php:135 msgid "Line" -msgstr "" +msgstr "Linhas" #: tbl_chart.php:136 msgid "Radar" @@ -9822,6 +9832,8 @@ msgid "" "An internal relation is not necessary when a corresponding FOREIGN KEY " "relation exists." msgstr "" +"Uma relação interna é desnecessária quando uma CHAVE ESTRANGEIRA " +"correspondente existe." #: tbl_relation.php:410 msgid "Foreign key constraint" @@ -9944,22 +9956,22 @@ msgstr "particionado" #: tbl_tracking.php:109 #, php-format msgid "Tracking report for table `%s`" -msgstr "" +msgstr "Relatório de rastreamento para tabela `%s`" #: tbl_tracking.php:182 #, php-format msgid "Version %s is created, tracking for %s.%s is activated." -msgstr "" +msgstr "Versão %s criada, rastreamento para %s. %s ativado(a)." #: tbl_tracking.php:190 #, php-format msgid "Tracking for %s.%s , version %s is deactivated." -msgstr "" +msgstr "Rastreamento para %s.%s, versão %s desativado(a)." #: tbl_tracking.php:198 #, php-format msgid "Tracking for %s.%s , version %s is activated." -msgstr "" +msgstr "Rastreamento para %s.%s, versão %s ativado(a)." #: tbl_tracking.php:208 msgid "SQL statements executed." @@ -9970,6 +9982,8 @@ msgid "" "You can execute the dump by creating and using a temporary database. Please " "ensure that you have the privileges to do so." msgstr "" +"Você pode executar o dump criando e usando uma tabela temporária.Por favor, " +"certifique-se de ter os privilégios necessários." #: tbl_tracking.php:216 msgid "Comment out these two lines if you do not need them." @@ -9983,7 +9997,7 @@ msgstr "Instruções SQL exportadas. Por favor copie a saída ou execute." #: tbl_tracking.php:256str "Instruções SQL exportadas. Por favor copie a saída ou execute."مسار %s."`��"b�"+�b�"+��P��b�"+Ȅc�"+��"+��~�"+P��"+`��0��b�"+6 ��!�!��P��x�~�"+`��"b�"+b�"+��b�"+��"+�b�"+��"+ؤ��"+��"+Ȅc�"+x�~�"+`��0��b�"+�!�!��P��}^�"+@��"b�"+b�"+��b�"+��"+�p�P��b�"+Ȅc�"+@��b�"+GHIJKMNOP��P��H55�"+��"b�"+b�"+��0��"+�b�"+�~�"+�i�"+��"+ؤ��"+��"+Ȅc�"+H55�"+�� b�"+855�"+��P��b�"+(55�"+��b�"+55�"+��b�"+ ��"+�b�"+��"+0��"+�b�"+ؤ��"+P��y��"+�b�"+��"+��Z��"+�b�"+�d�"+�~�"+�i�"+��"+��~�"+ؤ��"+��"+Ȅc�"+��"+��В��b�"+#%')*-.035678:<=��P��p��"+ ��"b�"+8�~�"+�b�"+��~�"+��~�"+Ȅc�"+cf-��"+P��p��"+ ��b�"+�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv�®�"+��F�E�"+F�E�"+?��"+P��p��-��"+�b�"+��"+М��B�E�"+��"+P��B�E�"+X��b� #, php-format msgid "Version %s snapshot (SQL code)" -msgstr "" +msgstr "Instantâneo (código SQL) da versão %s" #: tbl_tracking.php:375 msgid "Tracking statements" @@ -9992,7 +10006,7 @@ msgstr "Rastreando instruções" #: tbl_tracking.php:391 tbl_tracking.php:498 #, php-format msgid "Show %s with dates from %s to %s by user %s %s" -msgstr "" +msgstr "Mostrar %s com datas desde %s até %s pelo usuário %s %s" #: tbl_tracking.php:404 tbl_tracking.php:455 msgid "Date" diff --git a/po/ro.po b/po/ro.po index a63fc1e..06b266e 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:28+0200\n" diff --git a/po/ru.po b/po/ru.po index 118386e..1f7d288 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-13 21:17+0200\n" diff --git a/po/si.po b/po/si.po index 0ea1e61..b026afd 100644 --- a/po/si.po +++ b/po/si.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-04 14:56+0200\n" diff --git a/po/sk.po b/po/sk.po index 090f11a..d838faf 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:26+0200\n" @@ -5458,7 +5458,7 @@ msgstr "" #: libraries/engines/pbms.lib.php:60 msgid "Metadata Headers" -msgstr "" +msgstr "Hlavičky metadát" #: libraries/engines/pbms.lib.php:61 msgid "" @@ -5489,13 +5489,16 @@ msgstr "" #: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" -msgstr "" +msgstr "Veľkosť vyrovnávacej pamäte indexu" #: libraries/engines/pbxt.lib.php:23 msgid "" "This is the amount of memory allocated to the index cache. Default value is " "32MB. The memory allocated here is used only for caching index pages." msgstr "" +"Množstvo pamäte vyhradenej pre vyrovnávaciu pamät indexu. Štandardná hodnota " +"je 32MB. Pamät tu priradená je použitá výhradne pre vyrovnávaciu pamäť " +"indexových stránok." #: libraries/engines/pbxt.lib.php:27 msgid "Record cache size" @@ -5527,6 +5530,8 @@ msgid "" "The size of a transaction log before rollover, and a new log is created. The " "default value is 16MB." msgstr "" +"Maximálna veľkosť transakčného logu pred jeho pretočením a vytvorením " +"nového. Štandardná hodnota je 16MB." #: libraries/engines/pbxt.lib.php:42 msgid "Transaction buffer size" diff --git a/po/sl.po b/po/sl.po index 6218594..89a92b2 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-24 22:38+0200\n" diff --git a/po/sq.po b/po/sq.po index c7f0ceb..a6f4904 100644 --- a/po/sq.po +++ b/po/sq.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:51+0200\n" diff --git a/po/sr.po b/po/sr.po index 682f2a6..74b3188 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-06 18:43+0200\n" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index fcbed3d..4b55d12 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-12-02 14:49+0200\n" diff --git a/po/sv.po b/po/sv.po index e75541e..9337e11 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-16 21:42+0200\n" diff --git a/po/ta.po b/po/ta.po index e74db14..41e2638 100644 --- a/po/ta.po +++ b/po/ta.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-04-16 10:43+0200\n" diff --git a/po/te.po b/po/te.po index 5703a51..493f6a6 100644 --- a/po/te.po +++ b/po/te.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-07 17:06+0200\n" diff --git a/po/th.po b/po/th.po index b8433e8..2bd3a13 100644 --- a/po/th.po +++ b/po/th.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" @@ -109,7 +109,7 @@ msgstr "เชื่อมต่อ url ปลายทางไม่สำเ msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." -msgstr "" +msgstr "ไม่สามารถเปิดไฟล์ %s ได้ เพื่อรายละเอียด กรุณาไป www.phpmyadmin.net" #: db_create.php:58 #, fuzzy, php-format diff --git a/po/tr.po b/po/tr.po index b6c8848..ad74c21 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-17 19:11+0200\n" diff --git a/po/tt.po b/po/tt.po index b1e9e00..b91a6ff 100644 --- a/po/tt.po +++ b/po/tt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:25+0200\n" diff --git a/po/ug.po b/po/ug.po index 61906b7..10db998 100644 --- a/po/ug.po +++ b/po/ug.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-08-26 11:59+0200\n" diff --git a/po/uk.po b/po/uk.po index f989eca..1444106 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-12-28 22:26+0200\n" diff --git a/po/ur.po b/po/ur.po index b01dafe..b1fcbea 100644 --- a/po/ur.po +++ b/po/ur.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-23 08:37+0200\n" diff --git a/po/uz.po b/po/uz.po index 3128f9c..e366602 100644 --- a/po/uz.po +++ b/po/uz.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:31+0200\n" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 27d8b41..9291e43 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:30+0200\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index df17d82..16d1d18 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-04 09:47+0200\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 02f7d75..c899c19 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-31 09:47+0800\n" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-59-gc17add3
by Michal Čihař 02 Aug '11

02 Aug '11

The branch, QA_3_4 has been updated via c17add38ed40312f934451e1d1cf1f0b0ef8240e (commit) from 11ad4fd992e51b86c127c95112ee313bdaaa9757 (commit) - Log ----------------------------------------------------------------- commit c17add38ed40312f934451e1d1cf1f0b0ef8240e Author: Rouslan Placella <rouslan(a)placella.com> Date: Fri Jul 22 14:52:07 2011 +0100 Fixed bug #3374802 - Comment on a column breaks inline editing ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/sql.js | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a2360a..dbcc2ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 3.4.5.0 (not yet released) - bug #3375325 [interface] Page list in navigation frame looks odd - bug #3313235 [interface] Error div misplaced +- bug #3374802 [interface] Comment on a column breaks inline editing 3.4.4.0 (not yet released) - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes diff --git a/js/sql.js b/js/sql.js index b185b69..dbba441 100644 --- a/js/sql.js +++ b/js/sql.js @@ -33,10 +33,10 @@ function PMA_urlencode(str) { function getFieldName($this_field, disp_mode) { if(disp_mode == 'vertical') { - var field_name = $this_field.siblings('th').find('a').text(); + var $field = $this_field.siblings('th').find('a').clone(); // happens when just one row (headings contain no a) - if ("" == field_name) { - field_name = $this_field.siblings('th').text(); + if ($field.length == 0) { + $field = $this_field.siblings('th').clone(); } } else { @@ -44,14 +44,14 @@ function getFieldName($this_field, disp_mode) { // ltr or rtl direction does not impact how the DOM was generated // // 5 columns to account for the checkbox, edit, appended inline edit, copy and delete anchors but index is zero-based so substract 4 - var field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index-4 )+') a').text(); + var $field = $('#table_results').find('thead').find('th:nth('+ (this_field_index-4 )+') a').clone(); // happens when just one row (headings contain no a) - if ("" == field_name) { - field_name = $('#table_results').find('thead').find('th:nth('+ (this_field_index-4 )+')').text(); + if ($field.length == 0) { + $field = $('#table_results').find('thead').find('th:nth('+ (this_field_index-4 )+')').clone(); } } - - field_name = $.trim(field_name); + $field.children().remove(); + var field_name = $.trim($field.text()); return field_name; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12843-g9fcb5e7
by Michal Čihař 02 Aug '11

02 Aug '11

The branch, master has been updated via 9fcb5e7c8662e5f9a71babe684a9a87b37208a46 (commit) via dff4e25c552e360ccbbbf5f11cad1294916be029 (commit) from 98cff52cf8d2022eea50eb62e239b4be6787c737 (commit) - Log ----------------------------------------------------------------- commit 9fcb5e7c8662e5f9a71babe684a9a87b37208a46 Merge: 98cff52cf8d2022eea50eb62e239b4be6787c737 dff4e25c552e360ccbbbf5f11cad1294916be029 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Aug 2 16:04:07 2011 +0200 Merge branch 'fix-inlineedit' of git://github.com/csware/phpmyadmin into integration commit dff4e25c552e360ccbbbf5f11cad1294916be029 Author: Sven Strickroth <email(a)cs-ware.de> Date: Mon Aug 1 15:05:18 2011 +0200 inline editing a SQL query doesn't work if it's too long Signed-off-by: Sven Strickroth <email(a)cs-ware.de> ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 61f5aa6..d812262 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1182,7 +1182,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // in the tools div, only display the Inline link when not in ajax // mode because 1) it currently does not work and 2) we would // have two similar mechanisms on the page for the same goal - if ($is_select || $GLOBALS['is_ajax_request'] === false) { + if ($is_select || $GLOBALS['is_ajax_request'] === false && ! $query_too_big) { // see in js/functions.js the jQuery code attached to id inline_edit // document.write conflicts with jQuery, hence used $().append() echo "<script type=\"text/javascript\">\n" . hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12841-g98cff52
by Michal Čihař 02 Aug '11

02 Aug '11

The branch, master has been updated via 98cff52cf8d2022eea50eb62e239b4be6787c737 (commit) from 3769b849aa6a72f8816cf6bc2cacbff506a2fe85 (commit) - Log ----------------------------------------------------------------- commit 98cff52cf8d2022eea50eb62e239b4be6787c737 Author: Michal Čihař <mcihar(a)suse.cz> Date: Tue Aug 2 15:54:52 2011 +0200 Fix indentation in few places ----------------------------------------------------------------------- Summary of changes: libraries/sqlparser.lib.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index fa77136..b7b0455 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -2629,12 +2629,12 @@ if (! defined('PMA_MINIMUM_COMMON')) { break; } // end switch ($typearr[2]) -/* + /* if ($typearr[3] != 'punct_qualifier') { $after .= ' '; } $after .= "\n"; -*/ + */ $str .= $before; if ($mode=='color') { $str .= PMA_SQP_formatHTML_colorize($arr[$i]); @@ -2650,7 +2650,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $indent--; $str .= ($mode != 'query_only' ? '</div>' : ' '); } - /* End possibly unclosed documentation link */ + /* End possibly unclosed documentation link */ if ($close_docu_link) { $str .= '</a>'; $close_docu_link = false; 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 August 2011