May 2010 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_3_3-4-gc7b61bd
by Marc Delisle 10 May '10

10 May '10

The branch, TESTING has been updated via c7b61bdab3ffe3bb58bef54370a8d1d9c8f90c3b (commit) via 38445bef624fe105dce758d20b5fad8ec70c950c (commit) from 80dc561011fe54101cb1d7b4665e224d9101cc93 (commit) - Log ----------------------------------------------------------------- commit c7b61bdab3ffe3bb58bef54370a8d1d9c8f90c3b Merge: 80dc561011fe54101cb1d7b4665e224d9101cc93 38445bef624fe105dce758d20b5fad8ec70c950c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon May 10 12:33:06 2010 -0400 Merge branch 'MAINT_3_3_3' into TESTING ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7772eb6..ad395fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ -3.3.3.0 (not yet released) +3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, thanks to Lorikeet Lee. - patch #2983492 [sync] When asking to synchronize Structure and Data, diff --git a/Documentation.html b/Documentation.html index 2297d29..d8aa720 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.3-rc1 - Documentation</title> + <title>phpMyAdmin 3.3.3 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.3-rc1 + 3.3.3 Documentation </h1> </div> diff --git a/README b/README index 674ddef..9edfc16 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.3-rc1 - ----------------- + Version 3.3.3 + ------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 2e12514..549775a 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.3-rc1'); + $this->set('PMA_VERSION', '3.3.3'); /** * @deprecated */ diff --git a/translators.html b/translators.html index d08bf66..813fd02 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.3-rc1 - Official translators</title> + <title>phpMyAdmin 3.3.3 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.3-rc1 + 3.3.3 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, STABLE, updated. RELEASE_3_3_3-2-g55bf660
by Marc Delisle 10 May '10

10 May '10

The branch, STABLE has been updated via 55bf660d2fd490787a3fd0cec99ccb2409248efd (commit) via 38445bef624fe105dce758d20b5fad8ec70c950c (commit) via 5f8c1f9268bfa6046f8d754f2f062d1d9e964043 (commit) via 6b50847a8c6672ebf3e8e93b02f9e2d0b1dcce48 (commit) via ef2a411db9b005956705c4c3b577f2848189ec26 (commit) via b76df0d6099704dad6414d4fe4aaccb6694b61a5 (commit) via 06c8fa0abbe2ff3a9c05f8514e229f1a64eb514b (commit) via bd4e0b83d8f13060e8422c86dca1e4fa2babc7c4 (commit) via f97fafea3dc55ba9a98a10fba1787c3cea4b953e (commit) via 6393fff59dfe8fdc7d43f434fe282378c91c10c9 (commit) via e9ee6cf1d12332d99095ce2a1b81d2bc3f0fa064 (commit) via acdf39e95b355bc656409b66174afe6b7e0f39c6 (commit) via 769aec95effaa407fc62778a23549b902fd586d9 (commit) via 69dd779f407a41d9b6ea5b8c7418cfac322368cb (commit) via b6132c51540b24d821641d0a2c7a749bbc55d813 (commit) via 30acade5a799a77321a9a1e2f7f97681f4e8b401 (commit) via 55572a531ca411d9a449f409150ffb0836a111d9 (commit) via 96071655352ab316d2760c141613bebb72c8b2db (commit) via a879b646202566cc5895a7b28c89016bb323e64c (commit) via f73b0e0195be22ee89c244e26301051f4d7a1933 (commit) via d0d24a6e714646a3660c64549382c07375967feb (commit) via a59d10027bd7fb5a54c8458ed55612dbbcaf2a67 (commit) via b3c041bb997b939f96c58a330f9ea9168aef738b (commit) via a99858b16a40bcfceec01667eb2814a1acf45f6d (commit) via c9d7a662101b57abe754393ab6424b05ab0e685f (commit) via 5113ef198fad589f7952b9982062ce2aba1847d4 (commit) via c454825bca7e291019a89a258d9873cd37f93771 (commit) via f10f34fc6d9a3c894fda81347e78c3e6a0f38fa3 (commit) via 0fc25ac29348166b85a272400c4f28466d343f29 (commit) via 8a7b66f3a0e0a45d87ba60cdbf72b417d80194b9 (commit) via 210b7631da5ddd30ae2d46e90226bc0b2c39d3a0 (commit) from 3fe82098c91f784c312ca27d01a07a14515a641d (commit) - Log ----------------------------------------------------------------- commit 55bf660d2fd490787a3fd0cec99ccb2409248efd Merge: 3fe82098c91f784c312ca27d01a07a14515a641d 38445bef624fe105dce758d20b5fad8ec70c950c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon May 10 12:33:06 2010 -0400 Merge branch 'MAINT_3_3_3' into STABLE ----------------------------------------------------------------------- Summary of changes: ChangeLog | 24 ++++++++++++++++++++++++ Documentation.html | 6 +++--- README | 2 +- libraries/Config.class.php | 2 +- libraries/PHPExcel/PHPExcel/Shared/String.php | 6 +++++- libraries/common.lib.php | 13 ++++++++++++- libraries/display_tbl.lib.php | 2 +- libraries/engines/innodb.lib.php | 2 +- libraries/select_lang.lib.php | 4 ++-- libraries/server_synchronize.lib.php | 16 +++++++++------- navigation.php | 12 +++++++++++- pdf_schema.php | 6 +++--- pmd_general.php | 2 +- scripts/create_tables.sql | 12 +++++++----- tbl_change.php | 2 +- tbl_operations.php | 18 +++++++++++++++--- tbl_structure.php | 2 +- tbl_tracking.php | 14 ++++++++++---- translators.html | 6 +++--- 19 files changed, 111 insertions(+), 40 deletions(-) mode change 100755 => 100644 libraries/export/mediawiki.php diff --git a/ChangeLog b/ChangeLog index a5c87d3..ad395fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,30 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ +3.3.3.0 (2010-05-10) +- patch #2982480 [navi] Do not group if there would be one table in group, + thanks to Lorikeet Lee. +- patch #2983492 [sync] When asking to synchronize Structure and Data, + only Structure is done, thanks to Ankit Gupta - ankitgupta3 +- patch #2984893 [engines] InnoDB storage page emits a warning, + thanks to Madhura Jayaratne - madhuracj +- bug #2974687, bug #2974692 [compatibility] PHPExcel : IBM AIX iconv() does not work, + thanks to Björn Wiberg - bwiberg +- bug #2983066 [interface] Flush table on table operations shows the query twice, + thanks to Martynas Mickevičius - BlinK_ +- bug #2983060, patch #2987900 [interface] Fix initial state of tables in + designer, thanks to Sutharshan Balachandren. +- bug #2983062, patch #2989408 [engines] Fix warnings when changing table + engine to Maria, thanks to Madhura Jayaratne. +- bug #2974067 [display] non-binary fields shown as hex +- bug #2983065 [operations] Error when changing from Maria to MyISAM engine +- bug #2975408 [tracking] Data too long for column data_sql +- bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL +- bug [edit] Avoid selecting UNHEX function by default for a BLOB column for + which editing is protected +- bug #2994168 [structure] Show auto_increment in uppercase +- bug #2993970 [pdf schema] Page numbering in Table of Contents + 3.3.2.0 (2010-04-13) - patch #2969449 [core] Name for MERGE engine varies depending on the MySQL version, thanks to Dieter Adriaenssens - ruleant diff --git a/Documentation.html b/Documentation.html index 330161f..d8aa720 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.2 - Documentation</title> + <title>phpMyAdmin 3.3.3 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.2 + 3.3.3 Documentation </h1> </div> @@ -4999,7 +4999,7 @@ Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, "Manuzhai". </div> <ul id="footer"> - <li>Copyright © 2003 - 2009 <a href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel team</a></li> + <li>Copyright © 2003 - 2010 <a href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel team</a></li> <li><a href="LICENSE">License</a></li> <li><a href="http://www.phpmyadmin.net/home_page/donate.php">Donate</a></li> <li class="last">Valid <a href="http://validator.w3.org/check/referer">HTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></li> diff --git a/README b/README index ae0af44..9edfc16 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.2 + Version 3.3.3 ------------- http://www.phpmyadmin.net/ diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 63b314a..8cdc051 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.2'); + $this->set('PMA_VERSION', '3.3.3'); /** * @deprecated */ diff --git a/libraries/PHPExcel/PHPExcel/Shared/String.php b/libraries/PHPExcel/PHPExcel/Shared/String.php index b6a17a3..8a105f0 100644 --- a/libraries/PHPExcel/PHPExcel/Shared/String.php +++ b/libraries/PHPExcel/PHPExcel/Shared/String.php @@ -97,7 +97,11 @@ class PHPExcel_Shared_String return self::$_isIconvEnabled; } - self::$_isIconvEnabled = function_exists('iconv') ? + // IBM AIX iconv() does not work + self::$_isIconvEnabled = function_exists('iconv') && + !(defined('PHP_OS') && @stristr(PHP_OS, 'AIX') && defined('ICONV_IMPL') + && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && defined('ICONV_VERSION') + && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) ? true : false; return self::$_isIconvEnabled; diff --git a/libraries/common.lib.php b/libraries/common.lib.php index d9ff7c5..2e18474 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1397,7 +1397,7 @@ function PMA_formatByteDown($value, $limes = 6, $comma = 0) $return_value = PMA_formatNumber($value, 0); } - return array($return_value, $unit); + return array(trim($return_value), $unit); } // end of the 'PMA_formatByteDown' function /** @@ -2596,6 +2596,17 @@ function PMA_printable_bit_value($value, $length) { } /** + * Verifies whether the value contains a non-printable character + * + * @uses preg_match() + * @param string $value + * @return boolean + */ +function PMA_contains_nonprintable_ascii($value) { + return preg_match('@[^[:print:]]@', $value); +} + +/** * Converts a BIT type default value * for example, b'010' becomes 010 * diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 41bb987..05feefb 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1368,7 +1368,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if ($_SESSION['tmp_user_values']['display_binary']) { // user asked to see the real contents of BINARY // fields - if ($_SESSION['tmp_user_values']['display_binary_as_hex']) { + if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && PMA_contains_nonprintable_ascii($row[$i])) { $row[$i] = bin2hex($row[$i]); } else { diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php index 894d7ed..44e53f7 100644 --- a/libraries/engines/innodb.lib.php +++ b/libraries/engines/innodb.lib.php @@ -109,7 +109,7 @@ class PMA_StorageEngine_innodb extends PMA_StorageEngine 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC, ), 'innodb_table_locks' => array( - 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC, + 'type' => PMA_ENGINE_DETAILS_TYPE_BOOLEAN, ), 'innodb_thread_concurrency' => array( 'type' => PMA_ENGINE_DETAILS_TYPE_NUMERIC, diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php old mode 100755 new mode 100644 diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index c1589c4..5e5762a 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -68,9 +68,9 @@ function PMA_langCheck() if (! empty($_COOKIE['pma_lang'])) { if (PMA_langSet($_COOKIE['pma_lang'])) { return true; - } elseif (!is_string($_COOKIE['lang'])) { + } elseif (!is_string($_COOKIE['pma_lang'])) { /* Faked request, don't care on localisation */ - $GLOBALS['lang_failed_request'] = 'Yes'; + $GLOBALS['lang_failed_cookie'] = 'Yes'; } else { $GLOBALS['lang_failed_cookie'] = $_COOKIE['pma_lang']; } diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 8978cc6..79948b9 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -671,11 +671,11 @@ function PMA_createTargetTables($src_db, $trg_db, $src_link, $trg_link, &$uncomm function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncommon_tables, $table_index, $uncommon_tables_fields, $display) { $display = false; // todo: maybe display some of the queries if they are not too numerous - $unbuffered_result = PMA_DBI_try_query('SELECT * FROM ' . PMA_backquote($src_db) . '.' . PMA_backquote($uncommon_tables[$table_index]), $src_link, PMA_DBI_QUERY_UNBUFFERED); if (false !== $unbuffered_result) { + $insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]) . ' VALUES'; while ($one_row = PMA_DBI_fetch_row($unbuffered_result)) { - $insert_query = 'INSERT INTO ' . PMA_backquote($trg_db) . '.' .PMA_backquote($uncommon_tables[$table_index]) . ' VALUES('; + $insert_query .= '('; $key_of_last_value = count($one_row) - 1; foreach($one_row as $key => $value) { $insert_query .= "'" . PMA_sqlAddslashes($value) . "'"; @@ -683,12 +683,14 @@ function PMA_populateTargetTables($src_db, $trg_db, $src_link, $trg_link, $uncom $insert_query .= ","; } } - $insert_query .= ');'; - if ($display == true) { - PMA_displayQuery($insert_query); - } - PMA_DBI_try_query($insert_query, $trg_link, 0); + $insert_query .= '),'; + } + $insert_query = substr($insert_query, 0, -1); + $insert_query .= ';'; + if ($display == true) { + PMA_displayQuery($insert_query); } + PMA_DBI_try_query($insert_query, $trg_link, 0); } } /** diff --git a/navigation.php b/navigation.php index fb5e52c..17d0193 100644 --- a/navigation.php +++ b/navigation.php @@ -554,7 +554,8 @@ function PMA_displayTableList($tables, $visible = false, echo '<ul id="subel' . $element_counter . '" style="display: none">'; } foreach ($tables as $group => $table) { - if (isset($table['is' . $sep . 'group'])) { + // only allow grouping if the group has more than 1 table + if (isset($table['is' . $sep . 'group']) && $table['tab' . $sep . 'count'] > 1) { $common_url_query = $GLOBALS['common_url_query'] . '&tbl_group=' . urlencode($tab_group_full . $group); @@ -610,6 +611,15 @@ function PMA_displayTableList($tables, $visible = false, } echo '</li>' . "\n"; } elseif (is_array($table)) { + // the table was not grouped because it is the only one with its prefix + if (isset($table['is' . $sep . 'group'])) { + // get the array with the actual table information + foreach ($table as $value) { + if(is_array($value)) { + $table = $value; + } + } + } $link_title = PMA_getTitleForTarget($GLOBALS['cfg']['LeftDefaultTabTable']); // quick access icon next to each table name echo '<li>' . "\n"; diff --git a/pdf_schema.php b/pdf_schema.php index 552ee32..ce87e97 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -1127,7 +1127,7 @@ function PMA_RT_DOC($alltables) $pdf->PMA_links['doc'][$table]['-'] = $pdf->AddLink(); $pdf->SetX(10); // $pdf->Ln(1); - $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']); + $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$table]['-']); $pdf->SetX(10); $pdf->Cell(0, 6, $i . ' ' . $table, 0, 1, 'L', 0, $pdf->PMA_links['doc'][$table]['-']); // $pdf->Ln(1); @@ -1143,9 +1143,9 @@ function PMA_RT_DOC($alltables) } $pdf->PMA_links['RT']['-'] = $pdf->AddLink(); $pdf->SetX(10); - $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {00}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']); + $pdf->Cell(0, 6, $GLOBALS['strPageNumber'] . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']); $pdf->SetX(10); - $pdf->Cell(0, 6, $i . ' ' . $GLOBALS['strRelationalSchema'], 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); + $pdf->Cell(0, 6, $i + 1 . ' ' . $GLOBALS['strRelationalSchema'], 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); $z = 0; foreach ($alltables AS $table) { $z++; diff --git a/pmd_general.php b/pmd_general.php index 8fd22fd..6956dd6 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -225,7 +225,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </tr> </thead> <tbody id="id_tbody_<?php echo $t_n_url ?>" - <?php if (! isset($tab_pos[$t_n])) echo 'style="display: none;"'; ?>> + <?php if ( isset($tab_pos[$t_n])) echo 'style="display: none;"'; ?>> <?php $display_field = PMA_getDisplayField($db, $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i]); for ($j = 0, $id_cnt = count($tab_column[$t_n]["COLUMN_ID"]); $j < $id_cnt; $j++) { diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index de225ee..bcb8b35 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -1,8 +1,8 @@ -- -------------------------------------------------------- -- SQL Commands to set up the pmadb as described in Documentation.html. --- +-- -- This file is meant for use with MySQL 5 and above! --- +-- -- This script expects the user pma to already be existing. If we would put a -- line here to create him too many users might just use this script and end -- up with having the same password for the controluser. @@ -173,9 +173,11 @@ CREATE TABLE IF NOT EXISTS `pma_designer_coords` ( ENGINE=MyISAM COMMENT='Table coordinates for Designer' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; --- +-- -------------------------------------------------------- + +-- -- Table structure for table `pma_tracking` --- +-- CREATE TABLE IF NOT EXISTS `pma_tracking` ( `db_name` varchar(64) collate utf8_bin NOT NULL, @@ -185,7 +187,7 @@ CREATE TABLE IF NOT EXISTS `pma_tracking` ( `date_updated` datetime NOT NULL, `schema_snapshot` text collate utf8_bin NOT NULL, `schema_sql` text collate utf8_bin, - `data_sql` text collate utf8_bin, + `data_sql` longtext collate utf8_bin, `tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') collate utf8_bin default NULL, `tracking_active` int(1) unsigned NOT NULL default '1', PRIMARY KEY (`db_name`,`table_name`,`version`) diff --git a/tbl_change.php b/tbl_change.php index f8cc1c0..d7b86dd 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -482,7 +482,7 @@ foreach ($rows as $row_id => $vrow) { $backup_field = ''; $special_chars_encoded = PMA_duplicateFirstNewline($special_chars); // this will select the UNHEX function while inserting - if (($field['is_binary'] || $field['is_blob']) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) { + if (($field['is_binary'] || ($field['is_blob'] && ! $cfg['ProtectBinary'])) && $_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) { $field['display_binary_as_hex'] = true; } } diff --git a/tbl_operations.php b/tbl_operations.php index d045307..98e5f1b 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -95,6 +95,10 @@ if (isset($_REQUEST['submitoptions'])) { $tbl_type = $_REQUEST['new_tbl_type']; // reset the globals for the new engine PMA_set_global_variables_for_engine($tbl_type); + if ($is_maria) { + $transactional = (isset($transactional) && $transactional == '0') ? '0' : '1'; + $page_checksum = (isset($page_checksum)) ? $page_checksum : ''; + } } if (! empty($_REQUEST['tbl_collation']) @@ -153,8 +157,16 @@ if (isset($_REQUEST['submitoptions'])) { $reread_info = true; unset($table_alters); foreach (PMA_DBI_get_warnings() as $warning) { - $warning_messages[] = $warning['Level'] . ': #' . $warning['Code'] - . ' ' . $warning['Message']; + // In MariaDB 5.1.44, when altering a table from Maria to MyISAM + // and if TRANSACTIONAL was set, the system reports an error; + // I discussed with a Maria developer and he agrees that this + // should not be reported with a Level of Error, so here + // I just ignore it. But there are other 1478 messages + // that it's better to show. + if (! ($_REQUEST['new_tbl_type'] == 'MyISAM' && $warning['Code'] == '1478' && $warning['Level'] == 'Error')) { + $warning_messages[] = $warning['Level'] . ': #' . $warning['Code'] + . ' ' . $warning['Message']; + } } } } @@ -193,7 +205,7 @@ unset($reread_info); */ require_once './libraries/tbl_links.inc.php'; -if (isset($result)) { +if (isset($result) && empty($zero_rows)) { // set to success by default, because result set could be empty // (for example, a table rename) $_type = 'success'; diff --git a/tbl_structure.php b/tbl_structure.php index 0d966cc..fbe844d 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -346,7 +346,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { else { echo '<i>' . $strNoneDefault . '</i>'; } ?></td> - <td nowrap="nowrap"><?php echo $row['Extra']; ?></td> + <td nowrap="nowrap"><?php echo strtoupper($row['Extra']); ?></td> <td align="center"> <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('SELECT COUNT(*) AS ' . PMA_backquote($strRows) . ', ' . PMA_backquote($row['Field']) . ' FROM ' . PMA_backquote($table) . ' GROUP BY ' . PMA_backquote($row['Field']) . ' ORDER BY ' . PMA_backquote($row['Field'])); ?>"> <?php echo $titles['BrowseDistinctValues']; ?></a> diff --git a/tbl_tracking.php b/tbl_tracking.php index fbee82a..224ed87 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -417,8 +417,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { <?php $style = 'odd'; foreach ($data['ddlog'] as $entry) { - $parsed_sql = PMA_SQP_parse($entry['statement']); - $statement = PMA_formatSql($parsed_sql); + if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { + $statement = substr($entry['statement'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]'; + } else { + $statement = PMA_formatSql(PMA_SQP_parse($entry['statement'])); + } $timestamp = strtotime($entry['date']); if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to && @@ -465,8 +468,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) { <?php $style = 'odd'; foreach ($data['dmlog'] as $entry) { - $parsed_sql = PMA_SQP_parse($entry['statement']); - $statement = PMA_formatSql($parsed_sql); + if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { + $statement = substr($entry['statement'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]'; + } else { + $statement = PMA_formatSql(PMA_SQP_parse($entry['statement'])); + } $timestamp = strtotime($entry['date']); if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to && diff --git a/translators.html b/translators.html index 00f7ab3..813fd02 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.2 - Official translators</title> + <title>phpMyAdmin 3.3.3 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.2 + 3.3.3 official translators list </h1> </div> @@ -446,7 +446,7 @@ </div> <ul id="footer"> - <li>Copyright © 2003 - 2009 <a href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel team</a></li> + <li>Copyright © 2003 - 2010 <a href="http://www.phpmyadmin.net/home_page/team.php">phpMyAdmin devel team</a></li> <li><a href="LICENSE">License</a></li> <li><a href="http://www.phpmyadmin.net/home_page/donate.php">Donate</a></li> <li class="last">Valid <a href="http://validator.w3.org/check/referer">HTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></li> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin annotated tag, RELEASE_3_3_3, created. RELEASE_3_3_3
by Marc Delisle 10 May '10

10 May '10

The annotated tag, RELEASE_3_3_3 has been created at 757e7f369a3e087c84ced6b0ff515370b9b8a5d4 (tag) tagging 38445bef624fe105dce758d20b5fad8ec70c950c (commit) replaces RELEASE_3_3_3RC1 tagged by Marc Delisle on Mon May 10 12:33:06 2010 -0400 - Log ----------------------------------------------------------------- Released 3.3.3 Marc Delisle (1): 3.3.3 release ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2983-g8a106db
by Marc Delisle 10 May '10

10 May '10

The branch, master has been updated via 8a106dbad1443b3f22fe8ecf5a767a7d4d20df04 (commit) from 9bb46c6fb5439c047f0de238c00ea196063ceaf8 (commit) - Log ----------------------------------------------------------------- commit 8a106dbad1443b3f22fe8ecf5a767a7d4d20df04 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon May 10 12:31:05 2010 -0400 3.3.3 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f3b0872..4d26cba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,7 +86,7 @@ $Id$ - bug #2996161 [import] properly escape import value - bug #2998889 [import] Import button does not work in Catalan -3.3.3.0 (not yet released) +3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, thanks to Lorikeet Lee. - patch #2983492 [sync] When asking to synchronize Structure and Data, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_3RC1-6-gfb9d403
by Marc Delisle 10 May '10

10 May '10

The branch, QA_3_3 has been updated via fb9d4037cccb2fda09933d57baecea839ad32994 (commit) from 5227d998ec1d59d7f980ad793ddf807f7a58ac3e (commit) - Log ----------------------------------------------------------------- commit fb9d4037cccb2fda09933d57baecea839ad32994 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon May 10 12:30:01 2010 -0400 3.3.3 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10bf32a..6649220 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2996161 [import] properly escape import value - bug #2998889 [import] Import button does not work in Catalan -3.3.3.0 (not yet released) +3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, thanks to Lorikeet Lee. - patch #2983492 [sync] When asking to synchronize Structure and Data, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_3, updated. RELEASE_3_3_3RC1-1-g38445be
by Marc Delisle 10 May '10

10 May '10

The branch, MAINT_3_3_3 has been updated via 38445bef624fe105dce758d20b5fad8ec70c950c (commit) from 5f8c1f9268bfa6046f8d754f2f062d1d9e964043 (commit) - Log ----------------------------------------------------------------- commit 38445bef624fe105dce758d20b5fad8ec70c950c Author: Marc Delisle <marc(a)infomarc.info> Date: Mon May 10 12:28:49 2010 -0400 3.3.3 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7772eb6..ad395fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ -3.3.3.0 (not yet released) +3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, thanks to Lorikeet Lee. - patch #2983492 [sync] When asking to synchronize Structure and Data, diff --git a/Documentation.html b/Documentation.html index 2297d29..d8aa720 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.3-rc1 - Documentation</title> + <title>phpMyAdmin 3.3.3 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.3-rc1 + 3.3.3 Documentation </h1> </div> diff --git a/README b/README index 674ddef..9edfc16 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.3-rc1 - ----------------- + Version 3.3.3 + ------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 9ba5432..8cdc051 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.3-rc1'); + $this->set('PMA_VERSION', '3.3.3'); /** * @deprecated */ diff --git a/translators.html b/translators.html index d08bf66..813fd02 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.3-rc1 - Official translators</title> + <title>phpMyAdmin 3.3.3 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.3-rc1 + 3.3.3 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2982-g9bb46c6
by Michal Čihař 10 May '10

10 May '10

The branch, master has been updated via 9bb46c6fb5439c047f0de238c00ea196063ceaf8 (commit) via 8835c9249b50780fcb70fcf3023fffa0ff040127 (commit) from 355b4c97bdc9c4afb6c900e3f2761aa91e532a4f (commit) - Log ----------------------------------------------------------------- commit 9bb46c6fb5439c047f0de238c00ea196063ceaf8 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 10 16:46:53 2010 +0200 Load datepicker translations only if it is used. commit 8835c9249b50780fcb70fcf3023fffa0ff040127 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 10 16:46:41 2010 +0200 Whitespace cleanup. ----------------------------------------------------------------------- Summary of changes: js/messages.php | 48 +++++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 23 deletions(-) diff --git a/js/messages.php b/js/messages.php index 1653ceb..30969d6 100644 --- a/js/messages.php +++ b/js/messages.php @@ -22,45 +22,45 @@ require_once './libraries/common.inc.php'; // But this one is needed for PMA_escapeJsString() require_once './libraries/js_escape.lib.php'; -$js_messages['strClickToSelect'] = __('Click to select'); -$js_messages['strClickToUnselect'] = __('Click to unselect'); -$js_messages['strNoDropDatabases'] = __('"DROP DATABASE" statements are disabled.'); +$js_messages['strClickToSelect'] = __('Click to select'); +$js_messages['strClickToUnselect'] = __('Click to unselect'); +$js_messages['strNoDropDatabases'] = __('"DROP DATABASE" statements are disabled.'); /* For confirmations */ -$js_messages['strDoYouReally'] = __('Do you really want to '); -$js_messages['strDropDatabaseStrongWarning'] = __('You are about to DESTROY a complete database!'); +$js_messages['strDoYouReally'] = __('Do you really want to '); +$js_messages['strDropDatabaseStrongWarning'] = __('You are about to DESTROY a complete database!'); /* For blobstreaming */ -$js_messages['strBLOBRepositoryDisableStrongWarning'] = __('You are about to DISABLE a BLOB Repository!'); +$js_messages['strBLOBRepositoryDisableStrongWarning'] = __('You are about to DISABLE a BLOB Repository!'); $js_messages['strBLOBRepositoryDisableAreYouSure'] = sprintf(__('Are you sure you want to disable all BLOB references for database %s?'), $GLOBALS['db']); /* For indexes */ -$js_messages['strFormEmpty'] = __('Missing value in the form!'); -$js_messages['strNotNumber'] = __('This is not a number!'); +$js_messages['strFormEmpty'] = __('Missing value in the form!'); +$js_messages['strNotNumber'] = __('This is not a number!'); /* For server_privileges.js */ -$js_messages['strHostEmpty'] = __('The host name is empty!'); -$js_messages['strUserEmpty'] = __('The user name is empty!'); -$js_messages['strPasswordEmpty'] = __('The password is empty!'); -$js_messages['strPasswordNotSame'] = __('The passwords aren\'t the same!'); +$js_messages['strHostEmpty'] = __('The host name is empty!'); +$js_messages['strUserEmpty'] = __('The user name is empty!'); +$js_messages['strPasswordEmpty'] = __('The password is empty!'); +$js_messages['strPasswordNotSame'] = __('The passwords aren\'t the same!'); /* For inline query editing */ $js_messages['strGo'] = __('Go'); $js_messages['strCancel'] = __('Cancel'); /* Designer */ -$js_messages['strModifications'] = __('Modifications have been saved'); -$js_messages['strRelationDeleted'] = __('Relation deleted'); -$js_messages['strForeignKeyRelationAdded'] = __('FOREIGN KEY relation added'); -$js_messages['strInternalRelationAdded'] = __('Internal relation added'); -$js_messages['strErrorRelationAdded'] = __('Error: Relation not added.'); -$js_messages['strErrorRelationExists'] = __('Error: relation already exists.'); -$js_messages['strErrorSaveTable'] = __('Error saving coordinates for Designer.'); +$js_messages['strModifications'] = __('Modifications have been saved'); +$js_messages['strRelationDeleted'] = __('Relation deleted'); +$js_messages['strForeignKeyRelationAdded'] = __('FOREIGN KEY relation added'); +$js_messages['strInternalRelationAdded'] = __('Internal relation added'); +$js_messages['strErrorRelationAdded'] = __('Error: Relation not added.'); +$js_messages['strErrorRelationExists'] = __('Error: relation already exists.'); +$js_messages['strErrorSaveTable'] = __('Error saving coordinates for Designer.'); $js_messages['strGeneralRelationFeat:strDisabled'] = __('General relation features') . ': ' . __('Disabled'); -$js_messages['strSelectReferencedKey'] = __('Select referenced key'); -$js_messages['strSelectForeignKey'] = __('Select Foreign Key'); -$js_messages['strPleaseSelectPrimaryOrUniqueKey'] = __('Please select the primary key or a unique key'); -$js_messages['strChangeDisplay'] = __('Choose field to display'); +$js_messages['strSelectReferencedKey'] = __('Select referenced key'); +$js_messages['strSelectForeignKey'] = __('Select Foreign Key'); +$js_messages['strPleaseSelectPrimaryOrUniqueKey'] = __('Please select the primary key or a unique key'); +$js_messages['strChangeDisplay'] = __('Choose field to display'); echo "var PMA_messages = new Array();\n"; foreach ($js_messages as $name => $js_message) { @@ -68,6 +68,7 @@ foreach ($js_messages as $name => $js_message) { } /* Calendar */ +echo "if ($.datepicker) {\n"; /* l10n: Display text for calendar close link */ PMA_printJsValue("$.datepicker.regional['']['closeText']", __('Done')); /* l10n: Display text for previous month link in calendar */ @@ -165,3 +166,4 @@ PMA_printJsValue("$.datepicker.regional['']['minuteText']", __('Minute')); PMA_printJsValue("$.datepicker.regional['']['secondText']", __('Second')); ?> $.extend($.datepicker._defaults, $.datepicker.regional['']); +} /* if ($.datepicker) */ hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2980-g355b4c9
by Michal Čihař 10 May '10

10 May '10

The branch, master has been updated via 355b4c97bdc9c4afb6c900e3f2761aa91e532a4f (commit) from 23e96896ac9ba59e64eaa637fce0f389c95a2c2e (commit) - Log ----------------------------------------------------------------- commit 355b4c97bdc9c4afb6c900e3f2761aa91e532a4f Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 10 15:26:22 2010 +0200 Cleanup after wrong merge. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 17 +---------------- po/nb.po | 10 ---------- 2 files changed, 1 insertions(+), 26 deletions(-) diff --git a/po/fr.po b/po/fr.po index cc54f0e..f69a4dc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2836,36 +2836,21 @@ msgid "Go to view" msgstr "Aller à la vue" #. l10n: This is currently used only in Japanese locales -<<<<<<< HEAD #: libraries/kanji-encoding.lib.php:143 #, fuzzy #| msgid "Recoding engine" msgid "Encoding conversion" -msgstr "Moteur de conversion" +msgstr "Conversion de l'encodage" #. l10n: This is currently used only in Japanese locales -#: libraries/kanji-encoding.lib.php:145 -#, fuzzy -======= #: libraries/kanji-encoding.lib.php:142 ->>>>>>> pootle/master #| msgid "None" msgctxt "None encoding conversion" msgid "None" msgstr "aucune" #. l10n: This is currently used only in Japanese locales -<<<<<<< HEAD #: libraries/kanji-encoding.lib.php:151 -======= -#: libraries/kanji-encoding.lib.php:146 -#| msgid "Recoding engine" -msgid "encoding conversion" -msgstr "Conversion de l'encodage" - -#. l10n: This is currently used only in Japanese locales -#: libraries/kanji-encoding.lib.php:149 ->>>>>>> pootle/master msgid "Convert to Kana" msgstr "Conversion en kana" diff --git a/po/nb.po b/po/nb.po index 06ad6e3..3eb7757 100644 --- a/po/nb.po +++ b/po/nb.po @@ -2804,7 +2804,6 @@ msgid "Go to view" msgstr "Gå til visning" #. l10n: This is currently used only in Japanese locales -<<<<<<< HEAD #: libraries/kanji-encoding.lib.php:143 #, fuzzy #| msgid "Recoding engine" @@ -2812,28 +2811,19 @@ msgid "Encoding conversion" msgstr "Rekodingsmotor" #. l10n: This is currently used only in Japanese locales -#: libraries/kanji-encoding.lib.php:145 -#, fuzzy -======= #: libraries/kanji-encoding.lib.php:142 ->>>>>>> pootle/master #| msgid "None" msgctxt "None encoding conversion" msgid "None" msgstr "Ingen" #. l10n: This is currently used only in Japanese locales -<<<<<<< HEAD #: libraries/kanji-encoding.lib.php:151 -======= -#: libraries/kanji-encoding.lib.php:146 -#| msgid "Recoding engine" msgid "encoding conversion" msgstr "kodingskonvertering" #. l10n: This is currently used only in Japanese locales #: libraries/kanji-encoding.lib.php:149 ->>>>>>> pootle/master msgid "Convert to Kana" msgstr "Konverter til Kana" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2979-g23e9689
by Michal Čihař 10 May '10

10 May '10

The branch, master has been updated via 23e96896ac9ba59e64eaa637fce0f389c95a2c2e (commit) via d381668355ea85f12c14412f57ec2511120b81a2 (commit) from 7bf11881a021cb075c791faa4e0031dacb69ada8 (commit) - Log ----------------------------------------------------------------- commit 23e96896ac9ba59e64eaa637fce0f389c95a2c2e Author: Michal Čihař <michal(a)cihar.com> Date: Mon May 10 14:24:15 2010 +0200 Translation update done using Pootle. commit d381668355ea85f12c14412f57ec2511120b81a2 Author: Michal Čihař <michal(a)cihar.com> Date: Mon May 10 14:24:04 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 181 +---------------------------------------------------------- po/en_GB.po | 7 +- 2 files changed, 6 insertions(+), 182 deletions(-) diff --git a/po/cs.po b/po/cs.po index df750e3..70c8f9b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,13 +5,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-10 14:17+0200\n" -"PO-Revision-Date: 2010-05-10 09:52+0200\n" +"PO-Revision-Date: 2010-05-10 14:24+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.0.1\n" @@ -2812,10 +2812,9 @@ msgstr "Přejít na podhled" #. l10n: This is currently used only in Japanese locales #: libraries/kanji-encoding.lib.php:143 -#, fuzzy #| msgid "encoding conversion" msgid "Encoding conversion" -msgstr "konverze znakových sad" +msgstr "Převod znakové sady" #. l10n: This is currently used only in Japanese locales #: libraries/kanji-encoding.lib.php:145 @@ -8571,177 +8570,3 @@ msgstr "Vytvořit index na  %s sloupcích" msgctxt "for MIME transformation" msgid "Description" msgstr "Popis" - -#, fuzzy -#~| msgid "None" -#~ msgctxt "None action" -#~ msgid "None" -#~ msgstr "Žádná" - -#, fuzzy -#~| msgid "None" -#~ msgctxt "" -#~ msgid "None" -#~ msgstr "Žádná" - -#, fuzzy -#~| msgid "Grant all privileges on wildcard name (username\\_%)" -#~ msgid "Grant all privileges on wildcard name (username_%)" -#~ msgstr "" -#~ "Přidělit všechna oprávnění na jméno odpovídající masce (uživatel\\_%)" - -#, fuzzy -#~| msgid "The \"%s\" table doesn't exist!" -#~ msgid "The %s table doesn" -#~ msgstr "Tabulka „%s“ neexistuje!" - -#~ msgid "Could not load default configuration from: %1" -#~ msgstr "Nepodařilo se nahrát výchozí konfiguraci ze souboru: „%1“" - -#~ msgid "Invalid hostname for server %1. Please review your configuration." -#~ msgstr "Chybné jméno serveru pro server %1. Prosím zkontrolujte nastavení." - -#, fuzzy -#~| msgid "Error renaming table %1$s to %2$s" -#~ msgid "Error renaming table %1 to %2" -#~ msgstr "Chyba při přejmenování tabulky %1$s na %2$s" - -#~ msgid "" -#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. " -#~ "Please check your PHP configuration." -#~ msgstr "" -#~ "Nelze nahrát rozšíření [a@http://php.net/%1@Documentation][em]%1[/em][/" -#~ "a], prosím zkontrolujte nastavení PHP." - -#, fuzzy -#~| msgid "" -#~| "This server is not configured as master in a replication process. Would " -#~| "you like to <a href=\"%s\">configure</a> it?" -#~ msgid "" -#~ "This server is not configured as master in a replication process. Would " -#~ "you like to <a href=%s>configure</a> it?" -#~ msgstr "" -#~ "Tento server není nastaven jako nadřízený v replikačním procesu. Přejete " -#~ "si ho <a href=\"%s\">nastavit</a>?" - -#, fuzzy -#~| msgid "" -#~| "This server is not configured as slave in a replication process. Would " -#~| "you like to <a href=\"%s\">configure</a> it?" -#~ msgid "" -#~ "This server is not configured as slave in a replication process. Would " -#~ "you like to <a href=%s>configure</a> it?" -#~ msgstr "" -#~ "Tento server není nastaven jako podřízený v replikačním procesu. Přejete " -#~ "si ho <a href=\"%s\">nastavit</a>?" - -#, fuzzy -#~| msgid "Could not connect to MySQL server" -#~ msgid "(or the local MySQL server" -#~ msgstr "Nepodařilo se připojit k MySQL serveru" - -#, fuzzy -#~| msgid "" -#~| "There is a chance that you may have found a bug in the SQL parser. " -#~| "Please examine your query closely, and check that the quotes are correct " -#~| "and not mis-matched. Other possible failure causes may be that you are " -#~| "uploading a file with binary outside of a quoted text area. You can also " -#~| "try your query on the MySQL command line interface. The MySQL server " -#~| "error output below, if there is any, may also help you in diagnosing the " -#~| "problem. If you still have problems or if the parser fails where the " -#~| "command line interface succeeds, please reduce your SQL query input to " -#~| "the single query that causes problems, and submit a bug report with the " -#~| "data chunk in the CUT section below:" -#~ msgid "" -#~ "There is a chance that you may have found a bug in the SQL parser. Please " -#~ "examine your query closely, and check that the quotes are correct and not " -#~ "mis-matched. Other possible failure causes may be that you are uploading " -#~ "a file with binary outside of a quoted text area. You can also try your " -#~ "query on the MySQL command line interface. The MySQL server error output " -#~ "be . " -#~ msgstr "" -#~ "Je možné, že jste našli chybu v SQL parseru. Prosím prozkoumejte podrobně " -#~ "SQL dotaz, především jestli jsou správně uvozovky a jestli nejsou " -#~ "proházené. Další možnost selhání je pokud nahráváte soubor s binárními " -#~ "daty nezapsanými v uvozovkách. Můžete také vyzkoušet příkazovou řádku " -#~ "MySQL. Níže uvedený výstup z MySQL serveru (pokud je nějaký) vám také " -#~ "může pomoci při zkoumání problému. Pokud stále máte problémy nebo pokud " -#~ "SQL parser ohlásí chybu u dotazu, který na příkazové řádce funguje, " -#~ "prosím pokuste se zredukovat dotaz na co nejmenší, ve kterém se problém " -#~ "ještě vyskytne, a ohlaste chybu na stránkách phpMyAdmina spolu se sekcí " -#~ "VÝPIS uvedenou níže:" - -#~ msgctxt "$strStrucCSV" -#~ msgid "CSV" -#~ msgstr "CSV" - -#~ msgid "Copy" -#~ msgstr "Kopírovat" - -#~ msgid "Delete the users and reload the privileges afterwards." -#~ msgstr "Odstranit uživatele a znovu načíst oprávnění." - -#~ msgid "" -#~ "This is the cleanest way, but reloading the privileges may take a while." -#~ msgstr "Toto je nejčistší řešení, ale načítání oprávnění může trvat dlouho." - -#~ msgid "has been altered." -#~ msgstr "byla změněna." - -#~ msgid "Microsoft Excel 2000" -#~ msgstr "Microsoft Excel 2000" - -#~ msgid "Internet Explorer does not support this function." -#~ msgstr "Prohlížeč Internet Explorer tuto funkci nepodporuje." - -#~ msgid "" -#~ "The "deleted" users will still be able to access the server as " -#~ "usual until the privileges are reloaded." -#~ msgstr "" -#~ "Odstranění uživatelé stále budou mít přístup na server, dokud nebudou " -#~ "znovu načtena oprávnění." - -#~ msgid "Just delete the users from the privilege tables." -#~ msgstr "Jen odstranit uživatele z tabulek s oprávněními." - -#~ msgid "" -#~ "Allows running stored procedures; has no effect in this MySQL version." -#~ msgstr "" -#~ "Umožňuje spouštět uložené procedury. V této verzi MySQL se nepoužívá." - -#~ msgid "Process list" -#~ msgstr "Seznam procesů" - -#~ msgid "Reload privileges" -#~ msgstr "Znovu načíst oprávnění" - -#~ msgid "" -#~ "The users will still have the USAGE privilege until the privileges are " -#~ "reloaded." -#~ msgstr "" -#~ "Uživatelé budou mít oprávnění „USAGE“ (používání), dokud nebudou znovu " -#~ "načtena oprávnění." - -#~ msgid "Native MS Excel format" -#~ msgstr "Nativní formát MS Excelu" - -#~ msgid "Alter index(s)" -#~ msgstr "Změnit indexy" - -#~ msgid "Tracking Mechanism" -#~ msgstr "Sledovací mechanismus" - -#~ msgid "SELECT *" -#~ msgstr "SELECT *" - -#~ msgid "SELECT" -#~ msgstr "SELECT" - -#~ msgid "INSERT" -#~ msgstr "INSERT" - -#~ msgid "UPDATE" -#~ msgstr "UPDATE" - -#~ msgid "DELETE" -#~ msgstr "DELETE" diff --git a/po/en_GB.po b/po/en_GB.po index a329561..e105fee 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-10 14:17+0200\n" -"PO-Revision-Date: 2010-05-10 14:06+0200\n" +"PO-Revision-Date: 2010-05-10 14:24+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -2808,10 +2808,9 @@ msgstr "Go to view" #. l10n: This is currently used only in Japanese locales #: libraries/kanji-encoding.lib.php:143 -#, fuzzy #| msgid "encoding conversion" msgid "Encoding conversion" -msgstr "encoding conversion" +msgstr "Encoding conversion" #. l10n: This is currently used only in Japanese locales #: libraries/kanji-encoding.lib.php:145 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_3RC1-2977-g7bf1188
by Michal Čihař 10 May '10

10 May '10

The branch, master has been updated via 7bf11881a021cb075c791faa4e0031dacb69ada8 (commit) via 78bf68f4cd049877aa2421bcc1000c072992b242 (commit) via 47f65e03a32d5fa93b306af1ab33265f1f6c4c1e (commit) via 51becf5d6a7b15b78c17ed4d9da23e80fadba7c6 (commit) via 3a69f57d2e4a48e6f59e3edff75308034b758b9d (commit) via 03daa1112b0a15606c7dd52c7d8f916cb504573d (commit) via a4b9ec7ab42db705d6d42bc0908b087646b46121 (commit) via df15b29460dee6587b51bfa25fc89b47eb3bcb23 (commit) via 5199997c5520e5bba5b22fd29a5bb6512690d6a7 (commit) via b086c0ca73ce6f3f242e6ba2b4d08dacd163e953 (commit) via cf3fd1b33d2b7b7c0a80fd26c7a094a718979071 (commit) via 28eb92ee72ab28e192a4a8d810d98519c4a62b34 (commit) via 83e93911ade08acdd1f0452a5a652a06a8515744 (commit) via 72bae4b972c53c7d2d35a15137a94a667cb7547d (commit) via 227ce7913b4d12c069639b8a749c631c21c76635 (commit) from d47b913599355823b036d54093cf484c6236f9dd (commit) - Log ----------------------------------------------------------------- commit 7bf11881a021cb075c791faa4e0031dacb69ada8 Merge: d47b913599355823b036d54093cf484c6236f9dd 78bf68f4cd049877aa2421bcc1000c072992b242 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 10 14:20:47 2010 +0200 Merge remote branch 'pootle/master' Conflicts: po/fr.po po/hi.po po/nb.po commit 78bf68f4cd049877aa2421bcc1000c072992b242 Author: u4663530 <u4663530(a)anu.edu.au> Date: Mon May 10 14:17:29 2010 +0200 Translation update done using Pootle. commit 47f65e03a32d5fa93b306af1ab33265f1f6c4c1e Author: u4663530 <u4663530(a)anu.edu.au> Date: Mon May 10 14:17:02 2010 +0200 Translation update done using Pootle. commit 51becf5d6a7b15b78c17ed4d9da23e80fadba7c6 Author: u4663530 <u4663530(a)anu.edu.au> Date: Mon May 10 14:16:49 2010 +0200 Translation update done using Pootle. commit 3a69f57d2e4a48e6f59e3edff75308034b758b9d Author: u4663530 <u4663530(a)anu.edu.au> Date: Mon May 10 14:16:32 2010 +0200 Translation update done using Pootle. commit 03daa1112b0a15606c7dd52c7d8f916cb504573d Author: Marc Delisle <marc(a)infomarc.info> Date: Mon May 10 14:16:01 2010 +0200 Translation update done using Pootle. commit a4b9ec7ab42db705d6d42bc0908b087646b46121 Author: u4663530 <u4663530(a)anu.edu.au> Date: Mon May 10 14:16:00 2010 +0200 Translation update done using Pootle. commit df15b29460dee6587b51bfa25fc89b47eb3bcb23 Author: u4663530 <u4663530(a)anu.edu.au> Date: Mon May 10 14:15:48 2010 +0200 Translation update done using Pootle. commit 5199997c5520e5bba5b22fd29a5bb6512690d6a7 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon May 10 14:14:01 2010 +0200 Translation update done using Pootle. commit b086c0ca73ce6f3f242e6ba2b4d08dacd163e953 Author: u4663530 <u4663530(a)anu.edu.au> Date: Mon May 10 14:14:00 2010 +0200 Translation update done using Pootle. commit cf3fd1b33d2b7b7c0a80fd26c7a094a718979071 Author: u4663530 <u4663530(a)anu.edu.au> Date: Mon May 10 14:13:40 2010 +0200 Translation update done using Pootle. commit 28eb92ee72ab28e192a4a8d810d98519c4a62b34 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon May 10 14:13:34 2010 +0200 Translation update done using Pootle. commit 83e93911ade08acdd1f0452a5a652a06a8515744 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Mon May 10 14:08:32 2010 +0200 Translation update done using Pootle. commit 72bae4b972c53c7d2d35a15137a94a667cb7547d Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Mon May 10 14:08:23 2010 +0200 Translation update done using Pootle. commit 227ce7913b4d12c069639b8a749c631c21c76635 Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com> Date: Mon May 10 14:07:39 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 18 ++++++++++++++++-- po/hi.po | 9 ++++----- po/nb.po | 20 +++++++++++++++++--- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/po/fr.po b/po/fr.po index 9b87ffd..cc54f0e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-10 14:17+0200\n" -"PO-Revision-Date: 2010-05-09 22:26+0200\n" +"PO-Revision-Date: 2010-05-10 14:16+0200\n" "Last-Translator: Marc <marc(a)infomarc.info>\n" "Language-Team: french <fr(a)li.org>\n" "MIME-Version: 1.0\n" @@ -2836,6 +2836,7 @@ msgid "Go to view" msgstr "Aller à la vue" #. l10n: This is currently used only in Japanese locales +<<<<<<< HEAD #: libraries/kanji-encoding.lib.php:143 #, fuzzy #| msgid "Recoding engine" @@ -2845,15 +2846,28 @@ msgstr "Moteur de conversion" #. l10n: This is currently used only in Japanese locales #: libraries/kanji-encoding.lib.php:145 #, fuzzy +======= +#: libraries/kanji-encoding.lib.php:142 +>>>>>>> pootle/master #| msgid "None" msgctxt "None encoding conversion" msgid "None" msgstr "aucune" #. l10n: This is currently used only in Japanese locales +<<<<<<< HEAD #: libraries/kanji-encoding.lib.php:151 +======= +#: libraries/kanji-encoding.lib.php:146 +#| msgid "Recoding engine" +msgid "encoding conversion" +msgstr "Conversion de l'encodage" + +#. l10n: This is currently used only in Japanese locales +#: libraries/kanji-encoding.lib.php:149 +>>>>>>> pootle/master msgid "Convert to Kana" -msgstr "" +msgstr "Conversion en kana" #. l10n: Text direction, use either ltr or rtl #: libraries/messages.inc.php:19 diff --git a/po/hi.po b/po/hi.po index 14125b0..955fca3 100644 --- a/po/hi.po +++ b/po/hi.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-10 14:17+0200\n" -"PO-Revision-Date: 2010-05-10 10:00+0200\n" +"PO-Revision-Date: 2010-05-10 14:17+0200\n" "Last-Translator: <u4663530(a)anu.edu.au>\n" "Language-Team: hindi <hi(a)li.org>\n" "MIME-Version: 1.0\n" @@ -227,7 +227,7 @@ msgstr " डेटाबेस %s से %s में कॉपी किया #: db_operations.php:410 libraries/messages.inc.php:244 msgid "Rename database to" -msgstr "दताबसे का नाम बदल कर ____ रखें" +msgstr "डेटाबेस का नाम बदल कर ____ रखें" #: db_operations.php:415 libraries/messages.inc.php:169 #: server_processlist.php:57 @@ -259,7 +259,7 @@ msgstr "केवल डाटा" #: db_operations.php:468 libraries/messages.inc.php:194 msgid "CREATE DATABASE before copying" -msgstr "डेटाबेस कॉपी करने पहले डेटाबेस का निर्माण करें" +msgstr "डेटाबेस कॉपी करने से पहले डेटाबेस का निर्माण करें" #: db_operations.php:471 libraries/export/sql.php:52 #: libraries/export/sql.php:74 libraries/export/sql.php:76 @@ -293,7 +293,6 @@ msgid "Status" msgstr "स्थिति" #: db_operations.php:544 -#, fuzzy #| msgctxt "$strBLOBRepositoryEnabled" #| msgid "Enabled" msgctxt "BLOB repository" @@ -330,7 +329,7 @@ msgstr "सक्षम" #: tbl_select.php:137 tbl_structure.php:179 tbl_structure.php:768 #: tbl_tracking.php:275 tbl_tracking.php:326 msgid "Collation" -msgstr "" +msgstr "क्रम में करें" #: db_operations.php:609 libraries/messages.inc.php:750 pdf_schema.php:34 #, php-format diff --git a/po/nb.po b/po/nb.po index 146ab4c..06ad6e3 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-05-10 14:17+0200\n" -"PO-Revision-Date: 2010-05-06 08:35+0200\n" +"PO-Revision-Date: 2010-05-10 14:08+0200\n" "Last-Translator: <sven.erik.andersen(a)gmail.com>\n" "Language-Team: norwegian <no(a)li.org>\n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -2804,6 +2804,7 @@ msgid "Go to view" msgstr "Gå til visning" #. l10n: This is currently used only in Japanese locales +<<<<<<< HEAD #: libraries/kanji-encoding.lib.php:143 #, fuzzy #| msgid "Recoding engine" @@ -2813,15 +2814,28 @@ msgstr "Rekodingsmotor" #. l10n: This is currently used only in Japanese locales #: libraries/kanji-encoding.lib.php:145 #, fuzzy +======= +#: libraries/kanji-encoding.lib.php:142 +>>>>>>> pootle/master #| msgid "None" msgctxt "None encoding conversion" msgid "None" msgstr "Ingen" #. l10n: This is currently used only in Japanese locales +<<<<<<< HEAD #: libraries/kanji-encoding.lib.php:151 +======= +#: libraries/kanji-encoding.lib.php:146 +#| msgid "Recoding engine" +msgid "encoding conversion" +msgstr "kodingskonvertering" + +#. l10n: This is currently used only in Japanese locales +#: libraries/kanji-encoding.lib.php:149 +>>>>>>> pootle/master msgid "Convert to Kana" -msgstr "" +msgstr "Konverter til Kana" #. l10n: Text direction, use either ltr or rtl #: libraries/messages.inc.php:19 hooks/post-receive -- phpMyAdmin

1 0