Git June 2011

git@phpmyadmin.net

7 participants
281 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2RC1-6-g612f8f3
by Madhura Jayaratne 03 Jun '11

03 Jun '11

The branch, QA_3_4 has been updated via 612f8f3d67aea31debdc7df83bc6628997e6aade (commit) from ab1a2394c3df043d81080792028ed739338674f5 (commit) - Log ----------------------------------------------------------------- commit 612f8f3d67aea31debdc7df83bc6628997e6aade Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Jun 4 00:02:11 2011 +0530 Partial fix for bug #3291306 - Inline edit does not honor bit fields. Works with mysqli extension. ----------------------------------------------------------------------- Summary of changes: js/sql.js | 12 ++++++++++-- libraries/display_tbl.lib.php | 9 +++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/js/sql.js b/js/sql.js index 32a5bba..8a3e25f 100644 --- a/js/sql.js +++ b/js/sql.js @@ -888,16 +888,20 @@ $(document).ready(function() { */ var is_null = $this_field.find('input:checkbox').is(':checked'); var value; + var addQuotes = true; if (is_null) { sql_query += ' `' + field_name + "`=NULL , "; need_to_post = true; } else { - if($this_field.is(":not(.relation, .enum, .set)")) { + if($this_field.is(":not(.relation, .enum, .set, .bit)")) { this_field_params[field_name] = $this_field.find('textarea').val(); if($this_field.is('.transformed')) { $.extend(transform_fields, this_field_params); } + } else if ($this_field.is('.bit')) { + this_field_params[field_name] = '0b' + $this_field.find('textarea').val(); + addQuotes = false; } else if ($this_field.is('.set')) { $test_element = $this_field.find('select'); this_field_params[field_name] = $test_element.map(function(){ @@ -924,7 +928,11 @@ $(document).ready(function() { new_clause += '`' + window.parent.table + '`.' + '`' + field_name + "` = '" + this_field_params[field_name].replace(/'/g,"''") + "'" + ' AND '; } if (this_field_params[field_name] != $this_field.data('original_data')) { - sql_query += ' `' + field_name + "`='" + this_field_params[field_name].replace(/'/g, "''") + "' , "; + if (addQuotes == true) { + sql_query += ' `' + field_name + "`='" + this_field_params[field_name].replace(/'/g, "''") + "', "; + } else { + sql_query += ' `' + field_name + "`=" + this_field_params[field_name].replace(/'/g, "''") + ", "; + } need_to_post = true; } } diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index fc1fcf2..c0ab854 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -445,7 +445,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ global $sql_query, $num_rows; global $vertical_display, $highlight_columns; - // required to generate sort links that will remember whether the + // required to generate sort links that will remember whether the // "Show all" button has been clicked $sql_md5 = md5($GLOBALS['sql_query']); $session_max_rows = $_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows']; @@ -1026,6 +1026,11 @@ function PMA_addClass($class, $condition_field, $meta, $nowrap, $is_field_trunca $set_class = ' set'; } + $bit_class = ''; + if(strpos($meta->type, 'bit') !== false) { + $bit_class = ' bit'; + } + $mime_type_class = ''; if(isset($meta->mimetype)) { $mime_type_class = ' ' . preg_replace('/\//', '_', $meta->mimetype); @@ -1034,7 +1039,7 @@ function PMA_addClass($class, $condition_field, $meta, $nowrap, $is_field_trunca $result = $class . ($condition_field ? ' condition' : '') . $nowrap . ' ' . ($is_field_truncated ? ' truncated' : '') . ($transform_function != $default_function ? ' transformed' : '') - . $enum_class . $set_class . $mime_type_class; + . $enum_class . $set_class . $bit_class . $mime_type_class; return $result; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2956-gc16138f
by Marc Delisle 03 Jun '11

03 Jun '11

The branch, master has been updated via c16138f9fd9b7c88ee412c0ef43419ef100ad0d8 (commit) from c6493e39d36885d419d9cb8b930ccc8aedbf548d (commit) - Log ----------------------------------------------------------------- commit c16138f9fd9b7c88ee412c0ef43419ef100ad0d8 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jun 3 13:00:56 2011 -0400 bug #3311170 [sync] Missing helper icons in Synchronize ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_synchronize.php | 18 +++++++----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30b414c..f6cea74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ + rfe #3310562 Wording about Column 3.4.3.0 (not yet released) +- bug #3311170 [sync] Missing helper icons in Synchronize 3.4.2.0 (not yet released) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/server_synchronize.php b/server_synchronize.php index fa3a959..9ff9cd4 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -253,22 +253,18 @@ if ((isset($_REQUEST['submit_connect']))) { */ echo '<form name="synchronize_form" id="synchronize_form" method="post" action="server_synchronize.php">' . PMA_generate_common_hidden_inputs('', ''); - echo '<table id="serverstatustraffic" class="data" width = "60%"> + echo '<table id="serverstatustraffic" class="data" width = "40%"> <tr> - <td> <h2>' - . ($GLOBALS['cfg']['MainPageIconic'] - ? '<img class="icon" src="' . $pmaThemeImage . 'new_struct.jpg" width="32"' + <td>' + . '<img class="icon" src="' . $pmaThemeImage . 'new_struct.jpg" width="32"' . ' height="32" alt="" />' - : '') . __('Structure Synchronization') - .'</h2>' .'</td>'; - echo '<td> <h2>' - . ($GLOBALS['cfg']['MainPageIconic'] - ? '<img class="icon" src="' . $pmaThemeImage . 'new_data.jpg" width="32"' + .'</td>'; + echo '<td>' + . '<img class="icon" src="' . $pmaThemeImage . 'new_data.jpg" width="32"' . ' height="32" alt="" />' - : '') . __('Data Synchronization') - . '</h2>' .'</td>'; + . '</td>'; echo '</tr> </table>'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2RC1-5-gab1a239
by Marc Delisle 03 Jun '11

03 Jun '11

The branch, QA_3_4 has been updated via ab1a2394c3df043d81080792028ed739338674f5 (commit) from 15ef12542eaf64f63d25846c522477c695c7647f (commit) - Log ----------------------------------------------------------------- commit ab1a2394c3df043d81080792028ed739338674f5 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Jun 3 13:00:56 2011 -0400 bug #3311170 [sync] Missing helper icons in Synchronize ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + server_synchronize.php | 18 +++++++----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index b80c555..1e3baa5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ ====================== 3.4.3.0 (not yet released) +- bug #3311170 [sync] Missing helper icons in Synchronize 3.4.2.0 (not yet released) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/server_synchronize.php b/server_synchronize.php index fa3a959..9ff9cd4 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -253,22 +253,18 @@ if ((isset($_REQUEST['submit_connect']))) { */ echo '<form name="synchronize_form" id="synchronize_form" method="post" action="server_synchronize.php">' . PMA_generate_common_hidden_inputs('', ''); - echo '<table id="serverstatustraffic" class="data" width = "60%"> + echo '<table id="serverstatustraffic" class="data" width = "40%"> <tr> - <td> <h2>' - . ($GLOBALS['cfg']['MainPageIconic'] - ? '<img class="icon" src="' . $pmaThemeImage . 'new_struct.jpg" width="32"' + <td>' + . '<img class="icon" src="' . $pmaThemeImage . 'new_struct.jpg" width="32"' . ' height="32" alt="" />' - : '') . __('Structure Synchronization') - .'</h2>' .'</td>'; - echo '<td> <h2>' - . ($GLOBALS['cfg']['MainPageIconic'] - ? '<img class="icon" src="' . $pmaThemeImage . 'new_data.jpg" width="32"' + .'</td>'; + echo '<td>' + . '<img class="icon" src="' . $pmaThemeImage . 'new_data.jpg" width="32"' . ' height="32" alt="" />' - : '') . __('Data Synchronization') - . '</h2>' .'</td>'; + . '</td>'; echo '</tr> </table>'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2955-gc6493e3
by Michal Čihař 03 Jun '11

03 Jun '11

The branch, master has been updated via c6493e39d36885d419d9cb8b930ccc8aedbf548d (commit) via 8f54092c2d69420ab2ea543ea930777a69785bdd (commit) from 0841fce11adc5e4029eea41c256f403a7bd56f98 (commit) - Log ----------------------------------------------------------------- commit c6493e39d36885d419d9cb8b930ccc8aedbf548d Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Jun 3 15:42:18 2011 +0200 Remove not used code commit 8f54092c2d69420ab2ea543ea930777a69785bdd Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Jun 3 15:41:59 2011 +0200 Remove forgotten references to $charset ----------------------------------------------------------------------- Summary of changes: export.php | 4 ++-- import.php | 2 +- libraries/display_export.lib.php | 2 +- libraries/display_import.lib.php | 2 +- libraries/header_printview.inc.php | 2 +- pmd_general.php | 2 +- pmd_help.php | 6 +----- 7 files changed, 8 insertions(+), 12 deletions(-) diff --git a/export.php b/export.php index 1a60151..9471ba0 100644 --- a/export.php +++ b/export.php @@ -218,7 +218,7 @@ $output_kanji_conversion = function_exists('PMA_kanji_str_conv') && $type != 'xl // Do we need to convert charset? $output_charset_conversion = $asfile && $GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE - && isset($charset_of_file) && $charset_of_file != $charset + && isset($charset_of_file) && $charset_of_file != 'utf-8' && $type != 'xls'; // Use on the fly compression? @@ -273,7 +273,7 @@ if ($asfile) { $filename = PMA_expandUserString($filename_template); // convert filename to iso-8859-1, it is safer - $filename = PMA_convert_string($charset, 'iso-8859-1', $filename); + $filename = PMA_convert_string('utf-8', 'iso-8859-1', $filename); // Grab basic dump extension and mime type // Check if the user already added extension; get the substring where the extension would be if it was included diff --git a/import.php b/import.php index 0b029e5..8837af2 100644 --- a/import.php +++ b/import.php @@ -343,7 +343,7 @@ if ($import_file != 'none' && !$error) { // Convert the file's charset if necessary if ($GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE && isset($charset_of_file)) { - if ($charset_of_file != $charset) { + if ($charset_of_file != 'utf-8') { $charset_conversion = TRUE; } } elseif (isset($charset_of_file) && $charset_of_file != 'utf8') { diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 2460042..9f10d77 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -285,7 +285,7 @@ if(isset($_GET['sql_query'])) { echo '<option value="' . $temp_charset . '"'; if(isset($_GET['charset_of_file']) && ($_GET['charset_of_file'] != $temp_charset)) { echo ''; - } elseif ((empty($cfg['Export']['charset']) && $temp_charset == $charset) + } elseif ((empty($cfg['Export']['charset']) && $temp_charset == 'utf-8') || $temp_charset == $cfg['Export']['charset']) { echo ' selected="selected"'; } diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 3a9c2ea..756de10 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -190,7 +190,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { echo '<select id="charset_of_file" name="charset_of_file" size="1">'; foreach ($cfg['AvailableCharsets'] as $temp_charset) { echo '<option value="' . htmlentities($temp_charset) . '"'; - if ((empty($cfg['Import']['charset']) && $temp_charset == $charset) + if ((empty($cfg['Import']['charset']) && $temp_charset == 'utf-8') || $temp_charset == $cfg['Import']['charset']) { echo ' selected="selected"'; } diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php index 4a30f2b..a96fb74 100644 --- a/libraries/header_printview.inc.php +++ b/libraries/header_printview.inc.php @@ -43,7 +43,7 @@ if ($text_dir == 'ltr') { <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $available_languages[$lang][1]; ?>" lang="<?php echo $available_languages[$lang][1]; ?>" dir="<?php echo $text_dir; ?>"> <head> -<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" /> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <title><?php echo __('SQL result'); ?> - phpMyAdmin <?php echo PMA_VERSION ?></title> diff --git a/pmd_general.php b/pmd_general.php index 6da6b2e..1307571 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -22,7 +22,7 @@ $hidden = "hidden"; "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns:v="urn:schemas-microsoft-com:vml" xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset ?>" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="icon" href="pmd/images/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="pmd/images/favicon.ico" type="image/x-icon" /> <link rel="stylesheet" type="text/css" href="pmd/styles/<?php echo $GLOBALS['PMD']['STYLE'] ?>/style1.css" /> diff --git a/pmd_help.php b/pmd_help.php index 2f5e006..f653b14 100644 --- a/pmd_help.php +++ b/pmd_help.php @@ -12,11 +12,7 @@ require_once 'pmd_common.php'; ?> <html> <head> -<?php if(0){ ?> -<meta http-equiv="Content-Type" content="text/html; charset=windows-1251" /> -<link rel="stylesheet" type="text/css" href="./libraries/pmd/styles/default/style1.css"> -<?php } ?> -<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset ?>" /> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="stylesheet" type="text/css" href="./libraries/pmd/styles/<?php echo $GLOBALS['PMD']['STYLE'] ?>/style1.css"> <title>Designer</title> </head> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2953-g0841fce
by Michal Čihař 03 Jun '11

03 Jun '11

The branch, master has been updated via 0841fce11adc5e4029eea41c256f403a7bd56f98 (commit) from 3a87a1b4476fd04124b5d4bcc47408b9e6f6a394 (commit) - Log ----------------------------------------------------------------- commit 0841fce11adc5e4029eea41c256f403a7bd56f98 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Jun 3 15:38:02 2011 +0200 Another use of $charset ----------------------------------------------------------------------- Summary of changes: main.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main.php b/main.php index c4c2b2a..c508bd0 100644 --- a/main.php +++ b/main.php @@ -168,8 +168,8 @@ if ($server > 0 && $GLOBALS['cfg']['ShowServerInfo']) { echo ' <li id="li_select_mysql_charset">'; echo ' ' . __('MySQL charset') . ': ' . ' <span xml:lang="en" dir="ltr">' - . ' ' . $mysql_charsets_descriptions[$mysql_charset_map[strtolower($charset)]] . "\n" - . ' (' . $mysql_charset_map[strtolower($charset)] . ')' . "\n" + . ' ' . $mysql_charsets_descriptions[$mysql_charset_map['utf-8']] . "\n" + . ' (' . $mysql_charset_map['utf-8'] . ')' . "\n" . ' </span>' . "\n" . ' </li>' . "\n"; echo ' </ul>'; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_2RC1-4-g15ef125
by Michal Čihař 03 Jun '11

03 Jun '11

The branch, QA_3_4 has been updated via 15ef12542eaf64f63d25846c522477c695c7647f (commit) via b8c45c434a6fecef3c5f065df8e649d86c546123 (commit) from 3f214f9e7d0177f15d97fb6cf8f6ddeeef69e901 (commit) - Log ----------------------------------------------------------------- commit 15ef12542eaf64f63d25846c522477c695c7647f Merge: 3f214f9e7d0177f15d97fb6cf8f6ddeeef69e901 b8c45c434a6fecef3c5f065df8e649d86c546123 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Jun 3 15:14:31 2011 +0200 Merge branch 'MAINT_3_4_2' into QA_3_4 ----------------------------------------------------------------------- Summary of changes: po/af.po | 2 +- po/ar.po | 2 +- po/az.po | 2 +- po/be.po | 2 +- po/be(a)latin.po | 2 +- po/bg.po | 2 +- po/bn.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en_GB.po | 2 +- po/es.po | 2 +- po/et.po | 2 +- po/eu.po | 2 +- po/fa.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/id.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ka.po | 2 +- po/ko.po | 2 +- po/lt.po | 2 +- po/lv.po | 2 +- po/mk.po | 2 +- po/ml.po | 2 +- po/mn.po | 2 +- po/ms.po | 2 +- po/nb.po | 2 +- po/nl.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/si.po | 2 +- po/sk.po | 13 +++++++++---- po/sl.po | 2 +- po/sq.po | 2 +- po/sr.po | 2 +- po/sr(a)latin.po | 2 +- po/sv.po | 2 +- po/ta.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/tt.po | 2 +- po/ug.po | 2 +- po/uk.po | 2 +- po/ur.po | 2 +- po/uz.po | 2 +- po/uz(a)latin.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 4 ++-- 63 files changed, 72 insertions(+), 67 deletions(-) diff --git a/po/af.po b/po/af.po index 09ae816..e28bb58 100644 --- a/po/af.po +++ b/po/af.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-30 23:04+0200\n" diff --git a/po/ar.po b/po/ar.po index b68dfd6..e9bd465 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-21 13:56+0200\n" diff --git a/po/az.po b/po/az.po index 4e27c17..a0aa29e 100644 --- a/po/az.po +++ b/po/az.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" diff --git a/po/be.po b/po/be.po index f4643bb..827547e 100644 --- a/po/be.po +++ b/po/be.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 90b0b6c..71269b4 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-30 23:09+0200\n" diff --git a/po/bg.po b/po/bg.po index 3a4a626..5506756 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-22 12:51+0200\n" diff --git a/po/bn.po b/po/bn.po index 61a29d1..6851ce7 100644 --- a/po/bn.po +++ b/po/bn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-10-21 01:36+0200\n" diff --git a/po/bs.po b/po/bs.po index a57e04b..d0b2bf2 100644 --- a/po/bs.po +++ b/po/bs.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/ca.po b/po/ca.po index 81e1ccc..f9a08e7 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-23 09:57+0200\n" diff --git a/po/cs.po b/po/cs.po index 667f2c4..e3dd226 100644 --- a/po/cs.po +++ b/po/cs.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/cy.po b/po/cy.po index feabb4f..c68480b 100644 --- a/po/cy.po +++ b/po/cy.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-06-07 20:23+0200\n" diff --git a/po/da.po b/po/da.po index 5f805fa..6e44fde 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-07 01:17+0200\n" diff --git a/po/de.po b/po/de.po index 5064229..9b505d2 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-23 04:28+0200\n" diff --git a/po/el.po b/po/el.po index d55d96d..3610fcc 100644 --- a/po/el.po +++ b/po/el.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 11:15+0200\n" diff --git a/po/en_GB.po b/po/en_GB.po index e28622c..a5d899e 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 16:24+0200\n" diff --git a/po/es.po b/po/es.po index a18f7bd..914754c 100644 --- a/po/es.po +++ b/po/es.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-02 11:10+0200\n" diff --git a/po/et.po b/po/et.po index adac59e..14c8e96 100644 --- a/po/et.po +++ b/po/et.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/eu.po b/po/eu.po index 3a61fc6..33546e3 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:53+0200\n" diff --git a/po/fa.po b/po/fa.po index fd8ba5c..7ddf128 100644 --- a/po/fa.po +++ b/po/fa.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-05-19 03:54+0200\n" diff --git a/po/fi.po b/po/fi.po index 9fcc488..a52bb00 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-11-26 21:29+0200\n" diff --git a/po/fr.po b/po/fr.po index 653f984..4825272 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 19:23+0200\n" diff --git a/po/gl.po b/po/gl.po index 6b104b4..dcc97ab 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:50+0200\n" diff --git a/po/he.po b/po/he.po index f842cef..b7f8de9 100644 --- a/po/he.po +++ b/po/he.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-02 20:17+0200\n" diff --git a/po/hi.po b/po/hi.po index 7ca8a1a..6e86b9a 100644 --- a/po/hi.po +++ b/po/hi.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-24 00:23+0200\n" diff --git a/po/hr.po b/po/hr.po index 2b0575a..ba20f43 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:54+0200\n" diff --git a/po/hu.po b/po/hu.po index 78ed360..b55a68a 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-05 12:49+0200\n" diff --git a/po/id.po b/po/id.po index 32c8a74..ed58c6f 100644 --- a/po/id.po +++ b/po/id.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-16 22:04+0200\n" diff --git a/po/it.po b/po/it.po index 96d7317..2af36a1 100644 --- a/po/it.po +++ b/po/it.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 14:27+0200\n" diff --git a/po/ja.po b/po/ja.po index 773ea18..11ac138 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-05 11:38+0200\n" diff --git a/po/ka.po b/po/ka.po index 5dd025e..a7a99dd 100644 --- a/po/ka.po +++ b/po/ka.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/ko.po b/po/ko.po index eb3a115..a430a0a 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-06-16 18:18+0200\n" diff --git a/po/lt.po b/po/lt.po index 367b741..1771e49 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 15:52+0200\n" diff --git a/po/lv.po b/po/lv.po index 4c8fa6d..2c0b05a 100644 --- a/po/lv.po +++ b/po/lv.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" diff --git a/po/mk.po b/po/mk.po index 94ae16c..388d6ca 100644 --- a/po/mk.po +++ b/po/mk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" diff --git a/po/ml.po b/po/ml.po index 720b194..8193aeb 100644 --- a/po/ml.po +++ b/po/ml.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the phpMyAdmin package. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/mn.po b/po/mn.po index f764803..b7a3776 100644 --- a/po/mn.po +++ b/po/mn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" diff --git a/po/ms.po b/po/ms.po index 4855d8d..35218d8 100644 --- a/po/ms.po +++ b/po/ms.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" diff --git a/po/nb.po b/po/nb.po index d6ac9be..0ad295e 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-07 11:21+0200\n" diff --git a/po/nl.po b/po/nl.po index 5f608f0..ed47655 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-16 20:18+0200\n" diff --git a/po/pl.po b/po/pl.po index 20f5289..ac39790 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-24 16:21+0200\n" diff --git a/po/pt.po b/po/pt.po index f85e312..15949fc 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-26 03:23+0200\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index ef38447..6635ca2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-14 17:44+0200\n" diff --git a/po/ro.po b/po/ro.po index 1f6b9b8..dce5a04 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:28+0200\n" diff --git a/po/ru.po b/po/ru.po index 2a52927..94b8017 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-13 21:17+0200\n" diff --git a/po/si.po b/po/si.po index 3987dbd..39305aa 100644 --- a/po/si.po +++ b/po/si.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-04 14:56+0200\n" diff --git a/po/sk.po b/po/sk.po index acd929c..9658b97 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:26+0200\n" @@ -7117,6 +7117,8 @@ msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." msgstr "" +"Vaše nastavenia budú uložené len počas tohto prihlásenia. Pre trvalé " +"nastavenie potrebujete nastaviť %smiesto uloženia phpMyAdmin konfigurácie%s." #: libraries/user_preferences.lib.php:142 #, fuzzy @@ -7577,11 +7579,11 @@ msgstr "Importovať súbory" #: prefs_manage.php:245 msgid "Import from browser's storage" -msgstr "" +msgstr "Načítať z pamäte prehliadača" #: prefs_manage.php:248 msgid "Settings will be imported from your browser's local storage." -msgstr "" +msgstr "Nastavenia budú načítané z lokálneho úložišťa vášho prehliadača." #: prefs_manage.php:254 msgid "You have no saved settings!" @@ -7602,10 +7604,12 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" +"Ďalšie nastavenia môžete urobiť úpravou config.inc.php, napr. použitím " +"%sNastavovacieho skriptu%s." #: prefs_manage.php:302 msgid "Save to browser's storage" -msgstr "" +msgstr "Uložiť do úložiska prehliadača" #: prefs_manage.php:306 msgid "Settings will be saved in your browser's local storage." @@ -7618,6 +7622,7 @@ msgstr "Súčasné nastavenia budú prepísané!" #: prefs_manage.php:323 msgid "You can reset all your settings and restore them to default values." msgstr "" +"Môžete vymazať všetky vaše nastavenia a vrátiť sa k východziím hodnotám." #: querywindow.php:93 msgid "Import files" diff --git a/po/sl.po b/po/sl.po index 0b21869..fec32cf 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-24 22:38+0200\n" diff --git a/po/sq.po b/po/sq.po index 6ae5a04..0b3c6dd 100644 --- a/po/sq.po +++ b/po/sq.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:51+0200\n" diff --git a/po/sr.po b/po/sr.po index a28ddee..e4683dd 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-06 18:43+0200\n" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 0de0bc9..db8630f 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-12-02 14:49+0200\n" diff --git a/po/sv.po b/po/sv.po index 898de4b..ca9e8a6 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-16 21:42+0200\n" diff --git a/po/ta.po b/po/ta.po index 51533ed..e93f1de 100644 --- a/po/ta.po +++ b/po/ta.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-04-16 10:43+0200\n" diff --git a/po/te.po b/po/te.po index 609a869..3f9cc3f 100644 --- a/po/te.po +++ b/po/te.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-07 17:06+0200\n" diff --git a/po/th.po b/po/th.po index c1a9124..b5e2065 100644 --- a/po/th.po +++ b/po/th.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Vere2065 100644o06+0200\n"sourceforge.net\n"dziím hodnotám."30.124]g��;�*pxg�"q� �*�� *��g�`�g��x� �*�� *��*�h�*`�g��;�*pxg�@wg�� *6 ��!�!��g�`�g�x$�*pyg�"q� �*�� *��g��p� �*/�g��}�*�x� �*}�*�}�*�}�*�� *x$�*pyg�@xg�� *�!�!��g�`�g��*Pzg�"q� �*�� *��g��p� �*/�g� �g��g��*�p�`�g��x� �*�� *Pzg� yg�� *GHIJKMNOP��g�`�g�H��*�{g�"q� �*�� *��g�0}�*�x� �*0�*�٬�*}�*�}�*�}�*�� *H��*�{g�0zg�� *8��*�{g�`zg�� *(��*�{g��zg�� *��*�{g��zg�� * �}�*�x� �*�}�*@ug��(��*�w� �*�}�*`{g�y(��*�w� �*}�*�{g�Z(��*�w� �*�Ԭ�*0�*�٬�*}�*�4�*�}�*�}�*�� *��*}g��{g�� *#%')*-.035678:<=��g�`�g�p[w�*0~g�"q� �*8?�*�x� �*�4�*�9�*�� *cf�C�*`�g�p[w�*0~g�}g�� *�%��wq�-��s��,~9��u]�� 4Q��U^Qʉ��u��*ēv�2I�*��g�F@��*F@��*?�F�*`�g��{g��g��C�*�w� �*��*��g�B@��*��g�/�g��*`�g��B@��*h�g�� sion: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" diff --git a/po/tr.po b/po/tr.po index cc21272..999905a 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-17 19:11+0200\n" diff --git a/po/tt.po b/po/tt.po index ce2142a..b8e9dd5 100644 --- a/po/tt.po +++ b/po/tt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:25+0200\n" diff --git a/po/ug.po b/po/ug.po index b2380ce..45c2b0e 100644 --- a/po/ug.po +++ b/po/ug.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-08-26 11:59+0200\n" diff --git a/po/uk.po b/po/uk.po index 87e0e82..f2b06fe 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-12-28 22:26+0200\n" diff --git a/po/ur.po b/po/ur.po index 894cd7e..949b622 100644 --- a/po/ur.po +++ b/po/ur.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-23 08:37+0200\n" diff --git a/po/uz.po b/po/uz.po index 9e99a4c..0d0869a 100644 --- a/po/uz.po +++ b/po/uz.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:31+0200\n" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 272541d..4deafde 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:30+0200\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 5ab9a62..eeeced8 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-04 09:47+0200\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 26b1a81..5001869 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,8 +1,8 @@ msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-02 08:33+0200\n" +"POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-31 09:47+0800\n" "Last-Translator: Finjon Kiang (http://twpug.net)\n" "Language-Team: chinese_traditional <zh_TW(a)li.org>\n" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_2, updated. RELEASE_3_4_2RC1-1-gb8c45c4
by Michal Čihař 03 Jun '11

03 Jun '11

The branch, MAINT_3_4_2 has been updated via b8c45c434a6fecef3c5f065df8e649d86c546123 (commit) from 9ea44da25366e6f787553d4e007ab16fcca9c4d9 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: po/af.po | 2 +- po/ar.po | 2 +- po/az.po | 2 +- po/be.po | 2 +- po/be(a)latin.po | 2 +- po/bg.po | 2 +- po/bn.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en_GB.po | 2 +- po/es.po | 2 +- po/et.po | 2 +- po/eu.po | 2 +- po/fa.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/id.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ka.po | 2 +- po/ko.po | 2 +- po/lt.po | 2 +- po/lv.po | 2 +- po/mk.po | 2 +- po/ml.po | 2 +- po/mn.po | 2 +- po/ms.po | 2 +- po/nb.po | 2 +- po/nl.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/si.po | 2 +- po/sk.po | 13 +++++++++---- po/sl.po | 2 +- po/sq.po | 2 +- po/sr.po | 2 +- po/sr(a)latin.po | 2 +- po/sv.po | 2 +- po/ta.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/tt.po | 2 +- po/ug.po | 2 +- po/uk.po | 2 +- po/ur.po | 2 +- po/uz.po | 2 +- po/uz(a)latin.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 4 ++-- 63 files changed, 72 insertions(+), 67 deletions(-) diff --git a/po/af.po b/po/af.po index 09ae816..e28bb58 100644 --- a/po/af.po +++ b/po/af.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-30 23:04+0200\n" diff --git a/po/ar.po b/po/ar.po index b68dfd6..e9bd465 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-21 13:56+0200\n" diff --git a/po/az.po b/po/az.po index 4e27c17..a0aa29e 100644 --- a/po/az.po +++ b/po/az.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:11+0100\n" diff --git a/po/be.po b/po/be.po index f4643bb..827547e 100644 --- a/po/be.po +++ b/po/be.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/be(a)latin.po b/po/be(a)latin.po index 90b0b6c..71269b4 100644 --- a/po/be(a)latin.po +++ b/po/be(a)latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-30 23:09+0200\n" diff --git a/po/bg.po b/po/bg.po index 3a4a626..5506756 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-22 12:51+0200\n" diff --git a/po/bn.po b/po/bn.po index 61a29d1..6851ce7 100644 --- a/po/bn.po +++ b/po/bn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-10-21 01:36+0200\n" diff --git a/po/bs.po b/po/bs.po index a57e04b..d0b2bf2 100644 --- a/po/bs.po +++ b/po/bs.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:12+0100\n" diff --git a/po/ca.po b/po/ca.po index 81e1ccc..f9a08e7 100644 --- a/po/ca.po +++ b/po/ca.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-23 09:57+0200\n" diff --git a/po/cs.po b/po/cs.po index 667f2c4..e3dd226 100644 --- a/po/cs.po +++ b/po/cs.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/cy.po b/po/cy.po index feabb4f..c68480b 100644 --- a/po/cy.po +++ b/po/cy.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-06-07 20:23+0200\n" diff --git a/po/da.po b/po/da.po index 5f805fa..6e44fde 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-07 01:17+0200\n" diff --git a/po/de.po b/po/de.po index 5064229..9b505d2 100644 --- a/po/de.po +++ b/po/de.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-23 04:28+0200\n" diff --git a/po/el.po b/po/el.po index d55d96d..3610fcc 100644 --- a/po/el.po +++ b/po/el.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 11:15+0200\n" diff --git a/po/en_GB.po b/po/en_GB.po index e28622c..a5d899e 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 16:24+0200\n" diff --git a/po/es.po b/po/es.po index a18f7bd..914754c 100644 --- a/po/es.po +++ b/po/es.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-02 11:10+0200\n" diff --git a/po/et.po b/po/et.po index adac59e..14c8e96 100644 --- a/po/et.po +++ b/po/et.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/eu.po b/po/eu.po index 3a61fc6..33546e3 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:53+0200\n" diff --git a/po/fa.po b/po/fa.po index fd8ba5c..7ddf128 100644 --- a/po/fa.po +++ b/po/fa.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-05-19 03:54+0200\n" diff --git a/po/fi.po b/po/fi.po index 9fcc488..a52bb00 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-11-26 21:29+0200\n" diff --git a/po/fr.po b/po/fr.po index 653f984..4825272 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 19:23+0200\n" diff --git a/po/gl.po b/po/gl.po index 6b104b4..dcc97ab 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:50+0200\n" diff --git a/po/he.po b/po/he.po index f842cef..b7f8de9 100644 --- a/po/he.po +++ b/po/he.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-02 20:17+0200\n" diff --git a/po/hi.po b/po/hi.po index 7ca8a1a..6e86b9a 100644 --- a/po/hi.po +++ b/po/hi.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-24 00:23+0200\n" diff --git a/po/hr.po b/po/hr.po index 2b0575a..ba20f43 100644 --- a/po/hr.po +++ b/po/hr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:54+0200\n" diff --git a/po/hu.po b/po/hu.po index 78ed360..b55a68a 100644 --- a/po/hu.po +++ b/po/hu.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-05 12:49+0200\n" diff --git a/po/id.po b/po/id.po index 32c8a74..ed58c6f 100644 --- a/po/id.po +++ b/po/id.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-16 22:04+0200\n" diff --git a/po/it.po b/po/it.po index 96d7317..2af36a1 100644 --- a/po/it.po +++ b/po/it.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 14:27+0200\n" diff --git a/po/ja.po b/po/ja.po index 773ea18..11ac138 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-05 11:38+0200\n" diff --git a/po/ka.po b/po/ka.po index 5dd025e..a7a99dd 100644 --- a/po/ka.po +++ b/po/ka.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:14+0100\n" diff --git a/po/ko.po b/po/ko.po index eb3a115..a430a0a 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-06-16 18:18+0200\n" diff --git a/po/lt.po b/po/lt.po index 367b741..1771e49 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-05 15:52+0200\n" diff --git a/po/lv.po b/po/lv.po index 4c8fa6d..2c0b05a 100644 --- a/po/lv.po +++ b/po/lv.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" diff --git a/po/mk.po b/po/mk.po index 94ae16c..388d6ca 100644 --- a/po/mk.po +++ b/po/mk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:16+0100\n" diff --git a/po/ml.po b/po/ml.po index 720b194..8193aeb 100644 --- a/po/ml.po +++ b/po/ml.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the phpMyAdmin package. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-10 14:03+0100\n" diff --git a/po/mn.po b/po/mn.po index f764803..b7a3776 100644 --- a/po/mn.po +++ b/po/mn.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" diff --git a/po/ms.po b/po/ms.po index 4855d8d..35218d8 100644 --- a/po/ms.po +++ b/po/ms.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:17+0100\n" diff --git a/po/nb.po b/po/nb.po index d6ac9be..0ad295e 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-07 11:21+0200\n" diff --git a/po/nl.po b/po/nl.po index 5f608f0..ed47655 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-16 20:18+0200\n" diff --git a/po/pl.po b/po/pl.po index 20f5289..ac39790 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-24 16:21+0200\n" diff --git a/po/pt.po b/po/pt.po index f85e312..15949fc 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-26 03:23+0200\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index ef38447..6635ca2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-14 17:44+0200\n" diff --git a/po/ro.po b/po/ro.po index 1f6b9b8..dce5a04 100644 --- a/po/ro.po +++ b/po/ro.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:28+0200\n" diff --git a/po/ru.po b/po/ru.po index 2a52927..94b8017 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-13 21:17+0200\n" diff --git a/po/si.po b/po/si.po index 3987dbd..39305aa 100644 --- a/po/si.po +++ b/po/si.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-04 14:56+0200\n" diff --git a/po/sk.po b/po/sk.po index acd929c..9658b97 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:26+0200\n" @@ -7117,6 +7117,8 @@ msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." msgstr "" +"Vaše nastavenia budú uložené len počas tohto prihlásenia. Pre trvalé " +"nastavenie potrebujete nastaviť %smiesto uloženia phpMyAdmin konfigurácie%s." #: libraries/user_preferences.lib.php:142 #, fuzzy @@ -7577,11 +7579,11 @@ msgstr "Importovať súbory" #: prefs_manage.php:245 msgid "Import from browser's storage" -msgstr "" +msgstr "Načítať z pamäte prehliadača" #: prefs_manage.php:248 msgid "Settings will be imported from your browser's local storage." -msgstr "" +msgstr "Nastavenia budú načítané z lokálneho úložišťa vášho prehliadača." #: prefs_manage.php:254 msgid "You have no saved settings!" @@ -7602,10 +7604,12 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" +"Ďalšie nastavenia môžete urobiť úpravou config.inc.php, napr. použitím " +"%sNastavovacieho skriptu%s." #: prefs_manage.php:302 msgid "Save to browser's storage" -msgstr "" +msgstr "Uložiť do úložiska prehliadača" #: prefs_manage.php:306 msgid "Settings will be saved in your browser's local storage." @@ -7618,6 +7622,7 @@ msgstr "Súčasné nastavenia budú prepísané!" #: prefs_manage.php:323 msgid "You can reset all your settings and restore them to default values." msgstr "" +"Môžete vymazať všetky vaše nastavenia a vrátiť sa k východziím hodnotám." #: querywindow.php:93 msgid "Import files" diff --git a/po/sl.po b/po/sl.po index 0b21869..fec32cf 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-24 22:38+0200\n" diff --git a/po/sq.po b/po/sq.po index 6ae5a04..0b3c6dd 100644 --- a/po/sq.po +++ b/po/sq.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-21 14:51+0200\n" diff --git a/po/sr.po b/po/sr.po index a28ddee..e4683dd 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-06 18:43+0200\n" diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 0de0bc9..db8630f 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-12-02 14:49+0200\n" diff --git a/po/sv.po b/po/sv.po index 898de4b..ca9e8a6 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-02-16 21:42+0200\n" diff --git a/po/ta.po b/po/ta.po index 51533ed..e93f1de 100644 --- a/po/ta.po +++ b/po/ta.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-04-16 10:43+0200\n" diff --git a/po/te.po b/po/te.po index 609a869..3f9cc3f 100644 --- a/po/te.po +++ b/po/te.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-07 17:06+0200\n" diff --git a/po/th.po b/po/th.po index c1a9124..b5e2065 100644 --- a/po/th.po +++ b/po/th.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-03-12 09:19+0100\n" diff --git a/po/tr.po b/po/tr.po index cc21272..999905a 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-17 19:11+0200\n" diff --git a/po/tt.po b/po/tt.po index ce2142a..b8e9dd5 100644 --- a/po/tt.po +++ b/po/tt.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:25+0200\n" diff --git a/po/ug.po b/po/ug.po index b2380ce..45c2b0e 100644 --- a/po/ug.po +++ b/po/ug.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-08-26 11:59+0200\n" diff --git a/po/uk.po b/po/uk.po index 87e0e82..f2b06fe 100644 --- a/po/uk.po +++ b/po/uk.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-12-28 22:26+0200\n" diff --git a/po/ur.po b/po/ur.po index 894cd7e..949b622 100644 --- a/po/ur.po +++ b/po/ur.po @@ -4,7 +4,7 @@ # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-23 08:37+0200\n" diff --git a/po/uz.po b/po/uz.po index 9e99a4c..0d0869a 100644 --- a/po/uz.po +++ b/po/uz.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:31+0200\n" diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po index 272541d..4deafde 100644 --- a/po/uz(a)latin.po +++ b/po/uz(a)latin.po @@ -1,7 +1,7 @@ # Automatically generated <>, 2010. msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2010-07-22 02:30+0200\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 5ab9a62..eeeced8 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-04 09:47+0200\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 26b1a81..5001869 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,8 +1,8 @@ msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.2-dev\n" +"Project-Id-Version: phpMyAdmin 3.4.2-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" -"POT-Creation-Date: 2011-06-02 08:33+0200\n" +"POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-05-31 09:47+0800\n" "Last-Translator: Finjon Kiang (http://twpug.net)\n" "Language-Team: chinese_traditional <zh_TW(a)li.org>\n" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2952-g3a87a1b
by Michal Čihař 03 Jun '11

03 Jun '11

The branch, master has been updated via 3a87a1b4476fd04124b5d4bcc47408b9e6f6a394 (commit) via c52e109f5ddc3be8ad02ea75130551ffd20ea707 (commit) via d8c8ca94461fa3c552beb5551501701ebc092eea (commit) via 83654851050c1ad75ea7e2e96678b3dceb890136 (commit) via 1f65a057fa170cedefeab7b010c1013ad3363ec7 (commit) via 4398f59495a97d8af0a3050fa1de9c14a40d6e0d (commit) via c1c8f494909083dc7e2c9153b0663487c0ab45e9 (commit) via 8f30ff201398fd1231c09004883398352b7c5687 (commit) via 76fbe5ce5431d798311cfa529abeb6ece5427106 (commit) via 2b52b310997c656648d3112ae7e8f18485e861e4 (commit) via 5506eb1dc61018669f71b7b0cda382afa8fc0165 (commit) from bbbf2c49ed922c73f24b8e9c9c01c0721893cd07 (commit) - Log ----------------------------------------------------------------- commit 3a87a1b4476fd04124b5d4bcc47408b9e6f6a394 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Jun 3 15:13:29 2011 +0200 Fix format string commit c52e109f5ddc3be8ad02ea75130551ffd20ea707 Author: Martin Lacina <martin(a)whistler.sk> Date: Fri Jun 3 14:53:21 2011 +0200 Translation update done using Pootle. commit d8c8ca94461fa3c552beb5551501701ebc092eea Author: Martin Lacina <martin(a)whistler.sk> Date: Fri Jun 3 14:51:09 2011 +0200 Translation update done using Pootle. commit 83654851050c1ad75ea7e2e96678b3dceb890136 Author: Martin Lacina <martin(a)whistler.sk> Date: Fri Jun 3 14:48:45 2011 +0200 Translation update done using Pootle. commit 1f65a057fa170cedefeab7b010c1013ad3363ec7 Author: Martin Lacina <martin(a)whistler.sk> Date: Fri Jun 3 14:47:15 2011 +0200 Translation update done using Pootle. commit 4398f59495a97d8af0a3050fa1de9c14a40d6e0d Author: Martin Lacina <martin(a)whistler.sk> Date: Fri Jun 3 14:46:45 2011 +0200 Translation update done using Pootle. commit c1c8f494909083dc7e2c9153b0663487c0ab45e9 Author: Martin Lacina <martin(a)whistler.sk> Date: Fri Jun 3 14:45:55 2011 +0200 Translation update done using Pootle. commit 8f30ff201398fd1231c09004883398352b7c5687 Author: Martin Lacina <martin(a)whistler.sk> Date: Fri Jun 3 14:45:22 2011 +0200 Translation update done using Pootle. commit 76fbe5ce5431d798311cfa529abeb6ece5427106 Author: Martin Lacina <martin(a)whistler.sk> Date: Fri Jun 3 14:44:57 2011 +0200 Translation update done using Pootle. commit 2b52b310997c656648d3112ae7e8f18485e861e4 Author: Martin Lacina <martin(a)whistler.sk> Date: Fri Jun 3 14:44:03 2011 +0200 Translation update done using Pootle. commit 5506eb1dc61018669f71b7b0cda382afa8fc0165 Author: Martin Lacina <martin(a)whistler.sk> Date: Fri Jun 3 14:43:04 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sk.po | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/po/sk.po b/po/sk.po index 8c35a0b..867e910 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 11:25-0400\n" -"PO-Revision-Date: 2011-05-30 13:03+0200\n" +"PO-Revision-Date: 2011-06-03 14:53+0200\n" "Last-Translator: Martin Lacina <martin(a)whistler.sk>\n" "Language-Team: slovak <sk(a)li.org>\n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.0.5\n" @@ -6543,7 +6543,7 @@ msgstr "Iba prezrieť" #: libraries/sql_query_form.lib.php:491 prefs_manage.php:241 msgid "Location of the text file" -msgstr "Lokácia textového súboru" +msgstr "Umiestnenie textového súboru" #: libraries/sql_query_form.lib.php:503 tbl_change.php:965 msgid "web server upload directory" @@ -6879,6 +6879,8 @@ msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." msgstr "" +"Vaše nastavenia budú uložené len počas tohto prihlásenia. Pre trvalé " +"nastavenie potrebujete nastaviť %smiesto uloženia phpMyAdmin konfigurácie%s." #: libraries/user_preferences.lib.php:142 #, fuzzy @@ -6914,7 +6916,7 @@ msgstr "Nastavenia vzhľadu" #: main.php:146 prefs_manage.php:274 msgid "More settings" -msgstr "Viac nastavení" +msgstr "Ďalšie nastavenia" #: main.php:163 msgid "Protocol version" @@ -7296,24 +7298,23 @@ msgstr "Importovať zo súboru" #: prefs_manage.php:245 msgid "Import from browser's storage" -msgstr "" +msgstr "Načítať z pamäte prehliadača" #: prefs_manage.php:248 msgid "Settings will be imported from your browser's local storage." -msgstr "" +msgstr "Nastavenia budú načítané z lokálneho úložišťa vášho prehliadača." #: prefs_manage.php:254 msgid "You have no saved settings!" -msgstr "Nemáte žiadne uložené nastavenia!" +msgstr "Nemáte uložené žiadne nastavenia!" #: prefs_manage.php:258 prefs_manage.php:312 msgid "This feature is not supported by your web browser" msgstr "" #: prefs_manage.php:263 -#, fuzzy msgid "Merge with current configuration" -msgstr "Master replikácia" +msgstr "Zlúčiť so súčasným nastavením" #: prefs_manage.php:277 #, php-format @@ -7321,10 +7322,12 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" +"Ďalšie nastavenia môžete urobiť úpravou config.inc.php, napr. použitím %" +"sNastavovacieho skriptu%s." #: prefs_manage.php:302 msgid "Save to browser's storage" -msgstr "" +msgstr "Uložiť do úložiska prehliadača" #: prefs_manage.php:306 msgid "Settings will be saved in your browser's local storage." @@ -7337,6 +7340,7 @@ msgstr "Súčasné nastavenia budú prepísané!" #: prefs_manage.php:323 msgid "You can reset all your settings and restore them to default values." msgstr "" +"Môžete vymazať všetky vaše nastavenia a vrátiť sa k východziím hodnotám." #: querywindow.php:93 msgid "Import files" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2941-gbbbf2c4
by Michal Čihař 03 Jun '11

03 Jun '11

The branch, master has been updated via bbbf2c49ed922c73f24b8e9c9c01c0721893cd07 (commit) from 4841ee9d5f9926187b0eb8b23e6dd87af2daeab4 (commit) - Log ----------------------------------------------------------------- commit bbbf2c49ed922c73f24b8e9c9c01c0721893cd07 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Jun 3 14:02:02 2011 +0200 Drop $GLOBALS['charset']. It was anyway always set to utf-8 so it does not make sense to keep it as a variable. ----------------------------------------------------------------------- Summary of changes: export.php | 6 +- index.php | 4 +- libraries/File.class.php | 8 +- libraries/auth/config.auth.lib.php | 2 +- libraries/auth/cookie.auth.lib.php | 3 +- libraries/auth/http.auth.lib.php | 2 +- libraries/database_interface.lib.php | 12 +- libraries/export/htmlword.php | 4 +- libraries/export/ods.php | 2 +- libraries/export/odt.php | 4 +- libraries/export/sql.php | 6 +- libraries/export/xml.php | 84 +++++----- libraries/header_http.inc.php | 2 +- libraries/header_meta_style.inc.php | 4 +- libraries/import.lib.php | 176 ++++++++++---------- libraries/schema/Export_Relation_Schema.class.php | 10 +- libraries/select_lang.lib.php | 3 - libraries/sql_query_form.lib.php | 1 - libraries/string.lib.php | 2 +- navigation.php | 6 +- pmd_relation_new.php | 2 +- test/PMA_SQL_parser_test.php | 1 - test/PMA_STR_sub_test.php | 2 - test/theme.php | 5 +- 24 files changed, 164 insertions(+), 187 deletions(-) diff --git a/export.php b/export.php index 22a6324..1a60151 100644 --- a/export.php +++ b/export.php @@ -147,7 +147,7 @@ function PMA_exportOutputHandler($line) if ($dump_buffer_len > $GLOBALS['memory_limit']) { if ($GLOBALS['output_charset_conversion']) { - $dump_buffer = PMA_convert_string($GLOBALS['charset'], $GLOBALS['charset_of_file'], $dump_buffer); + $dump_buffer = PMA_convert_string('utf-8', $GLOBALS['charset_of_file'], $dump_buffer); } // as bzipped if ($GLOBALS['compression'] == 'bzip' && @function_exists('bzcompress')) { @@ -181,7 +181,7 @@ function PMA_exportOutputHandler($line) } else { if ($GLOBALS['asfile']) { if ($GLOBALS['output_charset_conversion']) { - $line = PMA_convert_string($GLOBALS['charset'], $GLOBALS['charset_of_file'], $line); + $line = PMA_convert_string('utf-8', $GLOBALS['charset_of_file'], $line); } if ($GLOBALS['save_on_server'] && strlen($line) > 0) { $write_result = @fwrite($GLOBALS['file_handle'], $line); @@ -637,7 +637,7 @@ if ($save_on_server && isset($message)) { if (!empty($asfile)) { // Convert the charset if required. if ($output_charset_conversion) { - $dump_buffer = PMA_convert_string($GLOBALS['charset'], $GLOBALS['charset_of_file'], $dump_buffer); + $dump_buffer = PMA_convert_string('utf-8', $GLOBALS['charset_of_file'], $dump_buffer); } // Do the compression diff --git a/index.php b/index.php index 66f6bf5..36a6118 100644 --- a/index.php +++ b/index.php @@ -12,7 +12,6 @@ * or common.inc.php * @uses $GLOBALS['available_languages'] from common.inc.php (select_lang.lib.php) * @uses $GLOBALS['db'] - * @uses $GLOBALS['charset'] * @uses $GLOBALS['lang'] * @uses $GLOBALS['text_dir'] * @uses $_ENV['HTTP_HOST'] @@ -102,8 +101,7 @@ include ('./libraries/header_http.inc.php'); <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <title>phpMyAdmin <?php echo PMA_VERSION; ?> - <?php echo htmlspecialchars($HTTP_HOST); ?></title> -<meta http-equiv="Content-Type" - content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" /> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="robots" content="noindex,nofollow" /> <script type="text/javascript"> // <![CDATA[ diff --git a/libraries/File.class.php b/libraries/File.class.php index 4fd3342..109c188 100644 --- a/libraries/File.class.php +++ b/libraries/File.class.php @@ -259,7 +259,7 @@ class PMA_File * @uses curl_setopt_array() * @uses PMA_File::$_error_message * @uses $_FILES - * @param string $key the md5 hash of the column name + * @param string $key the md5 hash of the column name * @param string $rownumber * @return boolean success */ @@ -378,7 +378,7 @@ class PMA_File * @uses $_REQUEST * @uses PMA_File::setLocalSelectedFile() * @uses is_string() - * @param string $key the md5 hash of the column name + * @param string $key the md5 hash of the column name * @param string $rownumber * @return boolean success */ @@ -462,7 +462,7 @@ class PMA_File * @access public * @uses PMA_File::setUploadedFromTblChangeRequest() * @uses PMA_File::setSelectedFromTblChangeRequest() - * @param string $key the md5 hash of the column name + * @param string $key the md5 hash of the column name * @param string $rownumber * @return boolean success */ @@ -820,7 +820,7 @@ class PMA_File echo '<hr />'; if ($GLOBALS['charset_conversion']) { - $result = PMA_convert_string($this->getCharset(), $GLOBALS['charset'], $result); + $result = PMA_convert_string($this->getCharset(), 'utf-8', $result); } else { /** * Skip possible byte order marks (I do not think we need more diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php index 3a9f82b..dfa2f2c 100644 --- a/libraries/auth/config.auth.lib.php +++ b/libraries/auth/config.auth.lib.php @@ -78,7 +78,7 @@ function PMA_auth_fails() } // Defines the charset to be used - header('Content-Type: text/html; charset=' . $GLOBALS['charset']); + header('Content-Type: text/html; charset=utf-8'); /* HTML header */ $page_title = __('Access denied'); require './libraries/header_meta_style.inc.php'; diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index c04d5a2..23b6ff0 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -110,7 +110,6 @@ function PMA_get_blowfish_secret() { * @uses $GLOBALS['pma_auth_server'] * @uses $GLOBALS['text_dir'] * @uses $GLOBALS['pmaThemeImage'] - * @uses $GLOBALS['charset'] * @uses $GLOBALS['target'] * @uses $GLOBALS['db'] * @uses $GLOBALS['table'] @@ -162,7 +161,7 @@ function PMA_auth() $cell_align = ($GLOBALS['text_dir'] == 'ltr') ? 'left' : 'right'; // Defines the charset to be used - header('Content-Type: text/html; charset=' . $GLOBALS['charset']); + header('Content-Type: text/html; charset=utf-8'); // Defines the "item" image depending on text direction $item_img = $GLOBALS['pmaThemeImage'] . 'item_' . $GLOBALS['text_dir'] . '.png'; diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php index b3d305a..f4157b6 100644 --- a/libraries/auth/http.auth.lib.php +++ b/libraries/auth/http.auth.lib.php @@ -46,7 +46,7 @@ function PMA_auth() } // Defines the charset to be used - header('Content-Type: text/html; charset=' . $GLOBALS['charset']); + header('Content-Type: text/html; charset=utf-8'); /* HTML header */ $page_title = __('Access denied'); require './libraries/header_meta_style.inc.php'; diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 9735a82..91a2283 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -82,7 +82,6 @@ function PMA_DBI_query($query, $link = null, $options = 0, $cache_affected_rows * and charset names to ISO charset from information_schema.CHARACTER_SETS * * @uses $GLOBALS['cfg']['IconvExtraParams'] - * @uses $GLOBALS['charset'] as target charset * @uses PMA_DBI_fetch_value() to get server_language * @uses preg_match() to filter server_language * @uses in_array() @@ -135,20 +134,20 @@ function PMA_DBI_convert_message($message) { if ((@stristr(PHP_OS, 'AIX')) && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) { require_once './libraries/iconv_wrapper.lib.php'; $message = PMA_aix_iconv_wrapper($encodings[$server_language], - $GLOBALS['charset'] . $GLOBALS['cfg']['IconvExtraParams'], $message); + 'utf-8' . $GLOBALS['cfg']['IconvExtraParams'], $message); } else { $message = iconv($encodings[$server_language], - $GLOBALS['charset'] . $GLOBALS['cfg']['IconvExtraParams'], $message); + 'utf-8' . $GLOBALS['cfg']['IconvExtraParams'], $message); } } elseif (function_exists('recode_string')) { - $message = recode_string($encodings[$server_language] . '..' . $GLOBALS['charset'], + $message = recode_string($encodings[$server_language] . '..' . 'utf-8', $message); } elseif (function_exists('libiconv')) { - $message = libiconv($encodings[$server_language], $GLOBALS['charset'], $message); + $message = libiconv($encodings[$server_language], 'utf-8', $message); } elseif (function_exists('mb_convert_encoding')) { // do not try unsupported charsets if (! in_array($server_language, array('ukrainian', 'greek', 'serbian'))) { - $message = mb_convert_encoding($message, $GLOBALS['charset'], + $message = mb_convert_encoding($message, 'utf-8', $encodings[$server_language]); } } @@ -919,7 +918,6 @@ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null * @uses $GLOBALS['collation_connection'] * @uses $GLOBALS['available_languages'] * @uses $GLOBALS['mysql_charset_map'] - * @uses $GLOBALS['charset'] * @uses $GLOBALS['lang'] * @uses $GLOBALS['cfg']['Lang'] * @uses defined() diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index d23640a..b88cb8f 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -63,7 +63,7 @@ function PMA_exportFooter() { * @access public */ function PMA_exportHeader() { - global $charset, $charset_of_file; + global $charset_of_file; return PMA_exportOutputHandler('<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40"> @@ -71,7 +71,7 @@ xmlns="http://www.w3.org/TR/REC-html40"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html> <head> - <meta http-equiv="Content-type" content="text/html;charset=' . (isset($charset_of_file) ? $charset_of_file : $charset) . '" /> + <meta http-equiv="Content-type" content="text/html;charset=' . (isset($charset_of_file) ? $charset_of_file : 'utf-8') . '" /> </head> <body>'); } diff --git a/libraries/export/ods.php b/libraries/export/ods.php index 28a5dfd..0533741 100644 --- a/libraries/export/ods.php +++ b/libraries/export/ods.php @@ -68,7 +68,7 @@ function PMA_exportFooter() { * @access public */ function PMA_exportHeader() { - $GLOBALS['ods_buffer'] .= '<?xml version="1.0" encoding="' . $GLOBALS['charset'] . '"?' . '>' + $GLOBALS['ods_buffer'] .= '<?xml version="1.0" encoding="utf-8"?' . '>' . '<office:document-content '. $GLOBALS['OpenDocumentNS'] . 'office:version="1.0">' . '<office:automatic-styles>' . '<number:date-style style:name="N37" number:automatic-order="true">' diff --git a/libraries/export/odt.php b/libraries/export/odt.php index d1324f0..7af6013 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -100,7 +100,7 @@ function PMA_exportFooter() { * @access public */ function PMA_exportHeader() { - $GLOBALS['odt_buffer'] .= '<?xml version="1.0" encoding="' . $GLOBALS['charset'] . '"?' . '>' + $GLOBALS['odt_buffer'] .= '<?xml version="1.0" encoding="utf-8"?' . '>' . '<office:document-content '. $GLOBALS['OpenDocumentNS'] . 'office:version="1.0">' . '<office:body>' . '<office:text>'; @@ -236,7 +236,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { * * @access public */ - // @@@ Table structure + // @@@ Table structure function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $dummy) { global $cfgRelation; diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 19f9873..3ed1c57 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -183,9 +183,9 @@ if (! isset($sql_backquotes)) { } /** - * Exports routines (procedures and functions) + * Exports routines (procedures and functions) * - * @param string $db + * @param string $db * * @return bool Whether it suceeded */ @@ -389,7 +389,7 @@ function PMA_exportHeader() $set_names = $mysql_charset_map[$GLOBALS['charset_of_file']]; } else { // by default we use the connection charset - $set_names = $mysql_charset_map[$GLOBALS['charset']]; + $set_names = $mysql_charset_map['utf-8']; } $head .= $crlf . '/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;' . $crlf diff --git a/libraries/export/xml.php b/libraries/export/xml.php index 9bafb09..55b272d 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -3,7 +3,7 @@ /** * Set of functions used to build XML dumps of tables * - * @todo + * @todo * @package phpMyAdmin-Export-XML */ if (! defined('PHPMYADMIN')) { @@ -24,7 +24,7 @@ if (isset($plugin_list)) { ), 'options_text' => __('Options') ); - + /* Export structure */ $plugin_list['xml']['options'][] = array('type' => 'begin_group', 'name' => 'structure', 'text' => __('Object creation options (all are recommended)')); @@ -39,7 +39,7 @@ if (isset($plugin_list)) { $plugin_list['xml']['options'][] = array('type' => 'bool', 'name' => 'export_views', 'text' => __('Views')); $plugin_list['xml']['options'][] = array('type' => 'end_group'); - + /* Data */ $plugin_list['xml']['options'][] = array('type' => 'begin_group', 'name' => 'data', 'text' => __('Data dump options')); @@ -68,7 +68,7 @@ function PMA_exportComment($text) { */ function PMA_exportFooter() { $foot = '</pma_xml_export>'; - + return PMA_exportOutputHandler($foot); } @@ -86,14 +86,14 @@ function PMA_exportHeader() { global $db; global $table; global $tables; - + $export_struct = isset($GLOBALS[$what . '_export_struc']) ? true : false; $export_data = isset($GLOBALS[$what . '_export_contents']) ? true : false; if ($GLOBALS['output_charset_conversion']) { $charset = $GLOBALS['charset_of_file']; } else { - $charset = $GLOBALS['charset']; + $charset = 'utf-8'; } $head = '<?xml version="1.0" encoding="' . $charset . '"?>' . $crlf @@ -111,53 +111,53 @@ function PMA_exportHeader() { . '- ' . __('Server version') . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3) . $crlf . '- ' . __('PHP Version') . ': ' . phpversion() . $crlf . '-->' . $crlf . $crlf; - + $head .= '<pma_xml_export version="1.0"' . (($export_struct) ? ' xmlns:pma="http://www.phpmyadmin.net/some_doc_url/"' : '') . '>' . $crlf; - + if ($export_struct) { $result = PMA_DBI_fetch_result('SELECT `DEFAULT_CHARACTER_SET_NAME`, `DEFAULT_COLLATION_NAME` FROM `information_schema`.`SCHEMATA` WHERE `SCHEMA_NAME` = \''.$db.'\' LIMIT 1'); $db_collation = $result[0]['DEFAULT_COLLATION_NAME']; $db_charset = $result[0]['DEFAULT_CHARACTER_SET_NAME']; - + $head .= ' ' . $crlf; $head .= ' <pma:structure_schemas>' . $crlf; $head .= ' <pma:database name="' . $db . '" collation="' . $db_collation . '" charset="' . $db_charset . '">' . $crlf; - + if (count($tables) == 0) { $tables[] = $table; } - + foreach ($tables as $table) { // Export tables and views $result = PMA_DBI_fetch_result('SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table), 0); $tbl = $result[$table][1]; - + $is_view = PMA_isView($db, $table); - + if ($is_view) { $type = 'view'; } else { $type = 'table'; } - + if ($is_view && ! isset($GLOBALS[$what . '_export_views'])) { continue; } - + if (! $is_view && ! isset($GLOBALS[$what . '_export_tables'])) { continue; } - + $head .= ' <pma:' . $type . ' name="' . $table . '">' . $crlf; - + $tbl = " " . $tbl; $tbl = str_replace("\n", "\n ", $tbl); - + $head .= $tbl . ';' . $crlf; $head .= ' </pma:' . $type . '>' . $crlf; - + if (isset($GLOBALS[$what . '_export_triggers']) && $GLOBALS[$what . '_export_triggers']) { // Export triggers $triggers = PMA_DBI_get_triggers($db, $table); @@ -165,78 +165,78 @@ function PMA_exportHeader() { foreach ($triggers as $trigger) { $code = $trigger['create']; $head .= ' <pma:trigger name="' . $trigger['name'] . '">' . $crlf; - + // Do some formatting $code = substr(rtrim($code), 0, -3); $code = " " . $code; $code = str_replace("\n", "\n ", $code); - + $head .= $code . $crlf; $head .= ' </pma:trigger>' . $crlf; } - + unset($trigger); unset($triggers); } } } - + if (isset($GLOBALS[$what . '_export_functions']) && $GLOBALS[$what . '_export_functions']) { // Export functions $functions = PMA_DBI_get_procedures_or_functions($db, 'FUNCTION'); if ($functions) { foreach ($functions as $function) { $head .= ' <pma:function name="' . $function . '">' . $crlf; - + // Do some formatting $sql = PMA_DBI_get_definition($db, 'FUNCTION', $function); $sql = rtrim($sql); $sql = " " . $sql; $sql = str_replace("\n", "\n ", $sql); - + $head .= $sql . $crlf; $head .= ' </pma:function>' . $crlf; } - + unset($create_func); unset($function); unset($functions); } } - + if (isset($GLOBALS[$what . '_export_procedures']) && $GLOBALS[$what . '_export_procedures']) { // Export procedures $procedures = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE'); if ($procedures) { foreach ($procedures as $procedure) { $head .= ' <pma:procedure name="' . $procedure . '">' . $crlf; - + // Do some formatting $sql = PMA_DBI_get_definition($db, 'PROCEDURE', $procedure); $sql = rtrim($sql); $sql = " " . $sql; $sql = str_replace("\n", "\n ", $sql); - + $head .= $sql . $crlf; $head .= ' </pma:procedure>' . $crlf; } - + unset($create_proc); unset($procedure); unset($procedures); } } - + unset($result); - + $head .= ' </pma:database>' . $crlf; $head .= ' </pma:structure_schemas>' . $crlf; - + if ($export_data) { $head .= $crlf; } } - + return PMA_exportOutputHandler($head); } @@ -252,13 +252,13 @@ function PMA_exportHeader() { function PMA_exportDBHeader($db) { global $crlf; global $what; - + if (isset($GLOBALS[$what . '_export_contents']) && $GLOBALS[$what . '_export_contents']) { $head = ' ' . $crlf . ' <database name="' . $db . '">' . $crlf; - + return PMA_exportOutputHandler($head); } else @@ -279,7 +279,7 @@ function PMA_exportDBHeader($db) { function PMA_exportDBFooter($db) { global $crlf; global $what; - + if (isset($GLOBALS[$what . '_export_contents']) && $GLOBALS[$what . '_export_contents']) { return PMA_exportOutputHandler(' </database>' . $crlf); } @@ -318,21 +318,21 @@ function PMA_exportDBCreate($db) { */ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { global $what; - + if (isset($GLOBALS[$what . '_export_contents']) && $GLOBALS[$what . '_export_contents']) { $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED); - + $columns_cnt = PMA_DBI_num_fields($result); for ($i = 0; $i < $columns_cnt; $i++) { $columns[$i] = stripslashes(str_replace(' ', '_', PMA_DBI_field_name($result, $i))); } unset($i); - + $buffer = ' ' . $crlf; if (!PMA_exportOutputHandler($buffer)) { return FALSE; } - + while ($record = PMA_DBI_fetch_row($result)) { $buffer = ' <table name="' . htmlspecialchars($table) . '">' . $crlf; for ($i = 0; $i < $columns_cnt; $i++) { @@ -344,7 +344,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { . '</column>' . $crlf; } $buffer .= ' </table>' . $crlf; - + if (!PMA_exportOutputHandler($buffer)) { return FALSE; } diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php index 9ad890d..f9d7d71 100644 --- a/libraries/header_http.inc.php +++ b/libraries/header_http.inc.php @@ -30,6 +30,6 @@ header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-ch header('Pragma: no-cache'); // HTTP/1.0 if (!defined('IS_TRANSFORMATION_WRAPPER')) { // Define the charset to be used - header('Content-Type: text/html; charset=' . $GLOBALS['charset']); + header('Content-Type: text/html; charset=utf-8'); } ?> diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php index 0c6633d..5e5c533 100644 --- a/libraries/header_meta_style.inc.php +++ b/libraries/header_meta_style.inc.php @@ -28,14 +28,14 @@ if ($GLOBALS['text_dir'] == 'ltr') { } // removes the bug with the horizontal scrollbar in IE (it's allways shown, if need it or not) // xml declaration moves IE into quirks mode, making much trouble with CSS -/* echo '<?xml version="1.0" encoding="' . $GLOBALS['charset'] . '"?>'; */ +/* echo '<?xml version="1.0" encoding="utf-8"?>'; */ ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <title><?php diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 0c77f54..54858a6 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -131,11 +131,11 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) $my_die = array(); } $my_die[] = array('sql' => $import_run_buffer['full'], 'error' => PMA_DBI_getError()); - + if ($cfg['VerboseMultiSubmit']) { $msg .= __('Error'); } - + if (!$cfg['IgnoreMultiSubmitErrors']) { $error = TRUE; return; @@ -156,12 +156,12 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) if (!$sql_query_disabled) { $sql_query .= $msg . "\n"; } - + // If a 'USE <db>' SQL-clause was found and the query succeeded, set our current $db to the new one if ($result != FALSE) { list($db, $reload) = PMA_lookForUse($import_run_buffer['sql'], $db, $reload); } - + if ($result != FALSE && preg_match('@^[\s]*(DROP|CREATE)[\s]+(IF EXISTS[[:space:]]+)?(TABLE|DATABASE)[[:space:]]+(.+)@im', $import_run_buffer['sql'])) { $reload = TRUE; } @@ -206,16 +206,16 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false) } /** - * Looks for the presence of USE to possibly change current db + * Looks for the presence of USE to possibly change current db * - * @param string buffer to examine - * @param string current db - * @param boolean reload - * @return array (current or new db, whether to reload) + * @param string buffer to examine + * @param string current db + * @param boolean reload + * @return array (current or new db, whether to reload) * @access public */ function PMA_lookForUse($buffer, $db, $reload) -{ +{ if (preg_match('@^[\s]*USE[[:space:]]*([\S]+)@i', $buffer, $match)) { $db = trim($match[1]); $db = trim($db,';'); // for example, USE abc; @@ -241,7 +241,7 @@ function PMA_lookForUse($buffer, $db, $reload) function PMA_importGetNextChunk($size = 32768) { global $compression, $import_handle, $charset_conversion, $charset_of_file, - $charset, $read_multiply; + $read_multiply; // Add some progression while reading large amount of data if ($read_multiply <= 8) { @@ -298,7 +298,7 @@ function PMA_importGetNextChunk($size = 32768) $GLOBALS['offset'] += $size; if ($charset_conversion) { - return PMA_convert_string($charset_of_file, $charset, $result); + return PMA_convert_string($charset_of_file, 'utf-8', $result); } else { /** * Skip possible byte order marks (I do not think we need more @@ -328,9 +328,9 @@ function PMA_importGetNextChunk($size = 32768) * The column number (1-26) is converted to the responding ASCII character (A-Z) and returned. * * If the column number is bigger than 26 (= num of letters in alfabet), - * an extra character needs to be added. To find this extra character, the number is divided by 26 - * and this value is passed to another instance of the same function (hence recursion). - * In that new instance the number is evaluated again, and if it is still bigger than 26, it is divided again + * an extra character needs to be added. To find this extra character, the number is divided by 26 + * and this value is passed to another instance of the same function (hence recursion). + * In that new instance the number is evaluated again, and if it is still bigger than 26, it is divided again * and passed to another instance of the same function. This continues until the number is smaller than 26. * Then the last called function returns the corresponding ASCII character to the function that called it. * Each time a called function ends an extra character is added to the column name. @@ -489,10 +489,10 @@ function PMA_getDecimalSize(&$cell) { $curr_size = strlen((string)$cell); $decPos = strpos($cell, "."); $decPrecision = ($curr_size - 1) - $decPos; - + $m = $curr_size - 1; $d = $decPrecision; - + return array($m, $d, ($m . "," . $d)); } @@ -525,7 +525,7 @@ function PMA_getDecimalSize(&$cell) { */ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type, &$cell) { $curr_size = strlen((string)$cell); - + /** * If the cell is NULL, don't treat it as a varchar */ @@ -551,7 +551,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type */ elseif ($last_cumulative_type == DECIMAL) { $oldM = PMA_getM($last_cumulative_size); - + if ($curr_size >= $oldM) { return $curr_size; } else { @@ -581,7 +581,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type /** * TODO: Handle this MUCH more elegantly */ - + return -1; } } @@ -595,7 +595,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type if ($last_cumulative_type == VARCHAR) { /* Convert $last_cumulative_size from varchar to decimal format */ $size = PMA_getDecimalSize($cell); - + if ($size[M] >= $last_cumulative_size) { return $size[M]; } else { @@ -607,10 +607,10 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type */ elseif ($last_cumulative_type == DECIMAL) { $size = PMA_getDecimalSize($cell); - + $oldM = PMA_getM($last_cumulative_size); $oldD = PMA_getD($last_cumulative_size); - + /* New val if M or D is greater than current largest */ if ($size[M] > $oldM || $size[D] > $oldD) { /* Take the largest of both types */ @@ -625,7 +625,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type elseif ($last_cumulative_type == BIGINT || $last_cumulative_type == INT) { /* Convert $last_cumulative_size from int to decimal format */ $size = PMA_getDecimalSize($cell); - + if ($size[M] >= $last_cumulative_size) { return $size[FULL]; } else { @@ -638,7 +638,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type elseif (! isset($last_cumulative_type) || $last_cumulative_type == NONE) { /* First row of the column */ $size = PMA_getDecimalSize($cell); - + return $size[FULL]; } /** @@ -648,7 +648,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type /** * TODO: Handle this MUCH more elegantly */ - + return -1; } } @@ -674,7 +674,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type $oldD = PMA_getD($last_cumulative_size); $oldInt = $oldM - $oldD; $newInt = strlen((string)$cell); - + /* See which has the larger integer length */ if ($oldInt >= $newInt) { /* Use old decimal size */ @@ -707,7 +707,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type /** * TODO: Handle this MUCH more elegantly */ - + return -1; } } @@ -718,7 +718,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type /** * TODO: Handle this MUCH more elegantly */ - + return -1; } } @@ -747,7 +747,7 @@ function PMA_detectType($last_cumulative_type, &$cell) { * If numeric, determine if decimal, int or bigint * Else, we call it varchar for simplicity */ - + if (! strcmp('NULL', $cell)) { if ($last_cumulative_type === NULL || $last_cumulative_type == NONE) { return NONE; @@ -807,7 +807,7 @@ function PMA_analyzeTable(&$table) { for ($i = 0; $i < $numCols; ++$i) { $sizes[$i] = 0; } - + /* Initialize $types to NONE */ for ($i = 0; $i < $numCols; ++$i) { $types[$i] = NONE; @@ -816,7 +816,7 @@ function PMA_analyzeTable(&$table) { /* Temp vars */ $curr_type = NONE; $curr_size = 0; - + /* If the passed array is not of the correct form, do not process it */ if (is_array($table) && ! is_array($table[TBL_NAME]) && is_array($table[COL_NAMES]) && is_array($table[ROWS])) { /* Analyze each column */ @@ -827,7 +827,7 @@ function PMA_analyzeTable(&$table) { $curr_type = PMA_detectType($types[$i], $table[ROWS][$j][$i]); /* Determine size of the current cell */ $sizes[$i] = PMA_detectSize($sizes[$i], $types[$i], $curr_type, $table[ROWS][$j][$i]); - + /** * If a type for this column has already been declared, * only alter it if it was a number and a varchar was found @@ -851,7 +851,7 @@ function PMA_analyzeTable(&$table) { } } } - + /* Check to ensure that all types are valid */ $len = count($types); for ($n = 0; $n < $len; ++$n) { @@ -860,7 +860,7 @@ function PMA_analyzeTable(&$table) { $sizes[$n] = '10'; } } - + return array($types, $sizes); } else @@ -868,7 +868,7 @@ function PMA_analyzeTable(&$table) { /** * TODO: Handle this better */ - + return false; } } @@ -913,38 +913,38 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = } else { $collation = "utf8_general_ci"; } - + if (isset($options['db_charset']) && ! is_null($options['db_charset'])) { $charset = $options['db_charset']; } else { $charset = "utf8"; } - + if (isset($options['create_db'])) { $create_db = $options['create_db']; } else { $create_db = true; } - + /* Create SQL code to handle the database */ $sql = array(); - + if ($create_db) { $sql[] = "CREATE DATABASE IF NOT EXISTS " . PMA_backquote($db_name) . " DEFAULT CHARACTER SET " . $charset . " COLLATE " . $collation; } - + /** * The calling plug-in should include this statement, if necessary, in the $additional_sql parameter * * $sql[] = "USE " . PMA_backquote($db_name); */ - + /* Execute the SQL statements create above */ $sql_len = count($sql); for ($i = 0; $i < $sql_len; ++$i) { PMA_importRunQuery($sql[$i], $sql[$i]); } - + /* No longer needed */ unset($sql); @@ -952,7 +952,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = if ($additional_sql != NULL) { /* Clean the SQL first */ $additional_sql_len = count($additional_sql); - + /** * Only match tables for now, because CREATE IF NOT EXISTS * syntax is lacking or nonexisting for views, triggers, @@ -966,7 +966,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = */ $pattern = '/CREATE .*(TABLE)/'; $replacement = 'CREATE \\1 IF NOT EXISTS'; - + /* Change CREATE statements to CREATE IF NOT EXISTS to support inserting into existing structures */ for ($i = 0; $i < $additional_sql_len; ++$i) { $additional_sql[$i] = preg_replace($pattern, $replacement, $additional_sql[$i]); @@ -977,12 +977,12 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = if ($analyses != NULL) { $type_array = array(NONE => "NULL", VARCHAR => "varchar", INT => "int", DECIMAL => "decimal", BIGINT => "bigint"); - + /* TODO: Do more checking here to make sure they really are matched */ if (count($tables) != count($analyses)) { exit(); } - + /* Create SQL code to create the tables */ $tempSQLStr = ""; $num_tables = count($tables); @@ -994,15 +994,15 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = if ((int)$size == 0) { $size = 10; } - + $tempSQLStr .= PMA_backquote($tables[$i][COL_NAMES][$j]) . " " . $type_array[$analyses[$i][TYPES][$j]] . "(" . $size . ")"; - + if ($j != (count($tables[$i][COL_NAMES]) - 1)) { $tempSQLStr .= ", "; } } $tempSQLStr .= ") ENGINE=MyISAM DEFAULT CHARACTER SET " . $charset . " COLLATE " . $collation . ";"; - + /** * Each SQL statement is executed immediately * after it is formed so that we don't have @@ -1011,7 +1011,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = PMA_importRunQuery($tempSQLStr, $tempSQLStr); } } - + /** * Create the SQL statements to insert all the data * @@ -1023,65 +1023,65 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = for ($i = 0; $i < $num_tables; ++$i) { $num_cols = count($tables[$i][COL_NAMES]); $num_rows = count($tables[$i][ROWS]); - + $tempSQLStr = "INSERT INTO " . PMA_backquote($db_name) . '.' . PMA_backquote($tables[$i][TBL_NAME]) . " ("; - + for ($m = 0; $m < $num_cols; ++$m) { $tempSQLStr .= PMA_backquote($tables[$i][COL_NAMES][$m]); - + if ($m != ($num_cols - 1)) { $tempSQLStr .= ", "; } } - + $tempSQLStr .= ") VALUES "; - + for ($j = 0; $j < $num_rows; ++$j) { $tempSQLStr .= "("; - + for ($k = 0; $k < $num_cols; ++$k) { if ($analyses != NULL) { $is_varchar = ($analyses[$i][TYPES][$col_count] === VARCHAR); } else { $is_varchar = !is_numeric($tables[$i][ROWS][$j][$k]); } - + /* Don't put quotes around NULL fields */ if (! strcmp($tables[$i][ROWS][$j][$k], 'NULL')) { $is_varchar = false; } - + $tempSQLStr .= (($is_varchar) ? "'" : ""); $tempSQLStr .= PMA_sqlAddslashes((string)$tables[$i][ROWS][$j][$k]); $tempSQLStr .= (($is_varchar) ? "'" : ""); - + if ($k != ($num_cols - 1)) { $tempSQLStr .= ", "; } - + if ($col_count == ($num_cols - 1)) { $col_count = 0; } else { $col_count++; } - + /* Delete the cell after we are done with it */ unset($tables[$i][ROWS][$j][$k]); } - + $tempSQLStr .= ")"; - + if ($j != ($num_rows - 1)) { $tempSQLStr .= ",\n "; } - + $col_count = 0; /* Delete the row after we are done with it */ unset($tables[$i][ROWS][$j]); } - + $tempSQLStr .= ";"; - + /** * Each SQL statement is executed immediately * after it is formed so that we don't have @@ -1089,32 +1089,32 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = */ PMA_importRunQuery($tempSQLStr, $tempSQLStr); } - + /* No longer needed */ unset($tempSQLStr); - + /** * A work in progress */ - + /* Add the viewable structures from $additional_sql to $tables so they are also displayed */ - + $view_pattern = '@VIEW `[^`]+`\.`([^`]+)@'; $table_pattern = '@CREATE TABLE IF NOT EXISTS `([^`]+)`@'; /* Check a third pattern to make sure its not a "USE `db_name`;" statement */ - + $regs = array(); - + $inTables = false; - + $additional_sql_len = count($additional_sql); for ($i = 0; $i < $additional_sql_len; ++$i) { preg_match($view_pattern, $additional_sql[$i], $regs); - + if (count($regs) == 0) { preg_match($table_pattern, $additional_sql[$i], $regs); } - + if (count($regs)) { for ($n = 0; $n < $num_tables; ++$n) { if (!strcmp($regs[1], $tables[$n][TBL_NAME])) { @@ -1122,21 +1122,21 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = break; } } - + if (!$inTables) { $tables[] = array(TBL_NAME => $regs[1]); } } - + /* Reset the array */ $regs = array(); $inTables = false; } - + $params = array('db' => (string)$db_name); $db_url = 'db_structure.php' . PMA_generate_common_url($params); $db_ops_url = 'db_operations.php' . PMA_generate_common_url($params); - + $message = '<br /><br />'; $message .= '<strong>' . __('The following structures have either been created or altered. Here you can:') . '</strong><br />'; $message .= '<ul><li>' . __('View a structure`s contents by clicking on its name') . '</li>'; @@ -1148,11 +1148,11 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = $db_name, $db_ops_url, __('Edit') . ' ' . PMA_backquote($db_name) . ' ' . __('settings')); - + $message .= '<ul>'; - + unset($params); - + $num_tables = count($tables); for ($i = 0; $i < $num_tables; ++$i) { @@ -1160,9 +1160,9 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = $tbl_url = 'sql.php' . PMA_generate_common_url($params); $tbl_struct_url = 'tbl_structure.php' . PMA_generate_common_url($params); $tbl_ops_url = 'tbl_operations.php' . PMA_generate_common_url($params); - + unset($params); - + if (! PMA_isView($db_name, $tables[$i][TBL_NAME])) { $message .= sprintf('<li><a href="%s" title="%s">%s</a> (<a href="%s" title="%s">' . __('Structure') . '</a>) (<a href="%s" title="%s">' . __('Options') . '</a>)</li>', $tbl_url, @@ -1179,12 +1179,12 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = NULL, &$additional_sql = $tables[$i][TBL_NAME]); } } - + $message .= '</ul></ul>'; - + global $import_notice; $import_notice = $message; - + unset($tables); } diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php index 2d23c5b..e75b3e8 100644 --- a/libraries/schema/Export_Relation_Schema.class.php +++ b/libraries/schema/Export_Relation_Schema.class.php @@ -186,22 +186,14 @@ class PMA_Export_Relation_Schema * @param string type Schema Type * @param string error_message the error mesage * @global array the PMA configuration array - * @global integer the current server id - * @global string the current language - * @global string the charset to convert to * @global string the current database name - * @global string the current charset - * @global string the current text direction - * @global string a localized string - * @global string an other localized string * @access public * @return void */ function dieSchema($pageNumber, $type = '', $error_message = '') { global $cfg; - global $server, $lang, $convcharset, $db; - global $charset, $text_dir; + global $db; require_once './libraries/header.inc.php'; echo "<p><strong>" . __("SCHEMA ERROR: ") . $type ."</strong></p>" . "\n"; diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 08a5b2f..15945be 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -478,9 +478,6 @@ if (! function_exists('__')) { die('Bad invocation!'); } -/* We use only utf-8 */ -$charset = 'utf-8'; - /* l10n: Text direction, use either ltr or rtl */ $GLOBALS['text_dir'] = __('ltr'); diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 25f67cd..80ee79e 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -464,7 +464,6 @@ function PMA_sqlQueryFormBookmark() * @uses $GLOBALS['cfg']['BZipDump'] * @uses $GLOBALS['cfg']['UploadDir'] * @uses $GLOBALS['cfg']['AvailableCharsets'] - * @uses $GLOBALS['charset'] * @uses $GLOBALS['max_upload_size'] * @uses PMA_supportedDecompressions() * @uses PMA_getFileSelectOptions() diff --git a/libraries/string.lib.php b/libraries/string.lib.php index e17a935..650a2ef 100644 --- a/libraries/string.lib.php +++ b/libraries/string.lib.php @@ -28,7 +28,7 @@ $GLOBALS['PMA_allow_mbstr'] = @function_exists('mb_strlen'); $GLOBALS['PMA_allow_ctype'] = @extension_loaded('ctype'); if ($GLOBALS['PMA_allow_mbstr']) { - mb_internal_encoding($GLOBALS['charset']); + mb_internal_encoding('utf-8'); } /** diff --git a/navigation.php b/navigation.php index e9b2236..76f5b98 100644 --- a/navigation.php +++ b/navigation.php @@ -11,7 +11,6 @@ * @uses $GLOBALS['available_languages'] * @uses $GLOBALS['lang'] * @uses $GLOBALS['text_dir'] - * @uses $GLOBALS['charset'] * @uses $GLOBALS['pmaThemeImage'] * @uses $GLOBALS['cfg']['LeftFrameLight'] * @uses $GLOBALS['cfg']['ShowTooltip'] @@ -118,7 +117,7 @@ require_once './libraries/header_http.inc.php'; * Displays the frame */ // xml declaration moves IE into quirks mode, making much trouble with CSS -/* echo '<?xml version="1.0" encoding="' . $GLOBALS['charset'] . '"?>'; */ +/* echo '<?xml version="1.0" encoding="utf-8"?>'; */ ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -131,8 +130,7 @@ require_once './libraries/header_http.inc.php'; <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <title>phpMyAdmin</title> - <meta http-equiv="Content-Type" - content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <base target="frame_content" /> <link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=left&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> diff --git a/pmd_relation_new.php b/pmd_relation_new.php index 6ea4485..da92e97 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -91,7 +91,7 @@ if (PMA_foreignkey_supported($type_T1) && PMA_foreignkey_supported($type_T2) && function PMD_return_new($b,$ret) { global $db,$T1,$F1,$T2,$F2; - header("Content-Type: text/xml; charset=utf-8");//utf-8 .$_GLOBALS['charset'] + header("Content-Type: text/xml; charset=utf-8"); header("Cache-Control: no-cache"); die('<root act="relation_new" return="'.$ret.'" b="'.$b. '" DB1="'.urlencode($db). diff --git a/test/PMA_SQL_parser_test.php b/test/PMA_SQL_parser_test.php index aa3299c..d384bd2 100644 --- a/test/PMA_SQL_parser_test.php +++ b/test/PMA_SQL_parser_test.php @@ -13,7 +13,6 @@ require_once 'PHPUnit/Framework.php'; define('PHPMYADMIN', 1); define('TESTSUITE', 1); -$GLOBALS['charset'] = 'utf-8'; function __($s) { return $s; diff --git a/test/PMA_STR_sub_test.php b/test/PMA_STR_sub_test.php index 7900b92..640c777 100644 --- a/test/PMA_STR_sub_test.php +++ b/test/PMA_STR_sub_test.php @@ -33,8 +33,6 @@ if (isset($match) && ! empty($match[1])) { define('PMA_PHP_INT_VERSION', 0); } -$GLOBALS['charset'] = 'UTF-8'; - require_once './libraries/string.lib.php'; /** diff --git a/test/theme.php b/test/theme.php index d49a577..5e0dcb2 100644 --- a/test/theme.php +++ b/test/theme.php @@ -17,7 +17,7 @@ require_once './libraries/common.inc.php'; $lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][1]; // start output -header('Content-Type: text/html; charset=' . $GLOBALS['charset']); +header('Content-Type: text/html; charset=utf-8'); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> @@ -28,8 +28,7 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']); <head> <title>phpMyAdmin <?php echo PMA_VERSION; ?> - <?php echo htmlspecialchars($HTTP_HOST); ?> - Theme Test</title> - <meta http-equiv="Content-Type" - content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="stylesheet" type="text/css" href="../phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&js_frame=right&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> <link rel="stylesheet" type="text/css" media="print" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2940-g4841ee9
by Michal Čihař 03 Jun '11

03 Jun '11

The branch, master has been updated via 4841ee9d5f9926187b0eb8b23e6dd87af2daeab4 (commit) from 7bda45ba6614d02b16e2f3812b0932abb9e712fa (commit) - Log ----------------------------------------------------------------- commit 4841ee9d5f9926187b0eb8b23e6dd87af2daeab4 Author: Michal Čihař <mcihar(a)novell.com> Date: Fri Jun 3 13:32:53 2011 +0200 Use standard mechanism for loading javascript to prevent multiple requests to server ----------------------------------------------------------------------- Summary of changes: navigation.php | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/navigation.php b/navigation.php index dc68489..e9b2236 100644 --- a/navigation.php +++ b/navigation.php @@ -136,11 +136,13 @@ require_once './libraries/header_http.inc.php'; <base target="frame_content" /> <link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=left&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> - <script src="./js/jquery/jquery-1.6.1.js" type="text/javascript"></script> - <script src="./js/jquery/jquery-ui-1.8.custom.js" type="text/javascript"></script> - <script type="text/javascript" src="js/navigation.js"></script> - <script type="text/javascript" src="js/functions.js"></script> - <script type="text/javascript" src="js/messages.php"></script> + <?php + echo PMA_includeJS('jquery/jquery-1.6.1.js'); + echo PMA_includeJS('jquery/jquery-ui-1.8.custom.js'); + echo PMA_includeJS('navigation.js'); + echo PMA_includeJS('functions.js'); + echo PMA_includeJS('messages.php'); + ?> <script type="text/javascript"> // <![CDATA[ var image_minus = '<?php echo $GLOBALS['pmaThemeImage']; ?>b_minus.png'; hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
...
22
23
24
25
26
27
28
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git June 2011