Git

git@phpmyadmin.net

8 participants
38204 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7RC1-9436-g98a5ba7
by Marc Delisle 04 Sep '10

04 Sep '10

The branch, master has been updated via 98a5ba73172c30d10dc80b8b46c9a17cde849249 (commit) from 49ae8993fe9ef163d53d443fa65951f43553dce4 (commit) - Log ----------------------------------------------------------------- commit 98a5ba73172c30d10dc80b8b46c9a17cde849249 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Sep 4 07:01:30 2010 -0400 misleading variable name ----------------------------------------------------------------------- Summary of changes: db_operations.php | 2 +- db_qbe.php | 2 +- db_structure.php | 4 ++-- libraries/Index.class.php | 4 ++-- libraries/display_tbl.lib.php | 4 ++-- libraries/sql_query_form.lib.php | 2 +- sql.php | 10 +++++----- tbl_operations.php | 8 ++++---- tbl_structure.php | 18 +++++++++--------- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/db_operations.php b/db_operations.php index 535ee31..c17d372 100644 --- a/db_operations.php +++ b/db_operations.php @@ -406,7 +406,7 @@ echo __('Remove database'); 'goto' => 'main.php', 'reload' => '1', 'purge' => '1', - 'zero_rows' => sprintf(__('Database %s has been dropped.'), htmlspecialchars(PMA_backquote($db))), + 'message_to_show' => sprintf(__('Database %s has been dropped.'), htmlspecialchars(PMA_backquote($db))), 'db' => NULL, ); ?> diff --git a/db_qbe.php b/db_qbe.php index 2475065..a8aeb42 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -22,7 +22,7 @@ $cfgRelation = PMA_getRelationsParam(); */ if (isset($_REQUEST['submit_sql']) && ! empty($sql_query)) { $goto = 'db_sql.php'; - $zero_rows = htmlspecialchars(__('Your SQL query has been executed successfully')); + $message_to_show = htmlspecialchars(__('Your SQL query has been executed successfully')); require './sql.php'; exit; } else { diff --git a/db_structure.php b/db_structure.php index dafdcdc..f166547 100644 --- a/db_structure.php +++ b/db_structure.php @@ -298,7 +298,7 @@ foreach ($tables as $keyname => $each_table) { $empty_table = '<a class="truncate_table_anchor" href="sql.php?' . $tbl_url_query . '&sql_query='; $empty_table .= urlencode('TRUNCATE ' . PMA_backquote($each_table['TABLE_NAME'])) - . '&zero_rows=' + . '&message_to_show=' . urlencode(sprintf(__('Table %s has been emptied'), htmlspecialchars($each_table['TABLE_NAME']))) .'">' . $titles['Empty'] . '</a>'; } else { @@ -386,7 +386,7 @@ foreach ($tables as $keyname => $each_table) { <td align="center"> <a class="drop_table_anchor" href="sql.php?<?php echo $tbl_url_query; ?>&reload=1&purge=1&sql_query=<?php - echo urlencode($drop_query); ?>&zero_rows=<?php + echo urlencode($drop_query); ?>&message_to_show=<?php echo urlencode($drop_message); ?>" > <?php echo $titles['Drop']; ?></a></td> <?php } // end if (! $db_is_information_schema) diff --git a/libraries/Index.class.php b/libraries/Index.class.php index 81ef590..285f578 100644 --- a/libraries/Index.class.php +++ b/libraries/Index.class.php @@ -468,11 +468,11 @@ class PMA_Index $this_params = $GLOBALS['url_params']; if ($index->getName() == 'PRIMARY') { $this_params['sql_query'] = 'ALTER TABLE ' . PMA_backquote($table) . ' DROP PRIMARY KEY'; - $this_params['zero_rows'] = __('The primary key has been dropped'); + $this_params['message_to_show'] = __('The primary key has been dropped'); $js_msg = PMA_jsFormat('ALTER TABLE ' . $table . ' DROP PRIMARY KEY'); } else { $this_params['sql_query'] = 'ALTER TABLE ' . PMA_backquote($table) . ' DROP INDEX ' . PMA_backquote($index->getName()); - $this_params['zero_rows'] = sprintf(__('Index %s has been dropped'), $index->getName()); + $this_params['message_to_show'] = sprintf(__('Index %s has been dropped'), $index->getName()); $js_msg = PMA_jsFormat('ALTER TABLE ' . $table . ' DROP INDEX ' . $index->getName()); } diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index bb16bbf..a57c909 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1143,7 +1143,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { 'db' => $db, 'table' => $table, 'sql_query' => $url_sql_query, - 'zero_rows' => __('The row has been deleted'), + 'message_to_show' => __('The row has been deleted'), 'goto' => (empty($goto) ? 'tbl_sql.php' : $goto), ); $lnk_goto = 'sql.php' . PMA_generate_common_url($_url_params, 'text'); @@ -1155,7 +1155,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { 'db' => $db, 'table' => $table, 'sql_query' => $del_query, - 'zero_rows' => __('The row has been deleted'), + 'message_to_show' => __('The row has been deleted'), 'goto' => $lnk_goto, ); $del_url = 'sql.php' . PMA_generate_common_url($_url_params); diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 8ac7c1c..7dfe8c5 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -132,7 +132,7 @@ function PMA_sqlQueryForm($query = true, $display_tab = false, $delimiter = ';') .'<input type="hidden" name="pos" value="0" />' . "\n" .'<input type="hidden" name="goto" value="' .htmlspecialchars($goto) . '" />' . "\n" - .'<input type="hidden" name="zero_rows" value="' + .'<input type="hidden" name="message_to_show" value="' . htmlspecialchars(__('Your SQL query has been executed successfully')) . '" />' . "\n" .'<input type="hidden" name="prev_sql_query" value="' . htmlspecialchars($query) . '" />' . "\n"; diff --git a/sql.php b/sql.php index 1a2853f..8277374 100644 --- a/sql.php +++ b/sql.php @@ -242,7 +242,7 @@ if ($do_confirm) { .PMA_generate_common_hidden_inputs($db, $table); ?> <input type="hidden" name="sql_query" value="<?php echo htmlspecialchars($sql_query); ?>" /> - <input type="hidden" name="zero_rows" value="<?php echo isset($zero_rows) ? PMA_sanitize($zero_rows, true) : ''; ?>" /> + <input type="hidden" name="message_to_show" value="<?php echo isset($message_to_show) ? PMA_sanitize($message_to_show, true) : ''; ?>" /> <input type="hidden" name="goto" value="<?php echo $goto; ?>" /> <input type="hidden" name="back" value="<?php echo isset($back) ? PMA_sanitize($back, true) : ''; ?>" /> <input type="hidden" name="reload" value="<?php echo isset($reload) ? PMA_sanitize($reload, true) : 0; ?>" /> @@ -577,11 +577,11 @@ if (0 == $num_rows || $is_affected) { // The form generated by sql_query_form.lib.php // and db_sql.php has many submit buttons // on the same form, and some confusion arises from the - // fact that $zero_rows is sent for every case. - // The $zero_rows containing a success message and sent with + // fact that $message_to_show is sent for every case. + // The $message_to_show containing a success message and sent with // the form should not have priority over errors - } elseif (!empty($zero_rows) && !$is_select) { - $message = PMA_Message::rawSuccess(htmlspecialchars($zero_rows)); + } elseif (!empty($message_to_show) && !$is_select) { + $message = PMA_Message::rawSuccess(htmlspecialchars($message_to_show)); } elseif (!empty($GLOBALS['show_as_php'])) { $message = PMA_Message::success(__('Showing as PHP code')); } elseif (isset($GLOBALS['show_as_php'])) { diff --git a/tbl_operations.php b/tbl_operations.php index 666f6f3..d5fd6db 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -202,7 +202,7 @@ unset($reread_info); */ require_once './libraries/tbl_links.inc.php'; -if (isset($result) && empty($zero_rows)) { +if (isset($result) && empty($message_to_show)) { // set to success by default, because result set could be empty // (for example, a table rename) $_type = 'success'; @@ -624,7 +624,7 @@ if ($is_myisam_or_maria || $is_innodb || $is_berkeleydb) { $this_url_params = array_merge($url_params, array( 'sql_query' => 'FLUSH TABLE ' . PMA_backquote($GLOBALS['table']), - 'zero_rows' => sprintf(__('Table %s has been flushed'), + 'message_to_show' => sprintf(__('Table %s has been flushed'), htmlspecialchars($GLOBALS['table'])), 'reload' => 1, )); @@ -650,7 +650,7 @@ if (! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information_ 'sql_query' => $this_sql_query, 'goto' => 'tbl_structure.php', 'reload' => '1', - 'zero_rows' => sprintf(__('Table %s has been emptied'), htmlspecialchars($table)), + 'message_to_show' => sprintf(__('Table %s has been emptied'), htmlspecialchars($table)), )); ?> <li><a href="sql.php<?php echo PMA_generate_common_url($this_url_params); ?>" onclick="return confirmLink(this, '<?php echo PMA_jsFormat($this_sql_query); ?>')"> @@ -667,7 +667,7 @@ if (! (isset($db_is_information_schema) && $db_is_information_schema)) { 'goto' => 'db_operations.php', 'reload' => '1', 'purge' => '1', - 'zero_rows' => sprintf(($tbl_is_view ? __('View %s has been dropped') : __('Table %s has been dropped')), htmlspecialchars($table)), + 'message_to_show' => sprintf(($tbl_is_view ? __('View %s has been dropped') : __('Table %s has been dropped')), htmlspecialchars($table)), // table name is needed to avoid running // PMA_relationsCleanupDatabase() on the whole db later 'table' => $GLOBALS['table'], diff --git a/tbl_structure.php b/tbl_structure.php index 812ff50..7c59d98 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -393,7 +393,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { <?php echo $titles['Change']; ?></a> </td> <td align="center" class="drop"> - <a class="drop_column_anchor" href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&dropped_column=<?php echo urlencode($row['Field']); ?>&zero_rows=<?php echo urlencode(sprintf(__('Column %s has been dropped'), htmlspecialchars($row['Field']))); ?>" > + <a class="drop_column_anchor" href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&dropped_column=<?php echo urlencode($row['Field']); ?>&message_to_show=<?php echo urlencode(sprintf(__('Column %s has been dropped'), htmlspecialchars($row['Field']))); ?>" > <?php echo $titles['Drop']; ?></a> </td> <td align="center" class="primary"> @@ -404,7 +404,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { } else { echo "\n"; ?> - <a class="add_primary_key_anchor" href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>" > + <a class="add_primary_key_anchor" href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>" > <?php echo $titles['Primary']; ?></a> <?php $primary_enabled = true; } @@ -419,7 +419,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { } else { echo "\n"; ?> - <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD UNIQUE(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> + <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD UNIQUE(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $titles['Unique']; ?></a> <?php $unique_enabled = true; } @@ -434,7 +434,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { } else { echo "\n"; ?> - <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD INDEX(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> + <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD INDEX(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $titles['Index']; ?></a> <?php $index_enabled = true; @@ -449,7 +449,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { echo "\n"; ?> <td align="center" nowrap="nowrap" class="fulltext"> - <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> + <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $titles['IdxFulltext']; ?></a> <?php $fulltext_enabled = true; ?> </td> @@ -479,7 +479,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { <?php if(isset($primary_enabled)) { if($primary_enabled) { ?> - <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>"> + <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ($primary ? ' DROP PRIMARY KEY,' : '') . ' ADD PRIMARY KEY(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('A primary key has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $hidden_titles['Primary']; ?> </a> <?php @@ -492,7 +492,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { <?php if(isset($unique_enabled)) { if($unique_enabled) { ?> - <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD UNIQUE(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> + <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD UNIQUE(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $hidden_titles['Unique']; ?> </a> <?php @@ -505,7 +505,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { <?php if(isset($index_enabled)) { if($index_enabled) { ?> - <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD INDEX(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> + <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD INDEX(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $hidden_titles['Index']; ?> </a> <?php @@ -518,7 +518,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { <?php if(isset($fulltext_enabled)) { if($fulltext_enabled) { ?> - <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&zero_rows=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> + <a href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' ADD FULLTEXT(' . PMA_backquote($row['Field']) . ')'); ?>&message_to_show=<?php echo urlencode(sprintf(__('An index has been added on %s'), htmlspecialchars($row['Field']))); ?>"> <?php echo $hidden_titles['IdxFulltext']; ?> </a> <?php hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7RC1-9435-g49ae899
by Marc Delisle 04 Sep '10

04 Sep '10

The branch, master has been updated via 49ae8993fe9ef163d53d443fa65951f43553dce4 (commit) from af51cb312d15748696aee085e3f64f7948824767 (commit) - Log ----------------------------------------------------------------- commit 49ae8993fe9ef163d53d443fa65951f43553dce4 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Sep 4 06:46:12 2010 -0400 forgot to rename these in a previous commit ----------------------------------------------------------------------- Summary of changes: tbl_structure.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tbl_structure.php b/tbl_structure.php index c8e59d8..812ff50 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -393,7 +393,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { <?php echo $titles['Change']; ?></a> </td> <td align="center" class="drop"> - <a class="drop_column_anchor" href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&cpurge=1&purgekey=<?php echo urlencode($row['Field']); ?>&zero_rows=<?php echo urlencode(sprintf(__('Column %s has been dropped'), htmlspecialchars($row['Field']))); ?>" > + <a class="drop_column_anchor" href="sql.php?<?php echo $url_query; ?>&sql_query=<?php echo urlencode('ALTER TABLE ' . PMA_backquote($table) . ' DROP ' . PMA_backquote($row['Field'])); ?>&dropped_column=<?php echo urlencode($row['Field']); ?>&zero_rows=<?php echo urlencode(sprintf(__('Column %s has been dropped'), htmlspecialchars($row['Field']))); ?>" > <?php echo $titles['Drop']; ?></a> </td> <td align="center" class="primary"> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 92bedb7cc1a09cd9ead1b093bec01cec17d274b8
by Michal Čihař 03 Sep '10

03 Sep '10

The branch, master has been updated via 92bedb7cc1a09cd9ead1b093bec01cec17d274b8 (commit) via cedaa951a9a8e48d2012db9420af8f616a2fc626 (commit) via 7dd2b3bea1305bd6c564c0c3318ed0192e8ac808 (commit) via 9c0cea25241cd741d7cae882d752ecbc28a8bf45 (commit) via 201ba1f93d51a0c6dcb244ebdb8243cf41ee541e (commit) via 27dbb8b0357f775a80c52484f3ad290da854542c (commit) via 24386f9fe341966eae9f737924d894ba14448fee (commit) via 61547d85ef6c9276bb7befca8fb702895122780e (commit) via ca22678721cb6869912fdb911a7cff917748a850 (commit) via 70402b4e799ce40d1d827c06ea1c9fecb9c8951f (commit) via d05405b367d42286b2b1a066c9f54aa90fad4847 (commit) via bcaab61722b7d3aea42ef22d43edf4579f770557 (commit) via 7ddebbf61eab15984272027468e85e4dc30eccf5 (commit) via cb7fb6d6b4937e7d6e98614d63f03852e1b9b3c0 (commit) via 3fde0f692b15ab367642f1a465006319576d3516 (commit) via 1105d59f948f4256b6776832d6c822608c0f0cfd (commit) via d48a080bbb8c41e34145e189fa028cc67644621b (commit) via f0cbf5c9fc492fbc3b710f5e3dff961f34d4955c (commit) via 091a9f1a2c5fe85ef5d3f0a8e52ce7242ece6682 (commit) via 3170ccf127280ab13221afa63972e8379a8010ec (commit) via 461cb7288dafd9577da3481a82b7c1cfdfe6796e (commit) via dad4e5ba0f7977cb9600c944bf53d3a72354816e (commit) via 8659ee84cf88ecb1f96ef24d439c02956fef0ddb (commit) via e42d99f0a6fc7562c0697a2e5c90e25fb67d4708 (commit) via 61e6064bef4d67bf89f07c9d5a900d5f38e6ba60 (commit) via b237e41b54cda9fcf4d7a2589852acc06c0f18dd (commit) via 96d5754f615b78ec7d0875271321ec45ff3e8d4a (commit) via 9e3d1e41ac508963210df131de8f942e93f04176 (commit) from cb0b12bf93f094906d90a0218f30e643ab471325 (commit) - Log ----------------------------------------------------------------- commit 92bedb7cc1a09cd9ead1b093bec01cec17d274b8 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:31:10 2010 +0200 Translation update done using Pootle. commit cedaa951a9a8e48d2012db9420af8f616a2fc626 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:31:06 2010 +0200 Translation update done using Pootle. commit 7dd2b3bea1305bd6c564c0c3318ed0192e8ac808 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:31:02 2010 +0200 Translation update done using Pootle. commit 9c0cea25241cd741d7cae882d752ecbc28a8bf45 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:30:16 2010 +0200 Translation update done using Pootle. commit 201ba1f93d51a0c6dcb244ebdb8243cf41ee541e Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:30:11 2010 +0200 Translation update done using Pootle. commit 27dbb8b0357f775a80c52484f3ad290da854542c Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:30:08 2010 +0200 Translation update done using Pootle. commit 24386f9fe341966eae9f737924d894ba14448fee Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:30:03 2010 +0200 Translation update done using Pootle. commit 61547d85ef6c9276bb7befca8fb702895122780e Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:29:58 2010 +0200 Translation update done using Pootle. commit ca22678721cb6869912fdb911a7cff917748a850 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:29:42 2010 +0200 Translation update done using Pootle. commit 70402b4e799ce40d1d827c06ea1c9fecb9c8951f Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:29:33 2010 +0200 Translation update done using Pootle. commit d05405b367d42286b2b1a066c9f54aa90fad4847 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:29:08 2010 +0200 Translation update done using Pootle. commit bcaab61722b7d3aea42ef22d43edf4579f770557 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:29:03 2010 +0200 Translation update done using Pootle. commit 7ddebbf61eab15984272027468e85e4dc30eccf5 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:28:59 2010 +0200 Translation update done using Pootle. commit cb7fb6d6b4937e7d6e98614d63f03852e1b9b3c0 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:28:49 2010 +0200 Translation update done using Pootle. commit 3fde0f692b15ab367642f1a465006319576d3516 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:28:45 2010 +0200 Translation update done using Pootle. commit 1105d59f948f4256b6776832d6c822608c0f0cfd Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:28:36 2010 +0200 Translation update done using Pootle. commit d48a080bbb8c41e34145e189fa028cc67644621b Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:28:34 2010 +0200 Translation update done using Pootle. commit f0cbf5c9fc492fbc3b710f5e3dff961f34d4955c Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:28:31 2010 +0200 Translation update done using Pootle. commit 091a9f1a2c5fe85ef5d3f0a8e52ce7242ece6682 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:28:28 2010 +0200 Translation update done using Pootle. commit 3170ccf127280ab13221afa63972e8379a8010ec Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:28:22 2010 +0200 Translation update done using Pootle. commit 461cb7288dafd9577da3481a82b7c1cfdfe6796e Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:28:18 2010 +0200 Translation update done using Pootle. commit dad4e5ba0f7977cb9600c944bf53d3a72354816e Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:28:15 2010 +0200 Translation update done using Pootle. commit 8659ee84cf88ecb1f96ef24d439c02956fef0ddb Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:28:04 2010 +0200 Translation update done using Pootle. commit e42d99f0a6fc7562c0697a2e5c90e25fb67d4708 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:27:56 2010 +0200 Translation update done using Pootle. commit 61e6064bef4d67bf89f07c9d5a900d5f38e6ba60 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:27:53 2010 +0200 Translation update done using Pootle. commit b237e41b54cda9fcf4d7a2589852acc06c0f18dd Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:27:45 2010 +0200 Translation update done using Pootle. commit 96d5754f615b78ec7d0875271321ec45ff3e8d4a Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:27:40 2010 +0200 Translation update done using Pootle. commit 9e3d1e41ac508963210df131de8f942e93f04176 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:27:37 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 124 +++++++++++++++++++++++++++-------------------------------- 1 files changed, 57 insertions(+), 67 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index f67f9e7..966360c 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-08-30 09:59+0300\n" -"PO-Revision-Date: 2010-08-24 14:20+0200\n" +"PO-Revision-Date: 2010-09-03 14:31+0200\n" "Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" "Language-Team: none\n" "Language: en_GB\n" @@ -2237,9 +2237,9 @@ msgstr "and to hide both "db1" and "db2" use" #. type: Content of: <html><body><div><dl><dd><pre> #: ../phpmyadmin/Documentation.html:852 -#, fuzzy, no-wrap +#, no-wrap msgid "$cfg['Servers'][$i]['hide_db'] = '^(db1|db2)$';" -msgstr "$cfg['Servers'][$i]['hide_db'] = '(db1|db2)';" +msgstr "$cfg['Servers'][$i]['hide_db'] = '^(db1|db2)$';" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:853 @@ -2938,22 +2938,21 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1143 -#, fuzzy msgid "" "<span id=\"cfg_Servers_userconfig\">$cfg['Servers'][$i]['userconfig']</span> " "string" msgstr "" -"<span id=\"cfg_Servers_user\">$cfg['Servers'][$i]['user']</span> string" +"<span id=\"cfg_Servers_userconfig\">$cfg['Servers'][$i]['userconfig']</span> " +"string" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1146 -#, fuzzy msgid "" "Since release 3.4.x phpMyAdmin allows users to set most preferences by " "themselves and store them in the database." msgstr "" -"Since release 2.2.0 phpMyAdmin allows users to bookmark queries. This can be " -"useful for queries you often run." +"Since release 3.4.x phpMyAdmin allows users to set most preferences by " +"themselves and store them in the database." #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1150 @@ -2962,13 +2961,14 @@ msgid "" "users can still personalize phpMyAdmin, but settings will be saved in " "browser's local storage, or, it is is unavailable, until the end of session." msgstr "" +"If you don't allow for storing preferences in <a href=\"#pmadb\">pmadb</a>, " +"users can still personalise phpMyAdmin, but settings will be saved in " +"browser's local storage, or, it is is unavailable, until the end of session." #. type: Content of: <html><body><div><dl><dd><ul><li> #: ../phpmyadmin/Documentation.html:1160 -#, fuzzy msgid "put the table name in <tt>$cfg['Servers'][$i]['userconfig']</tt>" -msgstr "" -"put the relation table name in <tt>$cfg['Servers'][$i]['relation']</tt>" +msgstr "put the table name in <tt>$cfg['Servers'][$i]['userconfig']</tt>" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:1165 @@ -3090,13 +3090,12 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1206 -#, fuzzy msgid "" "If your rule order is empty, then <abbr title=\"Internet Protocol\">IP</" "abbr> authorization is disabled." msgstr "" -"If your rule order is empty, then <abbr title=\"Internet Protocol\">IP</" -"abbr> authentication is disabled." +"If your rule order is empty, then <abbr title=\"Internet Protocol\">IP</abbr> " +"authorisation is disabled." #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1209 @@ -3126,7 +3125,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1219 -#, fuzzy msgid "" "If your rule order is set to 'explicit', authorization is performed in a " "similar fashion to rule order 'deny,allow', with the added restriction that " @@ -3135,10 +3133,10 @@ msgid "" "secure means of using Allow/Deny rules, and was available in Apache by " "specifying allow and deny rules without setting any order." msgstr "" -"If your rule order is set to 'explicit', the authentication is performed in " -"a similar fashion to rule order 'deny,allow', with the added restriction " -"that your host/username combination <b>must</b> be listed in the <i>allow</" -"i> rules, and not listed in the <i>deny</i> rules. This is the <b>most</b> " +"If your rule order is set to 'explicit', authorisation is performed in a " +"similar fashion to rule order 'deny,allow', with the added restriction that " +"your host/username combination <b>must</b> be listed in the <i>allow</i> " +"rules, and not listed in the <i>deny</i> rules. This is the <b>most</b> " "secure means of using Allow/Deny rules, and was available in Apache by " "specifying allow and deny rules without setting any order." @@ -5946,9 +5944,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:2153 -#, fuzzy msgid "$cfg['UserprefsDisallow'] array" -msgstr "$cfg['Servers'] array" +msgstr "$cfg['UserprefsDisallow'] array" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:2154 @@ -5957,6 +5954,9 @@ msgid "" "users can't set through user preferences. For possible values, refer to " "<tt>libraries/config/user_preferences.forms.php</tt>." msgstr "" +"Contains names of configuration options (keys in <tt>$cfg</tt> array) that " +"users can't set through user preferences. For possible values, refer to " +"<tt>libraries/config/user_preferences.forms.php</tt>." #. type: Content of: <html><body><div><dl><dt> #: ../phpmyadmin/Documentation.html:2158 @@ -7326,17 +7326,15 @@ msgstr "" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2629 -#, fuzzy msgid "" "<a href=\"#faq1_5\">1.5 Using phpMyAdmin on <abbr title=\"Internet " "Information Services\">IIS</abbr>, I'm facing crashes and/or many error " "messages with the <abbr title=\"HyperText Transfer Protocol\">HTTP</abbr>.</" "a>" msgstr "" -"<a href=\"#faq1_5\">1.5 Using phpMyAdmin on <abbr title=\"Internet " -"Information Services\">IIS</abbr>, I'm facing crashes and/or many error " -"messages with the <abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> or " -"advanced authentication mode.</a>" +"<a href=\"#faq1_5\">1.5 Using phpMyAdmin on <abbr title=\"Internet Information " +"Services\">IIS</abbr>, I'm facing crashes and/or many error messages with the " +"<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr>.</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:2634 @@ -7455,9 +7453,8 @@ msgstr "restart Apache" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2677 -#, fuzzy msgid "<a href=\"#faq1_9\">1.9 (withdrawn).</a>" -msgstr "<a href=\"#faq1_3\">1.3 (withdrawn).</a>" +msgstr "<a href=\"#faq1_9\">1.9 (withdrawn).</a>" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2680 @@ -7534,15 +7531,13 @@ msgstr "" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2709 -#, fuzzy msgid "<a href=\"#faq1_13\">1.13 (withdrawn).</a>" -msgstr "<a href=\"#faq1_3\">1.3 (withdrawn).</a>" +msgstr "<a href=\"#faq1_13\">1.13 (withdrawn).</a>" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2712 -#, fuzzy msgid "<a href=\"#faq1_14\">1.14 (withdrawn).</a>" -msgstr "<a href=\"#faq1_18\">1.18 (withdrawn).</a>" +msgstr "<a href=\"#faq1_14\">1.14 (withdrawn).</a>" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:2715 @@ -9474,17 +9469,16 @@ msgstr "" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3461 -#, fuzzy msgid "" "phpMyAdmin uses the <a href=\"http://www.codeplex.com/PHPExcel/\">PHPExcel</" "a> library to parse Excel XLS and XLSX spreadsheets. Therefore, any " "limitations that are listed on their page regarding Excel calculations will " "also apply here." msgstr "" -"phpMyAdmin uses the <a href=\"http://www.codeplex.com/PHPExcel/\" target=" -"\"_blank\">PHPExcel</a> library to parse Excel XLS and XLSX spreadsheets. " -"Therefore, any limitations that are listed on their page regarding Excel " -"calculations will also apply here." +"phpMyAdmin uses the <a href=\"http://www.codeplex.com/PHPExcel/\">PHPExcel</a> " +"library to parse Excel XLS and XLSX spreadsheets. Therefore, any " +"limitations that are listed on their page regarding Excel calculations will " +"also apply here." #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:3464 @@ -11693,17 +11687,15 @@ msgstr "phpMyAdmin with version" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:4315 -#, fuzzy msgid "" "<a href=\"#wysiwyg\">6.28 How can I easily edit relational schema for export?" "</a>" msgstr "" -"<a href=\"#faq6_6\">6.6 How can I use the relation table in Query-by-example?" -"</a>" +"<a href=\"#wysiwyg\">6.28 How can I easily edit relational schema for " +"export?</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4318 -#, fuzzy msgid "" "By clicking on the button 'toggle scratchboard' on the page where you edit x/" "y coordinates of those elements you can activate a scratchboard where all " @@ -11713,14 +11705,13 @@ msgid "" "field, the new position in the scratchboard changes after your cursor leaves " "the input field." msgstr "" -"Utilises a WYSIWYG editing control to easily place elements of a <abbr title=" -"\"Portable Document Format\">PDF</abbr> page. By clicking on the button " -"'toggle scratchboard' on the page where you edit x/y coordinates of those " -"elements you can activate a scratchboard where all your elements are placed. " -"By clicking on an element, you can move them around in the pre-defined area " -"and the x/y coordinates will get updated dynamically. Likewise, when " -"entering a new position directly into the input field, the new position in " -"the scratchboard changes after your cursor leaves the input field." +"By clicking on the button 'toggle scratchboard' on the page where you edit " +"x/y coordinates of those elements you can activate a scratchboard where all " +"your elements are placed. By clicking on an element, you can move them " +"around in the pre-defined area and the x/y coordinates will get updated " +"dynamically. Likewise, when entering a new position directly into the input " +"field, the new position in the scratchboard changes after your cursor leaves " +"the input field." #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4327 @@ -11757,12 +11748,12 @@ msgstr "" #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:4344 -#, fuzzy msgid "" "<a href=\"#faq6_29\">6.28 Why can't I get a chart from my query result table?" "</a>" msgstr "" -"<a href=\"#faq6_3\">6.3 How can I insert a null value into my table?</a>" +"<a href=\"#faq6_29\">6.28 Why can't I get a chart from my query result " +"table?</a>" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4346 @@ -11773,6 +11764,11 @@ msgid "" "formats can be found in the <a href=\"http://wiki.phpmyadmin.net/pma/Devel:" "Charts#Data_formats_for_query_results_chart\">wiki</a>." msgstr "" +"Not every table can be put to the chart. Only tables with one, two or three " +"columns can be visualised as a chart. Moreover the table must be in a " +"special format for chart script to understand it. Currently supported " +"formats can be found in the <a href=\"http://wiki.phpmyadmin.net/pma/Devel:Ch" +"arts#Data_formats_for_query_results_chart\">wiki</a>." #. type: Content of: <html><body><div><h3> #: ../phpmyadmin/Documentation.html:4348 @@ -12962,9 +12958,8 @@ msgstr "BLOBstreaming support" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4818 -#, fuzzy msgid "Piotr Przybylski (Google Summer of Code 2008 and 2010)" -msgstr "Piotr Przybylski (Google Summer of Code 2008)" +msgstr "Piotr Przybylski (Google Summer of Code 2008 and 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4820 @@ -12973,9 +12968,8 @@ msgstr "improved setup script" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4821 -#, fuzzy msgid "user preferences" -msgstr "User preferences" +msgstr "user preferences" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4824 @@ -13019,47 +13013,43 @@ msgstr "Replication support" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4844 -#, fuzzy msgid "Muhammad Adnan (Google Summer of Code 2010)" -msgstr "Zahra Naeem (Google Summer of Code 2009)" +msgstr "Muhammad Adnan (Google Summer of Code 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4846 msgid "Relation schema export to multiple formats" -msgstr "" +msgstr "Relation schema export to multiple formats" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4849 -#, fuzzy msgid "Lori Lee (Google Summer of Code 2010)" -msgstr "Zahra Naeem (Google Summer of Code 2009)" +msgstr "Lori Lee (Google Summer of Code 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4851 -#, fuzzy msgid "User interface improvements" -msgstr "interface improvements" +msgstr "User interface improvements" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4852 msgid "ENUM/SET editor" -msgstr "" +msgstr "ENUM/SET editor" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4853 msgid "Simplified interface for export/import" -msgstr "" +msgstr "Simplified interface for export/import" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4856 -#, fuzzy msgid "Ninad Pundalik (Google Summer of Code 2010)" -msgstr "Zahra Naeem (Google Summer of Code 2009)" +msgstr "Ninad Pundalik (Google Summer of Code 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4858 msgid "AJAXifying the interface" -msgstr "" +msgstr "AJAXifying the interface" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4861 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7RC1-9434-gaf51cb3
by Michal Čihař 03 Sep '10

03 Sep '10

The branch, master has been updated via af51cb312d15748696aee085e3f64f7948824767 (commit) via af11c7a35e13a397ccf1799a41fba697bef2f6a5 (commit) via 03632b1e61763f9f5c4350be730edb9ecef71790 (commit) via dc955d7cf46d9d94ffe8c74a2843154ed215cae4 (commit) via 70ab4bbfb219a1a144b17ed399f46df13401cab5 (commit) via 46e6c9b0f98755ad9a04faf370c8559d3750aba8 (commit) via bd487aa1457c5e07719165cacc3e9e2a86b56fba (commit) via d52e7bf56dcc4d9defa326441c7397532bc8be9a (commit) via 9aaddea8212eaca84e71e5d8767d948b2e2d33fc (commit) via 97f980fef4fdf6bdad7466b90a3c26330ea56e89 (commit) via 467a335e9bcc1dc249f3973c76422dc4908ccdd7 (commit) from 44866335972b0f1f94980892494ecb54e9f28456 (commit) - Log ----------------------------------------------------------------- commit af51cb312d15748696aee085e3f64f7948824767 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:27:15 2010 +0200 Translation update done using Pootle. commit af11c7a35e13a397ccf1799a41fba697bef2f6a5 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:27:11 2010 +0200 Translation update done using Pootle. commit 03632b1e61763f9f5c4350be730edb9ecef71790 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:27:07 2010 +0200 Translation update done using Pootle. commit dc955d7cf46d9d94ffe8c74a2843154ed215cae4 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:27:01 2010 +0200 Translation update done using Pootle. commit 70ab4bbfb219a1a144b17ed399f46df13401cab5 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:26:58 2010 +0200 Translation update done using Pootle. commit 46e6c9b0f98755ad9a04faf370c8559d3750aba8 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:26:56 2010 +0200 Translation update done using Pootle. commit bd487aa1457c5e07719165cacc3e9e2a86b56fba Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:26:54 2010 +0200 Translation update done using Pootle. commit d52e7bf56dcc4d9defa326441c7397532bc8be9a Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:26:52 2010 +0200 Translation update done using Pootle. commit 9aaddea8212eaca84e71e5d8767d948b2e2d33fc Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:26:50 2010 +0200 Translation update done using Pootle. commit 97f980fef4fdf6bdad7466b90a3c26330ea56e89 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:26:46 2010 +0200 Translation update done using Pootle. commit 467a335e9bcc1dc249f3973c76422dc4908ccdd7 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Sep 3 14:26:43 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/en_GB.po | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index cd12445..03e4dea 100644 --- a/po/en_GB.po +++ b/po/en_GB.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-08-30 17:37+0200\n" -"PO-Revision-Date: 2010-08-31 15:43+0200\n" +"PO-Revision-Date: 2010-09-03 14:27+0200\n" "Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" "Language-Team: english-gb <en_GB(a)li.org>\n" "Language: en_GB\n" @@ -9193,58 +9193,60 @@ msgstr "Bar" #: tbl_chart.php:136 msgid "Line" -msgstr "" +msgstr "Line" #: tbl_chart.php:137 msgid "Radar" -msgstr "" +msgstr "Radar" #: tbl_chart.php:139 -#, fuzzy #| msgid "PiB" msgid "Pie" -msgstr "PiB" +msgstr "Pie" #: tbl_chart.php:145 -#, fuzzy #| msgid "Query type" msgid "Bar type" -msgstr "Query type" +msgstr "Bar type" #: tbl_chart.php:147 -#, fuzzy #| msgid "Packed" msgid "Stacked" -msgstr "Packed" +msgstr "Stacked" #: tbl_chart.php:148 msgid "Multi" -msgstr "" +msgstr "Multi" #: tbl_chart.php:153 msgid "Continuous image" -msgstr "" +msgstr "Continuous image" #: tbl_chart.php:156 msgid "" "For compatibility reasons the chart image is segmented by default, select " "this to draw the whole chart in one image." msgstr "" +"For compatibility reasons the chart image is segmented by default, select " +"this to draw the whole chart in one image." #: tbl_chart.php:167 msgid "" "When drawing a radar chart all values are normalized to a range [0..10]." msgstr "" +"When drawing a radar chart all values are normalised to a range [0..10]." #: tbl_chart.php:174 msgid "" "Note that not every result table can be put to the chart. See <a href=\"./" "Documentation.html#faq6_29\" target=\"Documentation\">FAQ 6.29</a>" msgstr "" +"Note that not every result table can be put to the chart. See <a " +"href=\"./Documentation.html#faq6_29\" target=\"Documentation\">FAQ 6.29</a>" #: tbl_chart.php:182 msgid "Redraw" -msgstr "" +msgstr "Redraw" #: tbl_create.php:55 #, php-format hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7RC1-9423-g4486633
by Michal Čihař 03 Sep '10

03 Sep '10

The branch, master has been updated via 44866335972b0f1f94980892494ecb54e9f28456 (commit) via 23bedb8f2b080a5986edfc07c3c6c228a7b9cf75 (commit) via 585aff6aa2d399d450b5650c3fc74878df33f7cc (commit) via e4fc02340479e1b73da4137dd9934009d8eb452e (commit) via 8cbac3f532d7ab1dca146a613842a0d73e06b915 (commit) via fa520eb1a6087d519f9b17bfce58774b7f443f2c (commit) via 8185f2022c9084aab99c5fc0864462543105fc9f (commit) via aee0affce92385a07b02bae226a39e8f5c1e0dfb (commit) via c79c303a22d21e8ac002bd68a548db524fe962d0 (commit) via f34aa06da8ae4b4592a0592c5723596fa914022f (commit) via 50bd836faba4612f873364295f9255d187ba1717 (commit) via 375d5a6693f068748b8c877789c7e1b0fd9d64ec (commit) via f2d115257ecfdb3b88e602beafc1d30de617832c (commit) via e4fbbb3b77eb72c9011ee55c7be1c116966150e6 (commit) via bc3f155af3104eae5abb8db92c7737909f74315b (commit) via e41ff998c58b50c266f10b3b4ef1b5c6fe3b2b46 (commit) via 74bbd3813419c27bb07bd466f2017da2dfa92809 (commit) via 2fcd026efc8d0011ac122fa6db05e89dba7efad7 (commit) via a7864ee5cbb714723a43df8f8b5b20349c47202d (commit) via 60db6a0a4aed9a0ff91029d1306243f9c512e686 (commit) via 25efe8e4be5bda65b3b0cf86c6166d84637bdc12 (commit) via 5f797984020c940decc9c5d83b9f25bdb199b484 (commit) via baf7baacaf67f021875e248fd32691a39e3722d6 (commit) via 56e8e1184af638ad51760d3dcc7676ba9d8d6f01 (commit) via a46fca31df8785e6eb9c4b1487502283b5aaf7a8 (commit) via da89a6291c64b1f63899eaab0d7af71b2668e726 (commit) via 46d736e36b93447fe6a712d99274ef3fd4f60bf0 (commit) via 86920d7aed6a41aaff4cc1798cf9f64bf0aa438e (commit) via 589ef9f84f13f435f3d737df381312e1ab80d16e (commit) via a7bf85a09bbfb6de299e4f2f955d33328791d63d (commit) via e5e0a2a9c23930b7cee3cba889a681bd357144e2 (commit) via 2c97fb551632e0f124cf3e42ddec9f8e82d428c4 (commit) via cf6cc6096afb0b7fb7f8c3bee902958dc8771bf5 (commit) from b1aa4d72bb3d01beab320f2b04990d90abe725fe (commit) - Log ----------------------------------------------------------------- commit 44866335972b0f1f94980892494ecb54e9f28456 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 12:10:55 2010 +0200 Translation update done using Pootle. commit 23bedb8f2b080a5986edfc07c3c6c228a7b9cf75 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 12:10:26 2010 +0200 Translation update done using Pootle. commit 585aff6aa2d399d450b5650c3fc74878df33f7cc Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 12:10:14 2010 +0200 Translation update done using Pootle. commit e4fc02340479e1b73da4137dd9934009d8eb452e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 12:10:07 2010 +0200 Translation update done using Pootle. commit 8cbac3f532d7ab1dca146a613842a0d73e06b915 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 12:09:50 2010 +0200 Translation update done using Pootle. commit fa520eb1a6087d519f9b17bfce58774b7f443f2c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 12:09:43 2010 +0200 Translation update done using Pootle. commit 8185f2022c9084aab99c5fc0864462543105fc9f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 12:09:34 2010 +0200 Translation update done using Pootle. commit aee0affce92385a07b02bae226a39e8f5c1e0dfb Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 12:09:05 2010 +0200 Translation update done using Pootle. commit c79c303a22d21e8ac002bd68a548db524fe962d0 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 10:24:31 2010 +0200 Translation update done using Pootle. commit f34aa06da8ae4b4592a0592c5723596fa914022f Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 10:24:12 2010 +0200 Translation update done using Pootle. commit 50bd836faba4612f873364295f9255d187ba1717 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 10:23:51 2010 +0200 Translation update done using Pootle. commit 375d5a6693f068748b8c877789c7e1b0fd9d64ec Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 10:23:08 2010 +0200 Translation update done using Pootle. commit f2d115257ecfdb3b88e602beafc1d30de617832c Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 10:22:06 2010 +0200 Translation update done using Pootle. commit e4fbbb3b77eb72c9011ee55c7be1c116966150e6 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:54:39 2010 +0200 Translation update done using Pootle. commit bc3f155af3104eae5abb8db92c7737909f74315b Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:54:20 2010 +0200 Translation update done using Pootle. commit e41ff998c58b50c266f10b3b4ef1b5c6fe3b2b46 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:54:12 2010 +0200 Translation update done using Pootle. commit 74bbd3813419c27bb07bd466f2017da2dfa92809 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:54:06 2010 +0200 Translation update done using Pootle. commit 2fcd026efc8d0011ac122fa6db05e89dba7efad7 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:49:36 2010 +0200 Translation update done using Pootle. commit a7864ee5cbb714723a43df8f8b5b20349c47202d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:44:52 2010 +0200 Translation update done using Pootle. commit 60db6a0a4aed9a0ff91029d1306243f9c512e686 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:44:41 2010 +0200 Translation update done using Pootle. commit 25efe8e4be5bda65b3b0cf86c6166d84637bdc12 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:44:23 2010 +0200 Translation update done using Pootle. commit 5f797984020c940decc9c5d83b9f25bdb199b484 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:43:00 2010 +0200 Translation update done using Pootle. commit baf7baacaf67f021875e248fd32691a39e3722d6 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:42:37 2010 +0200 Translation update done using Pootle. commit 56e8e1184af638ad51760d3dcc7676ba9d8d6f01 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:39:22 2010 +0200 Translation update done using Pootle. commit a46fca31df8785e6eb9c4b1487502283b5aaf7a8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:39:17 2010 +0200 Translation update done using Pootle. commit da89a6291c64b1f63899eaab0d7af71b2668e726 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:38:19 2010 +0200 Translation update done using Pootle. commit 46d736e36b93447fe6a712d99274ef3fd4f60bf0 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:36:19 2010 +0200 Translation update done using Pootle. commit 86920d7aed6a41aaff4cc1798cf9f64bf0aa438e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:36:04 2010 +0200 Translation update done using Pootle. commit 589ef9f84f13f435f3d737df381312e1ab80d16e Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:33:39 2010 +0200 Translation update done using Pootle. commit a7bf85a09bbfb6de299e4f2f955d33328791d63d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:32:53 2010 +0200 Translation update done using Pootle. commit e5e0a2a9c23930b7cee3cba889a681bd357144e2 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:32:23 2010 +0200 Translation update done using Pootle. commit 2c97fb551632e0f124cf3e42ddec9f8e82d428c4 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:31:52 2010 +0200 Translation update done using Pootle. commit cf6cc6096afb0b7fb7f8c3bee902958dc8771bf5 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Sep 3 09:30:37 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 72 +++++++++++++++++++++++-------------------------------------- 1 files changed, 27 insertions(+), 45 deletions(-) diff --git a/po/tr.po b/po/tr.po index df01269..2d0957c 100644 --- a/po/tr.po +++ b/po/tr.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-08-30 17:37+0200\n" -"PO-Revision-Date: 2010-08-28 14:44+0200\n" +"PO-Revision-Date: 2010-09-03 12:10+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -957,23 +957,21 @@ msgstr "Bütün bir veritabanını YOK ETMEK üzeresiniz!" #: js/messages.php:32 msgid "Dropping Event" -msgstr "" +msgstr "Olay Kaldırılıyor" #: js/messages.php:33 -#, fuzzy #| msgid "Procedures" msgid "Dropping Procedure" -msgstr "Yordamlar" +msgstr "İşlem Kaldırılıyor" #: js/messages.php:35 -#, fuzzy #| msgid "Delete tracking data for this table" msgid "Deleting tracking data" -msgstr "Bu tabloyu izleme verisini sil" +msgstr "İzleme verisi siliniyor" #: js/messages.php:36 msgid "Dropping Primary Key/Index" -msgstr "" +msgstr "Birincil Anaktar/İndeks Kaldırılıyor" #: js/messages.php:37 msgid "This operation could take a long time. Proceed anyway?" @@ -1015,28 +1013,24 @@ msgid "The passwords aren't the same!" msgstr "Parolalar birbiriyle aynı değil!" #: js/messages.php:52 -#, fuzzy #| msgid "Add a new User" msgid "Add a New User" -msgstr "Yeni Kullanıcı ekle" +msgstr "Yeni Kullanıcı Ekle" #: js/messages.php:53 -#, fuzzy #| msgid "Create version" msgid "Create User" -msgstr "Sürüm oluştur" +msgstr "Kullanıcı Oluştur" #: js/messages.php:54 -#, fuzzy #| msgid "Reloading the privileges" msgid "Reloading Privileges" -msgstr "Yetkiler yeniden yükleniyor" +msgstr "Yetkiler Yeniden Yükleniyor" #: js/messages.php:55 -#, fuzzy #| msgid "Remove selected users" msgid "Removing Selected Users" -msgstr "Seçili kullanıcıları kaldır" +msgstr "Seçili Kullanıcılar Kaldırılıyor" #: js/messages.php:56 tbl_tracking.php:245 tbl_tracking.php:373 msgid "Close" @@ -1047,84 +1041,74 @@ msgid "Cancel" msgstr "İptal" #: js/messages.php:63 -#, fuzzy #| msgid "Load" msgid "Loading" -msgstr "Yükle" +msgstr "Yükleniyor" #: js/messages.php:64 -#, fuzzy #| msgid "Processes" msgid "Processing Request" -msgstr "İşlemler" +msgstr "İşleme İsteği" #: js/messages.php:65 msgid "Error in Processing Request" -msgstr "" +msgstr "İşleme İsteğinde Hata" #: js/messages.php:66 msgid "Dropping Column" -msgstr "" +msgstr "Sütun Kaldırılıyor" #: js/messages.php:67 msgid "Adding Primary Key" -msgstr "" +msgstr "Birincil Anaktar Ekleniyor" #: js/messages.php:68 libraries/relation.lib.php:81 pmd_general.php:339 msgid "OK" msgstr "TAMAM" #: js/messages.php:71 -#, fuzzy #| msgid "Rename database to" msgid "Renaming Databases" -msgstr "Veritabanını şuna yeniden adlandır" +msgstr "Veritabanı Yeniden Adlandırılıyor" #: js/messages.php:72 -#, fuzzy #| msgid "Remove database" msgid "Reload Database" -msgstr "Veritabanını kaldır" +msgstr "Veritabanını Yeniden Yükle" #: js/messages.php:73 -#, fuzzy #| msgid "Copy database to" msgid "Copying Database" -msgstr "Veritabanını şuraya kopyala:" +msgstr "Veritabanı Kopyalanıyor" #: js/messages.php:74 -#, fuzzy #| msgid "Charset" msgid "Changing Charset" -msgstr "Karakter Grubu" +msgstr "Karakter Grubu Değiştiriliyor" #: js/messages.php:75 -#, fuzzy #| msgid "Table must have at least one column." msgid "Table must have atleast 1 column" -msgstr "Tablonun en az bir sütunu olmalı." +msgstr "Tablonun en az 1 sütunu olmalı" #: js/messages.php:76 -#, fuzzy #| msgid "Create table" msgid "Create Table" -msgstr "Tablo oluştur" +msgstr "Tablo Oluştur" #: js/messages.php:81 -#, fuzzy #| msgid "Search" msgid "Searching" -msgstr "Ara" +msgstr "Aranıyor" #: js/messages.php:84 msgid "Toggle Query Box Visibility" -msgstr "" +msgstr "Sorgu Kutusu Görünürlüğünü Değiştir" #: js/messages.php:85 -#, fuzzy #| msgid "Inline" msgid "Inline Edit" -msgstr "Sıralı" +msgstr "Sıralı Düzenleme" #: js/messages.php:88 tbl_change.php:296 tbl_indexes.php:198 #: tbl_indexes.php:223 @@ -1194,10 +1178,9 @@ msgid "Generate" msgstr "Üret" #: js/messages.php:107 -#, fuzzy #| msgid "Change password" msgid "Change Password" -msgstr "Parola değiştir" +msgstr "Parola Değiştir" #: js/messages.php:110 msgid "More" @@ -4276,14 +4259,13 @@ msgstr "Açık Kaynaklı Tablolama Belgesi" #: libraries/config/setup.forms.php:259 #: libraries/config/user_preferences.forms.php:162 msgid "Quick" -msgstr "" +msgstr "Hızlı" #: libraries/config/setup.forms.php:263 #: libraries/config/user_preferences.forms.php:166 -#, fuzzy #| msgid "Customization" msgid "Custom" -msgstr "Özelleştirme" +msgstr "Özel" #: libraries/config/setup.forms.php:284 #: libraries/config/user_preferences.forms.php:186 @@ -6452,7 +6434,7 @@ msgstr "END RAW" #: libraries/sqlparser.lib.php:368 msgid "Automatically appended backtick to the end of query!" -msgstr "" +msgstr "Otomatik olarak sorgunun sonuna ters işaret ekle" #: libraries/sqlparser.lib.php:371 msgid "Unclosed quote" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7RC1-9390-gb1aa4d7
by Piotr Przybylski 02 Sep '10

02 Sep '10

The branch, master has been updated via b1aa4d72bb3d01beab320f2b04990d90abe725fe (commit) from 07d85d420b86ba8e01a7edd7ed2b8e5d23ad80fb (commit) - Log ----------------------------------------------------------------- commit b1aa4d72bb3d01beab320f2b04990d90abe725fe Author: Crack <piotrprz(a)gmail.com> Date: Thu Sep 2 23:49:38 2010 +0200 add user preference for accepted patch #3055886 (LeftDisplayTableFilter) ----------------------------------------------------------------------- Summary of changes: libraries/config/messages.inc.php | 1 + libraries/config/setup.forms.php | 1 + libraries/config/user_preferences.forms.php | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index 33a4f31..59ac04d 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -265,6 +265,7 @@ $strConfigLeftDisplayLogo_desc = __('Show logo in left frame'); $strConfigLeftDisplayLogo_name = __('Display logo'); $strConfigLeftDisplayServers_desc = __('Display server choice at the top of the left frame'); $strConfigLeftDisplayServers_name = __('Display servers selection'); +$strConfigLeftDisplayTableFilter_name = __('Display table filter'); $strConfigLeftFrameDBSeparator_desc = __('String that separates databases into different tree levels'); $strConfigLeftFrameDBSeparator_name = __('Database tree separator'); $strConfigLeftFrameDBTree_desc = __('Only light version; display databases in a tree (determined by the separator defined below)'); diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index 48d195a..ab654bd 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -170,6 +170,7 @@ $forms['Left_frame']['Left_databases'] = array( 'LeftFrameDBSeparator', 'ShowTooltipAliasDB'); $forms['Left_frame']['Left_tables'] = array( + 'LeftDisplayTableFilter', 'LeftDefaultTabTable', 'LeftFrameTableSeparator', 'LeftFrameTableLevel', diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index a82a351..7ae41fb 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -81,6 +81,7 @@ $forms['Left_frame']['Left_databases'] = array( 'LeftFrameDBSeparator', 'ShowTooltipAliasDB'); $forms['Left_frame']['Left_tables'] = array( + 'LeftDisplayTableFilter', 'LeftDefaultTabTable', 'LeftFrameTableSeparator', 'LeftFrameTableLevel', hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7RC1-9389-g07d85d4
by Piotr Przybylski 02 Sep '10

02 Sep '10

The branch, master has been updated via 07d85d420b86ba8e01a7edd7ed2b8e5d23ad80fb (commit) via 171bd10394199a9b8b9274d1ba5bce81e64f9596 (commit) from aed2e27b3f814c90350be72ec95d5d72e9063057 (commit) - Log ----------------------------------------------------------------- commit 07d85d420b86ba8e01a7edd7ed2b8e5d23ad80fb Author: Crack <piotrprz(a)gmail.com> Date: Thu Sep 2 23:39:26 2010 +0200 remove problematic CSS, it will make overlay of enum/set editor popup to be a bit off in IE6 commit 171bd10394199a9b8b9274d1ba5bce81e64f9596 Author: Crack <piotrprz(a)gmail.com> Date: Thu Sep 2 23:34:44 2010 +0200 restore debug code for user preferences (commented out) ----------------------------------------------------------------------- Summary of changes: libraries/user_preferences.inc.php | 14 ++++++++++++++ themes/original/css/theme_right.css.php | 2 -- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php index e173d55..2aad2e6 100644 --- a/libraries/user_preferences.inc.php +++ b/libraries/user_preferences.inc.php @@ -48,6 +48,20 @@ if (!empty($_GET['saved'])) { $message->display(); } +/* debug code +$arr = ConfigFile::getInstance()->getConfigArray(); +$arr2 = array(); +foreach ($arr as $k => $v) { + $arr2[] = "<b>$k</b> " . var_export($v, true); +} +$arr2 = implode(', ', $arr2); +$arr2 .= '<br />Blacklist: ' . (empty($cfg['UserprefsDisallow']) + ? '<i>empty</i>' + : implode(', ', $cfg['UserprefsDisallow'])); +$msg = PMA_Message::notice('Settings: ' . $arr2); +$msg->display(); +//*/ + // warn about using session storage for settings $cfgRelation = PMA_getRelationsParam(); if (!$cfgRelation['userconfigwork']) { diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index da283ea..c04bedb 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -31,8 +31,6 @@ body { margin: 0.5em; color: <?php echo $GLOBALS['cfg']['MainColor']; ?>; background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>; - width: 100%; - height: 100%; } <?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7RC1-9387-gaed2e27
by Marc Delisle 02 Sep '10

02 Sep '10

The branch, master has been updated via aed2e27b3f814c90350be72ec95d5d72e9063057 (commit) from 2ff1245ae5b1b263f9f6c241f6d1244a231208a9 (commit) - Log ----------------------------------------------------------------- commit aed2e27b3f814c90350be72ec95d5d72e9063057 Author: ninadsp <ninadsp16289(a)gmail.com> Date: Thu Sep 2 21:47:46 2010 +0530 A better solution to the caching issues faced. Set jQuery's global Ajax parameter 'cache' to false, and also set the 'Cache-Control' header to 'no-cache' ----------------------------------------------------------------------- Summary of changes: js/db_search.js | 8 +++----- js/server_privileges.js | 7 ++----- js/sql.js | 8 +++----- js/tbl_select.js | 8 +++----- libraries/common.lib.php | 1 + server_privileges.php | 5 +++++ 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/js/db_search.js b/js/db_search.js index 94fdf6c..3527b62 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -16,13 +16,11 @@ $(document).ready(function() { /** - * Set a parameter for all Ajax queries made on this page. Append a random - * number to tell server that each Ajax request is a new one + * Set a parameter for all Ajax queries made on this page. Don't let the + * web server serve cached pages */ $.ajaxSetup({ - data: {'random': function() { - return Math.random(); - }} + cache: 'false' }); /** diff --git a/js/server_privileges.js b/js/server_privileges.js index dff2c65..4ecfea0 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -163,13 +163,10 @@ $(document).ready(function() { /** * Set a parameter for all Ajax queries made on this page. Some queries * are affected by cache settings on the server side, and hence, show stale - * data. Append a random number to tell server that each Ajax request is a - * new one + * data. Don't let the web server serve cached pages */ $.ajaxSetup({ - data: {'random': function() { - return Math.random(); - }} + cache: 'false' }); /** diff --git a/js/sql.js b/js/sql.js index 76e6c40..ee66044 100644 --- a/js/sql.js +++ b/js/sql.js @@ -108,13 +108,11 @@ function appendInlineAnchor(disp_mode) { $(document).ready(function() { /** - * Set a parameter for all Ajax queries made on this page. Append a random - * number to tell server that each Ajax request is a new one + * Set a parameter for all Ajax queries made on this page. Don't let the + * web server serve cached pages */ $.ajaxSetup({ - data: {'random': function() { - return Math.random(); - }} + cache: 'false' }); /** diff --git a/js/tbl_select.js b/js/tbl_select.js index 12072b0..97de181 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -14,13 +14,11 @@ $(document).ready(function() { /** - * Set a parameter for all Ajax queries made on this page. Append a random - * number to tell server that each Ajax request is a new one + * Set a parameter for all Ajax queries made on this page. Don't let the + * web server serve cached pages */ $.ajaxSetup({ - data: {'random': function() { - return Math.random(); - }} + cache: 'false' }); /** diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 2a05638..7dd39f9 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2937,6 +2937,7 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) // Set the Content-Type header to JSON so that jQuery parses the response correctly if(!isset($GLOBALS['is_header_sent'])) { + header('Cache-Control: no-cache'); header("Content-Type: application/json"); } echo json_encode($response); diff --git a/server_privileges.php b/server_privileges.php index 567a44c..710151e 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1731,6 +1731,11 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs // A user was selected -> display the user's properties + // In an Ajax request, prevent cached values from showing + if($GLOBALS['is_ajax_request'] == true) { + header('Cache-Control: no-cache'); + } + echo '<h2>' . "\n" . PMA_getIcon('b_usredit.png') . __('Edit Privileges') . ': ' hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7RC1-9386-g2ff1245
by Herman van Rink 02 Sep '10

02 Sep '10

The branch, master has been updated via 2ff1245ae5b1b263f9f6c241f6d1244a231208a9 (commit) via 223d8850cf3d723487d41cb0397869be2d544c84 (commit) via 7aa4aa62dc7b0caa4fd04084f70cf3e0076a21b5 (commit) from 00250a9f596544596e1762819c7ff6990bf3b34b (commit) - Log ----------------------------------------------------------------- commit 2ff1245ae5b1b263f9f6c241f6d1244a231208a9 Merge: 223d8850cf3d723487d41cb0397869be2d544c84 00250a9f596544596e1762819c7ff6990bf3b34b Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Sep 2 14:36:18 2010 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 223d8850cf3d723487d41cb0397869be2d544c84 Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Sep 2 14:35:30 2010 +0200 patch #3055886 [config] Add Left frame table filter visibility config option, thanks to eesau commit 7aa4aa62dc7b0caa4fd04084f70cf3e0076a21b5 Author: Herman van Rink <rink(a)initfour.nl> Date: Thu Sep 2 11:53:53 2010 +0200 bug #3056610 [interface] Removed modification options for information_schema ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ Documentation.html | 5 +++++ db_structure.php | 31 +++++++++++++++++-------------- libraries/config.default.php | 7 +++++++ navigation.php | 2 +- 5 files changed, 32 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 682a8d6..213f954 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,8 @@ $Id$ + [interface] AJAXification on various pages - [core] Remove last remaining parts of profiling code which was removed in 2006. - bug #3042665 [parser] Add workaround for MySQL way of handling backtick. +- bug #3056610 [interface] Removed modification options for information_schema ++ patch #3055886 [config] Add Left frame table filter visibility config option, thanks to eesau 3.3.7.0 (not yet released) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after diff --git a/Documentation.html b/Documentation.html index 5a31aed..ec8412f 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1489,6 +1489,11 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> or in a new one (<tt>new</tt>). Note: use <tt>new</tt> if you are linking to <tt>phpmyadmin.net</tt>.</dd> + <dt id="cfg_LeftDisplayTableFilter">$cfg['LeftDisplayTableFilter'] boolean</dt> + <dd>Defines whether or not to display a JavaScript filter box above the + list of tables in the left frame. + Defaults to <tt>TRUE</tt>.</dd> + <dt id="cfg_LeftDisplayServers">$cfg['LeftDisplayServers'] boolean</dt> <dd>Defines whether or not to display a server choice at the top of the left frame. Defaults to FALSE.</dd> diff --git a/db_structure.php b/db_structure.php index 44d732a..dafdcdc 100644 --- a/db_structure.php +++ b/db_structure.php @@ -524,22 +524,25 @@ $checkall_url = 'db_structure.php?' . PMA_generate_common_url($db); <?php echo ' <option value="' . __('With selected:') . '" selected="selected">' . __('With selected:') . '</option>' . "\n"; -echo ' <option value="' . __('Empty') . '" >' - . __('Empty') . '</option>' . "\n"; -echo ' <option value="' . __('Drop') . '" >' - . __('Drop') . '</option>' . "\n"; -echo ' <option value="' . __('Print view') . '" >' - . __('Print view') . '</option>' . "\n"; -echo ' <option value="' . __('Check table') . '" >' - . __('Check table') . '</option>' . "\n"; -echo ' <option value="' . __('Optimize table') . '" >' - . __('Optimize table') . '</option>' . "\n"; -echo ' <option value="' . __('Repair table') . '" >' - . __('Repair table') . '</option>' . "\n"; -echo ' <option value="' . __('Analyze table') . '" >' - . __('Analyze table') . '</option>' . "\n"; echo ' <option value="' . __('Export') . '" >' . __('Export') . '</option>' . "\n"; +echo ' <option value="' . __('Print view') . '" >' + . __('Print view') . '</option>' . "\n"; + +if (!$db_is_information_schema) { + echo ' <option value="' . __('Empty') . '" >' + . __('Empty') . '</option>' . "\n"; + echo ' <option value="' . __('Drop') . '" >' + . __('Drop') . '</option>' . "\n"; + echo ' <option value="' . __('Check table') . '" >' + . __('Check table') . '</option>' . "\n"; + echo ' <option value="' . __('Optimize table') . '" >' + . __('Optimize table') . '</option>' . "\n"; + echo ' <option value="' . __('Repair table') . '" >' + . __('Repair table') . '</option>' . "\n"; + echo ' <option value="' . __('Analyze table') . '" >' + . __('Analyze table') . '</option>' . "\n"; +} ?> </select> <script type="text/javascript"> diff --git a/libraries/config.default.php b/libraries/config.default.php index 466dc2c..92869ac 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -774,6 +774,13 @@ $cfg['LeftLogoLink'] = 'main.php'; $cfg['LeftLogoLinkWindow'] = 'main'; /** + * display a JavaScript table filter in the left frame + * + * @global boolean $cfg['LeftDisplayTableFilter'] + */ +$cfg['LeftDisplayTableFilter'] = true; + +/** * display server choice at top of left frame * * @global boolean $cfg['LeftDisplayServers'] diff --git a/navigation.php b/navigation.php index 7d6d66c..bebdb19 100644 --- a/navigation.php +++ b/navigation.php @@ -286,7 +286,7 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) { $db_tooltip = $GLOBALS['db']; } - if ($table_count) { + if ($table_count && $GLOBALS['cfg']['LeftDisplayTableFilter']) { ?> <span id="NavFilter"> <input type="text" name="fast_filter" id="fast_filter" title="<?php echo __('Filter'); ?>" value="filter tables by name" /> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7RC1-9383-g00250a9
by Marc Delisle 02 Sep '10

02 Sep '10

The branch, master has been updated via 00250a9f596544596e1762819c7ff6990bf3b34b (commit) from 56ec4130ae31ef7f6f7e9f121cb66a9b4e6397e4 (commit) - Log ----------------------------------------------------------------- commit 00250a9f596544596e1762819c7ff6990bf3b34b Author: ninadsp <ninadsp16289(a)gmail.com> Date: Thu Sep 2 01:06:12 2010 +0530 Modified the Change Password action to get the action on Server Privileges page also working ----------------------------------------------------------------------- Summary of changes: js/functions.js | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/js/functions.js b/js/functions.js index d89a827..e49d5d0 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2298,10 +2298,17 @@ $(document).ready(function() { */ var the_form = $("#change_password_form"); + /** + * @var this_value String containing the value of the submit button. + * Need to append this for the change password form on Server Privileges + * page to work + */ + var this_value = $(this).val(); + PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); $(the_form).append('<input type="hidden" name="ajax_request" value="true" />'); - $.post($(the_form).attr('action'), $(the_form).serialize(), function(data) { + $.post($(the_form).attr('action'), $(the_form).serialize() + '&change_pw='+ this_value, function(data) { if(data.success == true) { PMA_ajaxShowMessage(data.message); @@ -2309,6 +2316,7 @@ $(document).ready(function() { $("#topmenucontainer").after(data.sql_query); $("#change_password_dialog").hide().remove(); + $("#edit_user_dialog").dialog("close").remove(); } else { PMA_ajaxShowMessage(data.error); hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git