The branch, TESTING has been updated via 049fd9fd97ed3da8cb38804be1666125129d4b19 (commit) via 09b30b8b6e462aafc24cc32a78491cd9513305c6 (commit) via 08ee54d4a43b1bd6eff1e6695ff8553e6f26b37a (commit) via 3534dda30a587eafe3bf5016f2fb302dbc224c2e (commit) via 06bfdd7ca6d76335f45d53134770979d7d25d739 (commit) via 9a268729f0cb0aeb2d124b58ca22ef8e7bd7baf6 (commit) via 201ad07ea8883fc8c3a18227a656ea56fe7b18fc (commit) via 5f9c187010dcf2b51bf3dee516789b6fae9f2363 (commit) via 54398f8a124702e30820bc4636040dda1db6b71b (commit) via bea5556023b4561c23e82f5005059c5fb7b1cde8 (commit) via 36c0339eb00394d4c51ccbf82a20feae7b70fb18 (commit) via 58b48a3d4555d0469ee6fed361a9cf8820fb8c9d (commit) via 9eba5726bd809ab874fc29360ac6ff351d86335b (commit) via 3ec3c7ee1766331a25899483ff78ff468516fc2e (commit) via 40d7c3b8baa84c474af5f710e60351b05330f3c6 (commit) via b185ca88f7c8241804cff13a2b315fc3d1222a38 (commit) via 2cc22c8aba33ad12b3d98905d6dfc29f7c878837 (commit) via 70083ad58346ff7190bcd8e56b63ab92f6abfa40 (commit) via 65d962d39703b412dc482be47e092f97933eb8e0 (commit) via 6d0f28b425dc9f975543301c4b194dd6fbdd494d (commit) via ed88c4a7b68c8efd764a364d1a9579aa762ebdaa (commit) via 58d25ddcb8a036743e32879c9320dcd802626082 (commit) via a546479680cd1da8af6812ed0eef83b390bab07f (commit) via 95927229deb417c2df4fad3baccaf9de575c70b5 (commit) via 90a232d8fb9b6e321481cac4c3db21767a3f1189 (commit) via 39cb4d4798f495db25bf65dda95fc8c4e9893367 (commit) via 2ec0de3a9f8d77c750f02c27ba8d83b407a87ea5 (commit) via c4ecddb5a2df58f26675f0162d8f2335b71bfbd5 (commit) via 041cd7e7d2dfa95dd055da6fd2eb5308902fda95 (commit) via 58d86350c439c2ea06d58ba37f723e6e8a8f1abf (commit) via 5217946601b64ee6e92f97443cf4e515c03c0c27 (commit) via 4d1540cc1c8136040968bcfb3a4629aad2551b3a (commit) via 614639a5c5d94b9c693f7ec6e32c1a6e71a7e203 (commit) via 9129444381fef0d9b57466219f21deae8fc95582 (commit) via 31df8ebb5dd444fc40d566407d9b2a00eee8d1b9 (commit) via edf46c8022020099ac953b2e16f36f4f99687d87 (commit) via 43c7f939c31e9304cacbbc456d999d9d6afc8682 (commit) via 5e28dbea224d21b2c03cd325ef67f36b42d2b58d (commit) via f09d19cfa3bd2f31185848adfdeb808576396851 (commit) via e8ee4eb11b784b56d51bf4d37dd4811e8d213569 (commit) via 9e224184d786068317b801291c8f960109f0bdc5 (commit) via c2dd99965dea7756e9de5a58100c1c701ef83de3 (commit) via 341dc1296f8e3fe6b80a9b5f5e752cfd868bdb10 (commit) via 3336bf363625d3512da5f32d5d9f276a64dae02b (commit) via 7ecb1abaa49142a7e0b3f6d6e37cb4855e17ddf9 (commit) from 2c2f7988ca2241fcbcfc44485a3491483de9562e (commit)
- Log ----------------------------------------------------------------- commit 049fd9fd97ed3da8cb38804be1666125129d4b19 Merge: 2c2f7988ca2241fcbcfc44485a3491483de9562e 09b30b8b6e462aafc24cc32a78491cd9513305c6 Author: Marc Delisle marc@infomarc.info Date: Mon Jul 25 10:20:15 2011 -0400
Merge branch 'MAINT_3_4_4' into TESTING
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 19 + Documentation.html | 4 +- README | 2 +- db_operations.php | 11 - js/export.js | 25 +- js/functions.js | 4 +- js/indexes.js | 12 +- js/server_privileges.js | 1 + js/sql.js | 5 +- libraries/Config.class.php | 2 +- libraries/config.default.php | 5 +- libraries/core.lib.php | 8 +- libraries/display_export.lib.php | 11 +- libraries/display_import.lib.php | 6 +- libraries/display_tbl.lib.php | 2 +- libraries/export/codegen.php | 340 ++++--- libraries/export/xml.php | 43 +- libraries/header.inc.php | 5 +- libraries/select_lang.lib.php | 2 + libraries/sqlparser.lib.php | 4 +- po/af.po | 2 +- po/ar.po | 118 ++- po/az.po | 2 +- po/be.po | 2 +- po/be@latin.po | 2 +- po/bg.po | 316 +++--- po/bn.po | 2 +- po/{ug.po => br.po} | 2140 +++++++++++++++++++------------------- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/cy.po | 2 +- po/da.po | 1294 ++++++++++++++--------- 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 | 111 ++- po/ro.po | 2 +- po/ru.po | 2 +- po/si.po | 2 +- po/sk.po | 67 +- po/sl.po | 2 +- po/sq.po | 2 +- po/sr.po | 2 +- po/sr@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 | 94 +- po/ur.po | 2 +- po/uz.po | 2 +- po/uz@latin.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- setup/index.php | 4 +- setup/lib/index.lib.php | 2 +- sql.php | 2 +- tbl_indexes.php | 14 +- tbl_structure.php | 8 +- 89 files changed, 2648 insertions(+), 2147 deletions(-) copy po/{ug.po => br.po} (87%)
diff --git a/ChangeLog b/ChangeLog index 24ff73c..3c30745 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,25 @@ phpMyAdmin - ChangeLog ======================
+3.4.4.0 (not yet released) +- bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes +- bug #3323101 [parser] Invalid escape sequence in SQL parser +- bug #3348995 [config] $cfg['Export']['asfile'] set to false does not select asText option +- bug #3340151 [export] Working SQL query exports error page +- bug #3353649 [interface] "Create an index on X columns" form not validated +- bug #3350790 [interface] JS error in Table->Structure->Index->Edit +- bug #3353811 [interface] Info message has "error" class +- bug #3357837 [interface] TABbing through a NULL field in the inline mode resets NULL +- remove version number in /setup +- bug #3367993 [usability] Missing "Generate Password" button +- bug #3363221 [display] Missing Server Parameter on inline sql query +- bug #3367986 [navi] Drop field -> lost active table +- remove misleading comment on the "Rename database" interface +- bug #3374374 [interface] Fix footnote for inexact count while browsing +- bug #3372807 [interface] Fix security warning link in setup +- bug #3374347 [display] Backquotes in normal text on import page +- bug #3358750 [core] With Suhosin, urls are too long in edit links + 3.4.3.2 (2011-07-23) - [security] Fixed XSS vulnerability, see PMASA-2011-9 - [security] Fixed local file inclusion vulnerability, see PMASA-2011-10 diff --git a/Documentation.html b/Documentation.html index 15f8000..057c6c9 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.3.2 - Documentation</title> + <title>phpMyAdmin 3.4.4-rc1 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head>
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.3.2 + 3.4.4-rc1 Documentation </h1> </div> diff --git a/README b/README index 65f7c52..6e7197d 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme ===================
-Version 3.4.3.2 +Version 3.4.4-rc1
A set of PHP-scripts to manage MySQL over the web.
diff --git a/db_operations.php b/db_operations.php index f48ba27..ebd9333 100644 --- a/db_operations.php +++ b/db_operations.php @@ -405,17 +405,6 @@ if ($db != 'mysql') { ?> </legend> <input id="new_db_name" type="text" name="newname" size="30" class="textfield" value="" /> - <?php - echo '(' . __('Command') . ': '; - /** - * @todo (see explanations above in a previous todo) - */ - //if (PMA_MYSQL_INT_VERSION >= XYYZZ) { - // echo 'RENAME DATABASE'; - //} else { - echo 'INSERT INTO ... SELECT'; - //} - echo ')'; ?> </fieldset> <fieldset class="tblFooters"> <input id="rename_db_input" type="submit" value="<?php echo __('Go'); ?>" /> diff --git a/js/export.js b/js/export.js index 1cf9de5..3fd3c00 100644 --- a/js/export.js +++ b/js/export.js @@ -89,18 +89,23 @@ $(document).ready(function() { /** * Toggles the disabling of the "save to file" options */ +function toggle_save_to_file() { + if($("#radio_dump_asfile:checked").length == 0) { + $("#ul_save_asfile > li").fadeTo('fast', 0.4); + $("#ul_save_asfile > li > input").attr('disabled', 'disabled'); + $("#ul_save_asfile > li> select").attr('disabled', 'disabled'); + } else { + $("#ul_save_asfile > li").fadeTo('fast', 1); + $("#ul_save_asfile > li > input").removeAttr('disabled'); + $("#ul_save_asfile > li> select").removeAttr('disabled'); + } +} + $(document).ready(function() { + toggle_save_to_file(); $("input[type='radio'][name='output_format']").change(function() { - if($("#radio_dump_asfile:checked").length == 0) { - $("#ul_save_asfile > li").fadeTo('fast', 0.4); - $("#ul_save_asfile > li > input").attr('disabled', 'disabled'); - $("#ul_save_asfile > li> select").attr('disabled', 'disabled'); - } else { - $("#ul_save_asfile > li").fadeTo('fast', 1); - $("#ul_save_asfile > li > input").removeAttr('disabled'); - $("#ul_save_asfile > li> select").removeAttr('disabled'); - } - }); + toggle_save_to_file(); + }); });
/** diff --git a/js/functions.js b/js/functions.js index eea8573..75fd677 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1117,6 +1117,7 @@ function changeMIMEType(db, table, reference, mime_type) */ $(document).ready(function(){ $(".inline_edit_sql").live('click', function(){ + var server = $(this).prev().find("input[name='server']").val(); var db = $(this).prev().find("input[name='db']").val(); var table = $(this).prev().find("input[name='table']").val(); var token = $(this).prev().find("input[name='token']").val(); @@ -1132,7 +1133,8 @@ $(document).ready(function(){ $(this).click(function(){ sql_query = $(this).prev().val(); window.location.replace("import.php" - + "?db=" + encodeURIComponent(db) + + "?server=" + encodeURIComponent(server) + + "&db=" + encodeURIComponent(db) + "&table=" + encodeURIComponent(table) + "&sql_query=" + encodeURIComponent(sql_query) + "&show_query=1" diff --git a/js/indexes.js b/js/indexes.js index a15b249..c7bed94 100644 --- a/js/indexes.js +++ b/js/indexes.js @@ -17,24 +17,24 @@ function checkIndexName() }
// Gets the elements pointers - var the_idx_name = document.forms['index_frm'].elements['index']; - var the_idx_type = document.forms['index_frm'].elements['index_type']; + var the_idx_name = document.forms['index_frm'].elements['index[Key_name]']; + var the_idx_type = document.forms['index_frm'].elements['index[Index_type]'];
// Index is a primary key if (the_idx_type.options[0].value == 'PRIMARY' && the_idx_type.options[0].selected) { - document.forms['index_frm'].elements['index'].value = 'PRIMARY'; + document.forms['index_frm'].elements['index[Key_name]'].value = 'PRIMARY'; if (typeof(the_idx_name.disabled) != 'undefined') { - document.forms['index_frm'].elements['index'].disabled = true; + document.forms['index_frm'].elements['index[Key_name]'].disabled = true; } }
// Other cases else { if (the_idx_name.value == 'PRIMARY') { - document.forms['index_frm'].elements['index'].value = ''; + document.forms['index_frm'].elements['index[Key_name]'].value = ''; } if (typeof(the_idx_name.disabled) != 'undefined') { - document.forms['index_frm'].elements['index'].disabled = false; + document.forms['index_frm'].elements['index[Key_name]'].disabled = false; } }
diff --git a/js/server_privileges.js b/js/server_privileges.js index 8b9c5e9..f178c6c 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -489,6 +489,7 @@ $(document).ready(function() { } });
+ displayPasswordGenerateButton(); }, 'top.frame_content'); //end $(document).ready()
/**#@- */ diff --git a/js/sql.js b/js/sql.js index e871c74..b185b69 100644 --- a/js/sql.js +++ b/js/sql.js @@ -644,7 +644,10 @@ $(document).ready(function() { }) } else { $this_field.find('textarea').live('keypress', function(e) { - $('.checkbox_null_' + field_name + '_' + this_row_index).attr('checked', false); + // FF errorneously triggers for modifier keys such as tab (bug #3357837) + if (e.which != 0) { + $('.checkbox_null_' + field_name + '_' + this_row_index).attr('checked', false); + } }) }
diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 0cec6a9..a55bd02 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.3.2'); + $this->set('PMA_VERSION', '3.4.4-rc1'); /** * @deprecated */ diff --git a/libraries/config.default.php b/libraries/config.default.php index 4ca31e7..4040acf 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2596,8 +2596,11 @@ $cfg['CheckConfigurationPermissions'] = true; * Limit for length of URL in links. When length would be above this limit, it * is replaced by form with button. * This is required as some web servers (IIS) have problems with long URLs. + * The recommended limit is 2000 + * (see http://www.boutell.com/newfaq/misc/urllength.html) but we put + * 1000 to accommodate Suhosin, see bug #3358750. */ -$cfg['LinkLengthLimit'] = 2000; +$cfg['LinkLengthLimit'] = 1000;
/******************************************************************************* * SQL Parser Settings diff --git a/libraries/core.lib.php b/libraries/core.lib.php index 1350247..80c1f12 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -275,7 +275,13 @@ function PMA_getPHPDocLink($target) { */ function PMA_warnMissingExtension($extension, $fatal = false, $extra = '') { - $message = sprintf(__('The %s extension is missing. Please check your PHP configuration.'), + /* Gettext does not have to be loaded yet here */ + if (function_exists('__')) { + $message = __('The %s extension is missing. Please check your PHP configuration.'); + } else { + $message = 'The %s extension is missing. Please check your PHP configuration.'; + } + $message = sprintf($message, '[a@' . PMA_getPHPDocLink('book.' . $extension . '.php') . '@Documentation][em]' . $extension . '[/em][/a]'); if ($extra != '') { $message .= ' ' . $extra; diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 87c3a8e..637b069 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -35,13 +35,6 @@ if (empty($export_list)) { PMA_Message::error( __('Could not load export plugins, please check your installation!'))->display(); require './libraries/footer.inc.php'; } - -// If the form data is being loaded from GET data, decode it -foreach($_GET as $name => $value) { - if(is_string($value)) { - $_GET[urldecode($name)] = urldecode($value); - } -} ?>
<form method="post" action="export.php" name="dump"> @@ -73,7 +66,7 @@ echo '<input type="hidden" name="export_method" value="' . htmlspecialchars($cfg
if(isset($_GET['sql_query'])) { - echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars(urldecode($_GET['sql_query'])) . '" />' . "\n"; + echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($_GET['sql_query']) . '" />' . "\n"; } elseif (! empty($sql_query)) { echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />' . "\n"; } @@ -325,7 +318,7 @@ if(isset($_GET['sql_query'])) { <?php } ?> </ul> </li> - <li><input type="radio" id="radio_view_as_text" name="output_format" value="astext" <?php echo isset($_GET['repopulate']) ? 'checked="checked"' : '' ?>/><label for="radio_view_as_text"><?php echo __('View output as text'); ?></label></li> + <li><input type="radio" id="radio_view_as_text" name="output_format" value="astext" <?php echo (isset($_GET['repopulate']) || $GLOBALS['cfg']['Export']['asfile'] == false) ? 'checked="checked"' : '' ?>/><label for="radio_view_as_text"><?php echo __('View output as text'); ?></label></li> </ul> </div>
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 3a9c2ea..c56c461 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -63,7 +63,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { complete = response.complete;
if (total==0 && complete==0 && percent==0) { - $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.')); ?>'); + $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'), false); ?>'); $('#upload_form_status').css("display", "none"); } else { $('#upload_form_status_info').html(' '+Math.round(percent)+'%, '+complete+'/'+total); @@ -73,7 +73,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { if (finished==true) { $('#importmain').css('display', 'none'); $('#import_form_status').css('display', 'inline'); - $('#import_form_status').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file is being processed, please be patient.')); ?> '); + $('#import_form_status').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file is being processed, please be patient.'), false); ?> '); $('#import_form_status').load('import_status.php?message=true&<?php echo PMA_generate_common_url(); ?>'); // loads the message, either success or mysql error <?php // reload the left sidebar when the import is finished @@ -95,7 +95,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { <?php } else { // no plugin available ?> - $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.')) . PMA_showDocu('faq2_9'); ?>'); + $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.'), false) . PMA_showDocu('faq2_9'); ?>'); $('#upload_form_status').css("display", "none"); <?php } // else diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index c7d74ef..c871612 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1937,7 +1937,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) || $analyzed_sql[0]['where_clause'] == '1 ')) { // "j u s t b r o w s i n g" $pre_count = '~'; - $after_count = PMA_showHint(PMA_sanitize(__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]')), true); + $after_count = PMA_showHint(PMA_sanitize(__('May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]'))); } else { $pre_count = ''; $after_count = ''; diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index 8e36f40..7c06d79 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -138,12 +138,12 @@ function PMA_exportDBCreate($db) */ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { - global $CG_FORMATS, $CG_HANDLERS; - $format = cgGetOption("format"); - $index = array_search($format, $CG_FORMATS); - if ($index >= 0) - return PMA_exportOutputHandler($CG_HANDLERS[$index]($db, $table, $crlf)); - return PMA_exportOutputHandler(sprintf("%s is not supported.", $format)); + global $CG_FORMATS, $CG_HANDLERS; + $format = cgGetOption("format"); + if (isset($CG_FORMATS[$format])) { + return PMA_exportOutputHandler($CG_HANDLERS[$format]($db, $table, $crlf)); + } + return PMA_exportOutputHandler(sprintf("%s is not supported.", $format)); }
/** @@ -152,162 +152,184 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) */ class TableProperty { - public $name; - public $type; - public $nullable; - public $key; - public $defaultValue; - public $ext; - function __construct($row) - { - $this->name = trim($row[0]); - $this->type = trim($row[1]); - $this->nullable = trim($row[2]); - $this->key = trim($row[3]); - $this->defaultValue = trim($row[4]); - $this->ext = trim($row[5]); - } - function getPureType() - { - $pos=strpos($this->type, "("); - if ($pos > 0) - return substr($this->type, 0, $pos); - return $this->type; - } - function isNotNull() - { - return $this->nullable == "NO" ? "true" : "false"; - } - function isUnique() - { - return $this->key == "PRI" || $this->key == "UNI" ? "true" : "false"; - } - function getDotNetPrimitiveType() - { - if (strpos($this->type, "int") === 0) return "int"; - if (strpos($this->type, "long") === 0) return "long"; - if (strpos($this->type, "char") === 0) return "string"; - if (strpos($this->type, "varchar") === 0) return "string"; - if (strpos($this->type, "text") === 0) return "string"; - if (strpos($this->type, "longtext") === 0) return "string"; - if (strpos($this->type, "tinyint") === 0) return "bool"; - if (strpos($this->type, "datetime") === 0) return "DateTime"; - return "unknown"; - } - function getDotNetObjectType() - { - if (strpos($this->type, "int") === 0) return "Int32"; - if (strpos($this->type, "long") === 0) return "Long"; - if (strpos($this->type, "char") === 0) return "String"; - if (strpos($this->type, "varchar") === 0) return "String"; - if (strpos($this->type, "text") === 0) return "String"; - if (strpos($this->type, "longtext") === 0) return "String"; - if (strpos($this->type, "tinyint") === 0) return "Boolean"; - if (strpos($this->type, "datetime") === 0) return "DateTime"; - return "Unknown"; - } - function getIndexName() - { - if (strlen($this->key)>0) - return "index="" . $this->name . """; - return ""; - } - function isPK() - { - return $this->key=="PRI"; - } - function format($pattern) - { - $text=$pattern; - $text=str_replace("#name#", $this->name, $text); - $text=str_replace("#type#", $this->getPureType(), $text); - $text=str_replace("#notNull#", $this->isNotNull(), $text); - $text=str_replace("#unique#", $this->isUnique(), $text); - $text=str_replace("#ucfirstName#", ucfirst($this->name), $text); - $text=str_replace("#dotNetPrimitiveType#", $this->getDotNetPrimitiveType(), $text); - $text=str_replace("#dotNetObjectType#", $this->getDotNetObjectType(), $text); - $text=str_replace("#indexName#", $this->getIndexName(), $text); - return $text; - } + public $name; + public $type; + public $nullable; + public $key; + public $defaultValue; + public $ext; + function __construct($row) + { + $this->name = trim($row[0]); + $this->type = trim($row[1]); + $this->nullable = trim($row[2]); + $this->key = trim($row[3]); + $this->defaultValue = trim($row[4]); + $this->ext = trim($row[5]); + } + function getPureType() + { + $pos=strpos($this->type, "("); + if ($pos > 0) + return substr($this->type, 0, $pos); + return $this->type; + } + function isNotNull() + { + return $this->nullable == "NO" ? "true" : "false"; + } + function isUnique() + { + return $this->key == "PRI" || $this->key == "UNI" ? "true" : "false"; + } + function getDotNetPrimitiveType() + { + if (strpos($this->type, "int") === 0) return "int"; + if (strpos($this->type, "long") === 0) return "long"; + if (strpos($this->type, "char") === 0) return "string"; + if (strpos($this->type, "varchar") === 0) return "string"; + if (strpos($this->type, "text") === 0) return "string"; + if (strpos($this->type, "longtext") === 0) return "string"; + if (strpos($this->type, "tinyint") === 0) return "bool"; + if (strpos($this->type, "datetime") === 0) return "DateTime"; + return "unknown"; + } + function getDotNetObjectType() + { + if (strpos($this->type, "int") === 0) return "Int32"; + if (strpos($this->type, "long") === 0) return "Long"; + if (strpos($this->type, "char") === 0) return "String"; + if (strpos($this->type, "varchar") === 0) return "String"; + if (strpos($this->type, "text") === 0) return "String"; + if (strpos($this->type, "longtext") === 0) return "String"; + if (strpos($this->type, "tinyint") === 0) return "Boolean"; + if (strpos($this->type, "datetime") === 0) return "DateTime"; + return "Unknown"; + } + function getIndexName() + { + if (strlen($this->key)>0) + return "index="" . htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8') . """; + return ""; + } + function isPK() + { + return $this->key=="PRI"; + } + function formatCs($text) + { + $text=str_replace("#name#", cgMakeIdentifier($this->name, false), $text); + return $this->format($text); + } + function formatXml($text) + { + $text=str_replace("#name#", htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8'), $text); + $text=str_replace("#indexName#", $this->getIndexName(), $text); + return $this->format($text); + } + function format($text) + { + $text=str_replace("#ucfirstName#", cgMakeIdentifier($this->name), $text); + $text=str_replace("#dotNetPrimitiveType#", $this->getDotNetPrimitiveType(), $text); + $text=str_replace("#dotNetObjectType#", $this->getDotNetObjectType(), $text); + $text=str_replace("#type#", $this->getPureType(), $text); + $text=str_replace("#notNull#", $this->isNotNull(), $text); + $text=str_replace("#unique#", $this->isUnique(), $text); + return $text; + } }
- function handleNHibernateCSBody($db, $table, $crlf) - { - $lines=array(); - $result=PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); - if ($result) - { - $tableProperties=array(); - while ($row = PMA_DBI_fetch_row($result)) - $tableProperties[] = new TableProperty($row); - $lines[] = "using System;"; - $lines[] = "using System.Collections;"; - $lines[] = "using System.Collections.Generic;"; - $lines[] = "using System.Text;"; - $lines[] = "namespace ".ucfirst($db); - $lines[] = "{"; - $lines[] = " #region ".ucfirst($table); - $lines[] = " public class ".ucfirst($table); - $lines[] = " {"; - $lines[] = " #region Member Variables"; - foreach ($tableProperties as $tablePropertie) - $lines[] = $tablePropertie->format(" protected #dotNetPrimitiveType# _#name#;"); - $lines[] = " #endregion"; - $lines[] = " #region Constructors"; - $lines[] = " public ".ucfirst($table)."() { }"; - $temp = array(); - foreach ($tableProperties as $tablePropertie) - if (! $tablePropertie->isPK()) - $temp[] = $tablePropertie->format("#dotNetPrimitiveType# #name#"); - $lines[] = " public ".ucfirst($table)."(".implode(", ", $temp).")"; - $lines[] = " {"; - foreach ($tableProperties as $tablePropertie) - if (! $tablePropertie->isPK()) - $lines[] = $tablePropertie->format(" this._#name#=#name#;"); - $lines[] = " }"; - $lines[] = " #endregion"; - $lines[] = " #region Public Properties"; - foreach ($tableProperties as $tablePropertie) - $lines[] = $tablePropertie->format(" public virtual #dotNetPrimitiveType# _#ucfirstName#\n {\n get {return _#name#;}\n set {_#name#=value;}\n }"); - $lines[] = " #endregion"; - $lines[] = " }"; - $lines[] = " #endregion"; - $lines[] = "}"; - PMA_DBI_free_result($result); - } - return implode("\n", $lines); - } + function cgMakeIdentifier($str, $ucfirst = true) + { + // remove unsafe characters + $str = preg_replace('/[^\p{L}\p{Nl}_]/u', '', $str); + // make sure first character is a letter or _ + if (!preg_match('/^\pL/u', $str)) { + $str = '_' . $str; + } + if ($ucfirst) { + $str = ucfirst($str); + } + return $str; + }
- function handleNHibernateXMLBody($db, $table, $crlf) - { - $lines=array(); - $lines[] = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>"; - $lines[] = "<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="".ucfirst($db)."" assembly="".ucfirst($db)."">"; - $lines[] = " <class name="".ucfirst($table)."" table="".$table."">"; - $result = PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); - if ($result) - { - $tableProperties = array(); - while ($row = PMA_DBI_fetch_row($result)) - $tableProperties[] = new TableProperty($row); - foreach ($tableProperties as $tablePropertie) - { - if ($tablePropertie->isPK()) - $lines[] = $tablePropertie->format(" <id name="#ucfirstName#" type="#dotNetObjectType#" unsaved-value="0">\n <column name="#name#" sql-type="#type#" not-null="#notNull#" unique="#unique#" index="PRIMARY"/>\n <generator class="native" />\n </id>"); - else - $lines[] = $tablePropertie->format(" <property name="#ucfirstName#" type="#dotNetObjectType#">\n <column name="#name#" sql-type="#type#" not-null="#notNull#" #indexName#/>\n </property>"); - } - PMA_DBI_free_result($result); - } - $lines[]=" </class>"; - $lines[]="</hibernate-mapping>"; - return implode("\n", $lines); - } + function handleNHibernateCSBody($db, $table, $crlf) + { + $lines=array(); + $result=PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); + if ($result) + { + $tableProperties=array(); + while ($row = PMA_DBI_fetch_row($result)) + $tableProperties[] = new TableProperty($row); + $lines[] = "using System;"; + $lines[] = "using System.Collections;"; + $lines[] = "using System.Collections.Generic;"; + $lines[] = "using System.Text;"; + $lines[] = "namespace ".cgMakeIdentifier($db); + $lines[] = "{"; + $lines[] = " #region ".cgMakeIdentifier($table); + $lines[] = " public class ".cgMakeIdentifier($table); + $lines[] = " {"; + $lines[] = " #region Member Variables"; + foreach ($tableProperties as $tablePropertie) + $lines[] = $tablePropertie->formatCs(" protected #dotNetPrimitiveType# _#name#;"); + $lines[] = " #endregion"; + $lines[] = " #region Constructors"; + $lines[] = " public ".cgMakeIdentifier($table)."() { }"; + $temp = array(); + foreach ($tableProperties as $tablePropertie) + if (! $tablePropertie->isPK()) + $temp[] = $tablePropertie->formatCs("#dotNetPrimitiveType# #name#"); + $lines[] = " public ".cgMakeIdentifier($table)."(".implode(", ", $temp).")"; + $lines[] = " {"; + foreach ($tableProperties as $tablePropertie) + if (! $tablePropertie->isPK()) + $lines[] = $tablePropertie->formatCs(" this._#name#=#name#;"); + $lines[] = " }"; + $lines[] = " #endregion"; + $lines[] = " #region Public Properties"; + foreach ($tableProperties as $tablePropertie) + $lines[] = $tablePropertie->formatCs(" public virtual #dotNetPrimitiveType# #ucfirstName#\n {\n get {return _#name#;}\n set {_#name#=value;}\n }"); + $lines[] = " #endregion"; + $lines[] = " }"; + $lines[] = " #endregion"; + $lines[] = "}"; + PMA_DBI_free_result($result); + } + return implode("\n", $lines); + }
- function cgGetOption($optionName) - { - global $what; - return $GLOBALS[$what . "_" . $optionName]; - } + function handleNHibernateXMLBody($db, $table, $crlf) + { + $lines=array(); + $lines[] = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>"; + $lines[] = "<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" namespace="".cgMakeIdentifier($db)."" assembly="".cgMakeIdentifier($db)."">"; + $lines[] = " <class name="".cgMakeIdentifier($table)."" table="".cgMakeIdentifier($table)."">"; + $result = PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); + if ($result) + { + $tableProperties = array(); + while ($row = PMA_DBI_fetch_row($result)) + $tableProperties[] = new TableProperty($row); + foreach ($tableProperties as $tablePropertie) + { + if ($tablePropertie->isPK()) + $lines[] = $tablePropertie->formatXml(" <id name="#ucfirstName#" type="#dotNetObjectType#" unsaved-value="0">\n <column name="#name#" sql-type="#type#" not-null="#notNull#" unique="#unique#" index="PRIMARY"/>\n <generator class="native" />\n </id>"); + else + $lines[] = $tablePropertie->formatXml(" <property name="#ucfirstName#" type="#dotNetObjectType#">\n <column name="#name#" sql-type="#type#" not-null="#notNull#" #indexName#/>\n </property>"); + } + PMA_DBI_free_result($result); + } + $lines[]=" </class>"; + $lines[]="</hibernate-mapping>"; + return implode("\n", $lines); + } + + function cgGetOption($optionName) + { + global $what; + return $GLOBALS[$what . "_" . $optionName]; + } } ?> diff --git a/libraries/export/xml.php b/libraries/export/xml.php index 9bafb09..83b51ee 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -82,13 +82,14 @@ function PMA_exportFooter() { function PMA_exportHeader() { global $crlf; global $cfg; - global $what; global $db; global $table; global $tables;
- $export_struct = isset($GLOBALS[$what . '_export_struc']) ? true : false; - $export_data = isset($GLOBALS[$what . '_export_contents']) ? true : false; + $export_struct = isset($GLOBALS['xml_export_functions']) || isset($GLOBALS['xml_export_procedures']) + || isset($GLOBALS['xml_export_tables']) || isset($GLOBALS['xml_export_triggers']) + || isset($GLOBALS['xml_export_views']); + $export_data = isset($GLOBALS['xml_export_contents']) ? true : false;
if ($GLOBALS['output_charset_conversion']) { $charset = $GLOBALS['charset_of_file']; @@ -123,7 +124,7 @@ function PMA_exportHeader() { $head .= ' - Structure schemas' . $crlf; $head .= ' -->' . $crlf; $head .= ' pma:structure_schemas' . $crlf; - $head .= ' <pma:database name="' . $db . '" collation="' . $db_collation . '" charset="' . $db_charset . '">' . $crlf; + $head .= ' <pma:database name="' . htmlspecialchars($db) . '" collation="' . $db_collation . '" charset="' . $db_charset . '">' . $crlf;
if (count($tables) == 0) { $tables[] = $table; @@ -142,23 +143,23 @@ function PMA_exportHeader() { $type = 'table'; }
- if ($is_view && ! isset($GLOBALS[$what . '_export_views'])) { + if ($is_view && ! isset($GLOBALS['xml_export_views'])) { continue; }
- if (! $is_view && ! isset($GLOBALS[$what . '_export_tables'])) { + if (! $is_view && ! isset($GLOBALS['xml_export_tables'])) { continue; }
$head .= ' <pma:' . $type . ' name="' . $table . '">' . $crlf;
- $tbl = " " . $tbl; + $tbl = " " . htmlspecialchars($tbl); $tbl = str_replace("\n", "\n ", $tbl);
$head .= $tbl . ';' . $crlf; $head .= ' </pma:' . $type . '>' . $crlf;
- if (isset($GLOBALS[$what . '_export_triggers']) && $GLOBALS[$what . '_export_triggers']) { + if (isset($GLOBALS['xml_export_triggers']) && $GLOBALS['xml_export_triggers']) { // Export triggers $triggers = PMA_DBI_get_triggers($db, $table); if ($triggers) { @@ -168,7 +169,7 @@ function PMA_exportHeader() {
// Do some formatting $code = substr(rtrim($code), 0, -3); - $code = " " . $code; + $code = " " . htmlspecialchars($code); $code = str_replace("\n", "\n ", $code);
$head .= $code . $crlf; @@ -181,7 +182,7 @@ function PMA_exportHeader() { } }
- if (isset($GLOBALS[$what . '_export_functions']) && $GLOBALS[$what . '_export_functions']) { + if (isset($GLOBALS['xml_export_functions']) && $GLOBALS['xml_export_functions']) { // Export functions $functions = PMA_DBI_get_procedures_or_functions($db, 'FUNCTION'); if ($functions) { @@ -191,7 +192,7 @@ function PMA_exportHeader() { // Do some formatting $sql = PMA_DBI_get_definition($db, 'FUNCTION', $function); $sql = rtrim($sql); - $sql = " " . $sql; + $sql = " " . htmlspecialchars($sql); $sql = str_replace("\n", "\n ", $sql);
$head .= $sql . $crlf; @@ -204,7 +205,7 @@ function PMA_exportHeader() { } }
- if (isset($GLOBALS[$what . '_export_procedures']) && $GLOBALS[$what . '_export_procedures']) { + if (isset($GLOBALS['xml_export_procedures']) && $GLOBALS['xml_export_procedures']) { // Export procedures $procedures = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE'); if ($procedures) { @@ -214,7 +215,7 @@ function PMA_exportHeader() { // Do some formatting $sql = PMA_DBI_get_definition($db, 'PROCEDURE', $procedure); $sql = rtrim($sql); - $sql = " " . $sql; + $sql = " " . htmlspecialchars($sql); $sql = str_replace("\n", "\n ", $sql);
$head .= $sql . $crlf; @@ -251,13 +252,12 @@ function PMA_exportHeader() { */ function PMA_exportDBHeader($db) { global $crlf; - global $what;
- if (isset($GLOBALS[$what . '_export_contents']) && $GLOBALS[$what . '_export_contents']) { + if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) { $head = ' <!--' . $crlf . ' - ' . __('Database') . ': ' . (isset($GLOBALS['use_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''). $crlf . ' -->' . $crlf - . ' <database name="' . $db . '">' . $crlf; + . ' <database name="' . htmlspecialchars($db) . '">' . $crlf;
return PMA_exportOutputHandler($head); } @@ -278,9 +278,8 @@ function PMA_exportDBHeader($db) { */ function PMA_exportDBFooter($db) { global $crlf; - global $what;
- if (isset($GLOBALS[$what . '_export_contents']) && $GLOBALS[$what . '_export_contents']) { + if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) { return PMA_exportOutputHandler(' </database>' . $crlf); } else @@ -317,12 +316,12 @@ function PMA_exportDBCreate($db) { * @access public */ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { - global $what; - - if (isset($GLOBALS[$what . '_export_contents']) && $GLOBALS[$what . '_export_contents']) { + + if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) { $result = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
$columns_cnt = PMA_DBI_num_fields($result); + $columns = array(); for ($i = 0; $i < $columns_cnt; $i++) { $columns[$i] = stripslashes(str_replace(' ', '_', PMA_DBI_field_name($result, $i))); } @@ -340,7 +339,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) { if (!isset($record[$i]) || is_null($record[$i])) { $record[$i] = 'NULL'; } - $buffer .= ' <column name="' . $columns[$i] . '">' . htmlspecialchars((string)$record[$i]) + $buffer .= ' <column name="' . htmlspecialchars($columns[$i]) . '">' . htmlspecialchars((string)$record[$i]) . '</column>' . $crlf; } $buffer .= ' </table>' . $crlf; diff --git a/libraries/header.inc.php b/libraries/header.inc.php index a23d2fa..9cc2785 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -124,10 +124,9 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { htmlspecialchars($GLOBALS['db']), __('Database'), 's_db.png'); - // if the table is being dropped, $_REQUEST['purge'] is set - // (it always contains "1") + // if the table is being dropped, $_REQUEST['purge'] is set to '1' // so do not display the table name in upper div - if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']))) { + if (strlen($GLOBALS['table']) && ! (isset($_REQUEST['purge']) && $_REQUEST['purge'] == '1')) { require_once './libraries/tbl_info.inc.php';
echo $separator; diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 08a5b2f..137b83a 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -215,6 +215,8 @@ function PMA_langDetails($lang) { return array('bg|bulgarian', 'bg', 'Български'); case 'bs': return array('bs|bosnian', 'bs', 'Bosanski'); + case 'br': + return array('br|breton', 'br', 'Brezhoneg'); case 'ca': return array('ca|catalan', 'ca', 'Català'); case 'cs': diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 2171560..0c13187 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -360,7 +360,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { $sql_array['raw'] = $sql; $pos = $pos_quote_separator; } - if (class_exists('PMA_Message')) { + if (class_exists('PMA_Message') && $GLOBALS['is_ajax_request'] != true) { PMA_Message::notice(__('Automatically appended backtick to the end of query!'))->display(); } } else { @@ -379,7 +379,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
// Checks for MySQL escaping using a \ // And checks for ANSI escaping using the $quotetype character - if (($pos < $len) && PMA_STR_charIsEscaped($sql, $pos)) { + if (($pos < $len) && PMA_STR_charIsEscaped($sql, $pos) && $c != '`') { $pos ++; continue; } elseif (($pos + 1 < $len) && ($GLOBALS['PMA_substr']($sql, $pos, 1) == $quotetype) && ($GLOBALS['PMA_substr']($sql, $pos + 1, 1) == $quotetype)) { diff --git a/po/af.po b/po/af.po index bf28a23..02eee9b 100644 --- a/po/af.po +++ b/po/af.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@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 c468cd2..17f9824 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-04-21 13:56+0200\n" @@ -3075,42 +3075,42 @@ msgstr ""
#: libraries/config/messages.inc.php:204 msgid "Changes tracking" -msgstr "" +msgstr "تعقب التغيرات"
#: libraries/config/messages.inc.php:205 msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." -msgstr "" +msgstr "تعقب التغيرات الحاصلة على قاعدة البيانات."
#: libraries/config/messages.inc.php:206 msgid "Customize export options" -msgstr "" +msgstr "تخصيص خيارات التصدير"
#: libraries/config/messages.inc.php:208 msgid "Customize import defaults" -msgstr "" +msgstr "تخصيص خيارات الإستيراد"
#: libraries/config/messages.inc.php:209 msgid "Customize navigation frame" -msgstr "" +msgstr "تخصيص اطار التصفح"
#: libraries/config/messages.inc.php:210 msgid "Customize main frame" -msgstr "" +msgstr "تخصيص الإطار الرئيسي"
#: libraries/config/messages.inc.php:211 libraries/config/messages.inc.php:216 #: setup/frames/menu.inc.php:17 msgid "SQL queries" -msgstr "" +msgstr "إستعلام SQL"
#: libraries/config/messages.inc.php:213 msgid "SQL Query box" -msgstr "" +msgstr "صندوق إستعلام SQL"
#: libraries/config/messages.inc.php:214 msgid "Customize links shown in SQL Query boxes" -msgstr "" +msgstr "تخصيص الروابط الموجودة في صندوق إستعلام SQL"
#: libraries/config/messages.inc.php:217 #, fuzzy @@ -3134,19 +3134,19 @@ msgstr ""
#: libraries/config/messages.inc.php:220 msgid "Startup" -msgstr "" +msgstr "بدء التشغيل"
#: libraries/config/messages.inc.php:221 msgid "Customize startup page" -msgstr "" +msgstr "تخصيص صفحة بدء التشغيل"
#: libraries/config/messages.inc.php:222 msgid "Tabs" -msgstr "" +msgstr "التبويبات"
#: libraries/config/messages.inc.php:223 msgid "Choose how you want tabs to work" -msgstr "" +msgstr "إختر الطريقة التي تعمل بها التبويبات"
#: libraries/config/messages.inc.php:224 #, fuzzy @@ -3162,7 +3162,7 @@ msgstr "استخدم حقل نص"
#: libraries/config/messages.inc.php:226 libraries/export/texytext.php:17 msgid "Texy! text" -msgstr "" +msgstr "نص"
#: libraries/config/messages.inc.php:228 #, fuzzy @@ -3172,31 +3172,35 @@ msgstr "تحذير"
#: libraries/config/messages.inc.php:229 msgid "Disable some of the warnings shown by phpMyAdmin" -msgstr "" +msgstr "إلغاء عرض بعض التحذيرات في phpMyAdmin"
#: libraries/config/messages.inc.php:230 msgid "" "Enable [a@http://en.wikipedia.org/wiki/Gzip%5Dgzip%5B/a] compression for import " "and export operations" msgstr "" +"تفعيل ضغط [a@http://en.wikipedia.org/wiki/Gzip%5Dgzip%5B/a] لعمليات التصدير " +"والإستيراد"
#: libraries/config/messages.inc.php:231 msgid "GZip" -msgstr "" +msgstr "GZip"
#: libraries/config/messages.inc.php:232 msgid "Extra parameters for iconv" -msgstr "" +msgstr "مدخلات إضافية لـ iconv"
#: libraries/config/messages.inc.php:233 msgid "" "If enabled, phpMyAdmin continues computing multiple-statement queries even " "if one of the queries failed" msgstr "" +"إذا كان مفعل , فإن phpMyAdmin سوف تستمر في تنفيذ الإستعلامات المتعددة حتى " +"لو فشل بعضها"
#: libraries/config/messages.inc.php:234 msgid "Ignore multiple statement errors" -msgstr "" +msgstr "تجاهل أخطاء الجمل المتعددة"
#: libraries/config/messages.inc.php:235 msgid "" @@ -3207,12 +3211,12 @@ msgstr ""
#: libraries/config/messages.inc.php:236 msgid "Partial import: allow interrupt" -msgstr "" +msgstr "الإستيراد الجزئي: السماح بالمقاطعة"
#: libraries/config/messages.inc.php:241 libraries/config/messages.inc.php:248 #: libraries/import/csv.php:26 libraries/import/ldi.php:39 msgid "Do not abort on INSERT error" -msgstr "" +msgstr "لاتحبط عندما يكون الخطأ في جمل الإدخال INSERT"
#: libraries/config/messages.inc.php:242 libraries/config/messages.inc.php:250 #: libraries/import/csv.php:25 libraries/import/ldi.php:38 @@ -3224,14 +3228,16 @@ msgid "" "Default format; be aware that this list depends on location (database, " "table) and only SQL is always available" msgstr "" +"الهيئة الإفتراضي ; كن مدرك بأن هذه القائمة تعتمد على مكان (قاعدة البيانات " +"والجدول)"
#: libraries/config/messages.inc.php:245 msgid "Format of imported file" -msgstr "" +msgstr "هيئة الملفات المستوردة"
#: libraries/config/messages.inc.php:249 libraries/import/ldi.php:45 msgid "Use LOCAL keyword" -msgstr "" +msgstr "إستعمل الجملة LOCAL"
#: libraries/config/messages.inc.php:252 libraries/config/messages.inc.php:260 #: libraries/config/messages.inc.php:261 @@ -3242,23 +3248,23 @@ msgstr "ضع أسماء الحقول في السطر الأول"
#: libraries/config/messages.inc.php:253 libraries/import/ods.php:27 msgid "Do not import empty rows" -msgstr "" +msgstr "لاتستورد صفوف فارغة"
#: libraries/config/messages.inc.php:254 msgid "Import currencies ($5.00 to 5.00)" -msgstr "" +msgstr "عملات الإستيراد ($5.00 إلى 5.00)"
#: libraries/config/messages.inc.php:255 msgid "Import percentages as proper decimals (12.00% to .12)" -msgstr "" +msgstr "النسبة المئوية للإستيراد كرقم عشري (12.00% إلى .12)"
#: libraries/config/messages.inc.php:256 msgid "Number of queries to skip from start" -msgstr "" +msgstr "عدد الإستعلامات التي يتخطاها من البداية"
#: libraries/config/messages.inc.php:257 msgid "Partial import: skip queries" -msgstr "" +msgstr "إستيراد جزئي: تخطي الإستعلامات"
#: libraries/config/messages.inc.php:259 #, fuzzy @@ -3268,39 +3274,39 @@ msgstr "أضف قيمة AUTO_INCREMENT"
#: libraries/config/messages.inc.php:262 msgid "Initial state for sliders" -msgstr "" +msgstr "الحالة الأولية"
#: libraries/config/messages.inc.php:263 msgid "How many rows can be inserted at one time" -msgstr "" +msgstr "كم عدد الصفوف التي يمكن إدخالها مرة واحدة"
#: libraries/config/messages.inc.php:264 msgid "Number of inserted rows" -msgstr "" +msgstr "عدد الصفوف المدخلة"
#: libraries/config/messages.inc.php:265 msgid "Target for quick access icon" -msgstr "" +msgstr "الهدف لإيقونة الوصول السريع"
#: libraries/config/messages.inc.php:266 msgid "Show logo in left frame" -msgstr "" +msgstr "عرض الشعار في الإطار الأيسر"
#: libraries/config/messages.inc.php:267 msgid "Display logo" -msgstr "" +msgstr "عرض الشعار"
#: libraries/config/messages.inc.php:268 msgid "Display server choice at the top of the left frame" -msgstr "" +msgstr "عرض إختيار الخادم في الجزء العلوي من الإطار الأيسر"
#: libraries/config/messages.inc.php:269 msgid "Display servers selection" -msgstr "" +msgstr "عرض إختيار الخوادم"
#: libraries/config/messages.inc.php:270 msgid "Minimum number of tables to display the table filter box" -msgstr "" +msgstr "اقل عدد جداول تعرض في صندوق تصفية الجداول"
#: libraries/config/messages.inc.php:271 msgid "String that separates databases into different tree levels" @@ -3308,7 +3314,7 @@ msgstr ""
#: libraries/config/messages.inc.php:272 msgid "Database tree separator" -msgstr "" +msgstr "فاصل شجرة قاعدة البيانات"
#: libraries/config/messages.inc.php:273 msgid "" @@ -3318,19 +3324,19 @@ msgstr ""
#: libraries/config/messages.inc.php:274 msgid "Display databases in a tree" -msgstr "" +msgstr "عرض قواعد البيانات في شجرة"
#: libraries/config/messages.inc.php:275 msgid "Disable this if you want to see all databases at once" -msgstr "" +msgstr "تعطيل هذا إذا كنت تريد رؤية قواعد البيانات كلٌ على حدا"
#: libraries/config/messages.inc.php:276 msgid "Use light version" -msgstr "" +msgstr "إستخدم نسخة light"
#: libraries/config/messages.inc.php:277 msgid "Maximum table tree depth" -msgstr "" +msgstr "أقصى عمق لشجرة الجدول"
#: libraries/config/messages.inc.php:278 msgid "String that separates tables into different tree levels" @@ -3338,33 +3344,35 @@ msgstr ""
#: libraries/config/messages.inc.php:279 msgid "Table tree separator" -msgstr "" +msgstr "فاصل شجرة الجدول"
#: libraries/config/messages.inc.php:280 msgid "URL where logo in the navigation frame will point to" -msgstr "" +msgstr "إعمل رابط للمكان الذي يشير اليه الشعار"
#: libraries/config/messages.inc.php:281 msgid "Logo link URL" -msgstr "" +msgstr "رابط الشعار"
#: libraries/config/messages.inc.php:282 msgid "" "Open the linked page in the main window ([kbd]main[/kbd]) or in a new one " "([kbd]new[/kbd])" msgstr "" +"فتح الصفحة المرتبطة في النافذة الرئيسية ([kbd]main[/kbd]) أو في نافذة جديدة " +"([kbd]new[/kbd])"
#: libraries/config/messages.inc.php:283 msgid "Logo link target" -msgstr "" +msgstr "هدف رابط الشعار"
#: libraries/config/messages.inc.php:284 msgid "Highlight server under the mouse cursor" -msgstr "" +msgstr "توضيح الخادم تحت مؤشر الفأرة"
#: libraries/config/messages.inc.php:285 msgid "Enable highlighting" -msgstr "" +msgstr "تفعيل التوضيح (highlighting)"
#: libraries/config/messages.inc.php:286 msgid "Use less graphically intense tabs" @@ -3381,7 +3389,7 @@ msgstr ""
#: libraries/config/messages.inc.php:289 msgid "Limit column characters" -msgstr "" +msgstr "حد أحرف العمود"
#: libraries/config/messages.inc.php:290 msgid "" @@ -3392,17 +3400,17 @@ msgstr ""
#: libraries/config/messages.inc.php:291 msgid "Delete all cookies on logout" -msgstr "" +msgstr "حذف كل الكوكيز عند الخروج"
#: libraries/config/messages.inc.php:292 msgid "" "Define whether the previous login should be recalled or not in cookie " "authentication mode" -msgstr "" +msgstr "تعريف ما إذا كان سوف يتذكر تسجيل الدخول الأخير من تحقق الكوكيز أم لا"
#: libraries/config/messages.inc.php:293 msgid "Recall user name" -msgstr "" +msgstr "تذكر إسم المستخدم"
#: libraries/config/messages.inc.php:294 msgid "" @@ -3418,15 +3426,15 @@ msgstr ""
#: libraries/config/messages.inc.php:296 msgid "Define how long (in seconds) a login cookie is valid" -msgstr "" +msgstr "تحديد كم المدة التي يبقى فيها الكوكيز"
#: libraries/config/messages.inc.php:297 msgid "Login cookie validity" -msgstr "" +msgstr "صلاحية دخول الكوكيز"
#: libraries/config/messages.inc.php:298 msgid "Double size of textarea for LONGTEXT columns" -msgstr "" +msgstr "مضاعفة حجم مربع النص لأعمدة LONGTEXT"
#: libraries/config/messages.inc.php:299 msgid "Bigger textarea for LONGTEXT" diff --git a/po/az.po b/po/az.po index e819b1b..2fb5863 100644 --- a/po/az.po +++ b/po/az.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@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 7859752..4c12a88 100644 --- a/po/be.po +++ b/po/be.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@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@latin.po b/po/be@latin.po index 2316236..6955f65 100644 --- a/po/be@latin.po +++ b/po/be@latin.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@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 c3c1638..3fde37c 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: phpMyAdmin 3.4.3-rc1\n" +"Project-Id-Version: phpMyAdmin 3.4.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-02 08:31+0200\n" "PO-Revision-Date: 2011-03-22 12:51+0200\n" @@ -907,6 +907,9 @@ msgid "" "However on last run no data has been parsed, this usually means phpMyAdmin " "won't be able to finish this import unless you increase php time limits." msgstr "" +"Въпреки това при последното изпълнение никакви данни не постъпиха, това " +"обикновено означава, че phpMyAdmin няма да бъде в състояние да завърши този " +"импорт, освен ако не бъдат увеличени времевите ограничения в PHP."
#: import.php:453 libraries/Message.class.php:185 #: libraries/display_tbl.lib.php:2080 libraries/sql_query_form.lib.php:139 @@ -1132,7 +1135,7 @@ msgstr "Игнориране"
#: js/messages.php:101 msgid "Select referenced key" -msgstr "" +msgstr "Изберете посочвания ключ"
#: js/messages.php:102 msgid "Select Foreign Key" @@ -1440,6 +1443,7 @@ msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." msgstr "" +"Изпратеният файл надхвърля директивата MAX_FILE_SIZE заложена във формата."
#: libraries/File.class.php:316 msgid "The uploaded file was only partially uploaded." @@ -1741,7 +1745,7 @@ msgstr ""
#: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" -msgstr "" +msgstr "неуспешно получаване на типа на BLOB"
#: libraries/blobstreaming.lib.php:347 msgid "View image" @@ -1942,7 +1946,7 @@ msgstr "MySQL отговори: "
#: libraries/common.lib.php:1098 msgid "Failed to connect to SQL validator!" -msgstr "" +msgstr "Неуспешно свързване към SQL валидатора!"
#: libraries/common.lib.php:1139 libraries/config/messages.inc.php:463 msgid "Explain SQL" @@ -1975,11 +1979,11 @@ msgstr "Валидирай SQL-а"
#: libraries/common.lib.php:1265 msgid "Inline edit of this query" -msgstr "" +msgstr "Редакция на заявката на място"
#: libraries/common.lib.php:1267 msgid "Inline" -msgstr "" +msgstr "На място"
#: libraries/common.lib.php:1334 libraries/common.lib.php:1350 msgid "Profiling" @@ -2150,15 +2154,16 @@ msgstr "структура и данни"
#: libraries/config.values.php:99 msgid "Quick - display only the minimal options to configure" -msgstr "" +msgstr "Бързо - показване на минимум опции"
#: libraries/config.values.php:100 msgid "Custom - display all possible options to configure" -msgstr "" +msgstr "Потребителско - показване на всички опции"
#: libraries/config.values.php:101 msgid "Custom - like above, but without the quick/custom choice" msgstr "" +"Потребителско - като горното, но без показване на избор бързо/потребителско"
#: libraries/config.values.php:119 msgid "complete inserts" @@ -2283,6 +2288,8 @@ msgstr "Включване на Ajax" msgid "" "If enabled user can enter any MySQL server in login form for cookie auth" msgstr "" +"Ако е включено потребитлят може да въведе MySQL сървър във формата за " +"удостоверяване с бисквитка"
#: libraries/config/messages.inc.php:20 msgid "Allow login to any MySQL server" @@ -2297,7 +2304,7 @@ msgstr ""
#: libraries/config/messages.inc.php:22 msgid "Allow third party framing" -msgstr "" +msgstr "Позволяване на вграждане в трети сайтове"
#: libraries/config/messages.inc.php:23 msgid "Show "Drop database" link to normal users" @@ -2308,6 +2315,8 @@ msgid "" "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] " "authentication" msgstr "" +"Тайна фраза, използвана за криптиране на бисквитките при [kbd]cookie[/kbd] " +"удоствоверяване"
#: libraries/config/messages.inc.php:25 msgid "Blowfish secret" @@ -2327,7 +2336,7 @@ msgstr "Изпъкване редовете, посочени с мишка"
#: libraries/config/messages.inc.php:29 msgid "Highlight pointer" -msgstr "" +msgstr "Маркиране на показалеца"
#: libraries/config/messages.inc.php:30 msgid "" @@ -2345,6 +2354,9 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" +"Определя какъв вид полета за редакция да бъдат използвани за колони тип CHAR " +"и VARCHAR:[kbd]input[/kbd] - позволява ограничаване по дължина, [kbd]textarea" +"[/kbd] - позволява вмъкването на нови редове"
#: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" @@ -2415,27 +2427,27 @@ msgstr ""
#: libraries/config/messages.inc.php:48 msgid "Tab that is displayed when entering a database" -msgstr "" +msgstr "Показваният подпрозорец при отваряне на БД"
#: libraries/config/messages.inc.php:49 msgid "Default database tab" -msgstr "" +msgstr "Подпрозорец по подразбиране за БД"
#: libraries/config/messages.inc.php:50 msgid "Tab that is displayed when entering a server" -msgstr "" +msgstr "Показваният подпрозорец при отваряне на сървър"
#: libraries/config/messages.inc.php:51 msgid "Default server tab" -msgstr "" +msgstr "Подпрозорец по подразбиране за сървъри"
#: libraries/config/messages.inc.php:52 msgid "Tab that is displayed when entering a table" -msgstr "" +msgstr "Показваният подпрозорец при отваряне на таблица"
#: libraries/config/messages.inc.php:53 msgid "Default table tab" -msgstr "" +msgstr "Подпрозорец по подразбиране за таблици"
#: libraries/config/messages.inc.php:54 msgid "Show binary contents as HEX by default" @@ -2459,11 +2471,11 @@ msgstr ""
#: libraries/config/messages.inc.php:59 msgid "Display servers as a list" -msgstr "" +msgstr "Показване на сървърите в списък"
#: libraries/config/messages.inc.php:60 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "Редактиране на SQL заявки в отделен прозорец"
#: libraries/config/messages.inc.php:61 msgid "Edit in window" @@ -2475,15 +2487,16 @@ msgstr "Показване на грешки"
#: libraries/config/messages.inc.php:63 msgid "Gather errors" -msgstr "" +msgstr "Събиране на грешки"
#: libraries/config/messages.inc.php:64 msgid "Show icons for warning, error and information messages" msgstr "" +"Показване на пиктограми при предупреждения, грешки и информативни съобщения"
#: libraries/config/messages.inc.php:65 msgid "Iconic errors" -msgstr "" +msgstr "Пиктограми при грешките"
#: libraries/config/messages.inc.php:66 msgid "" @@ -2581,7 +2594,7 @@ msgstr "Шаблон за име на таблица" #: libraries/export/latex.php:39 libraries/export/odt.php:31 #: libraries/export/sql.php:77 libraries/export/texytext.php:22 msgid "Dump table" -msgstr "" +msgstr "Схема на таблица"
#: libraries/config/messages.inc.php:90 libraries/export/latex.php:31 msgid "Include table caption" @@ -2618,7 +2631,7 @@ msgstr "Метод за експортиране"
#: libraries/config/messages.inc.php:112 libraries/config/messages.inc.php:114 msgid "Save on server" -msgstr "" +msgstr "Запазване на сървъра"
#: libraries/config/messages.inc.php:113 libraries/config/messages.inc.php:115 #: libraries/display_export.lib.php:195 libraries/display_export.lib.php:221 @@ -3142,7 +3155,7 @@ msgstr ""
#: libraries/config/messages.inc.php:275 msgid "Disable this if you want to see all databases at once" -msgstr "" +msgstr "Изключете ако искате да виждате всички БД наведнъж"
#: libraries/config/messages.inc.php:276 msgid "Use light version" @@ -3184,7 +3197,7 @@ msgstr ""
#: libraries/config/messages.inc.php:285 msgid "Enable highlighting" -msgstr "" +msgstr "Включване на синтактично оцветяване"
#: libraries/config/messages.inc.php:286 msgid "Use less graphically intense tabs" @@ -3301,6 +3314,7 @@ msgid "" "Disable the default warning that is displayed if mcrypt is missing for " "cookie authentication" msgstr "" +"Скрива предупреждението за липсващ mcrypt при удостоверяване с бисквитки"
#: libraries/config/messages.inc.php:312 msgid "mcrypt warning" @@ -3462,7 +3476,7 @@ msgstr ""
#: libraries/config/messages.inc.php:352 msgid "Directory where exports can be saved on server" -msgstr "" +msgstr "Папка на сървъра, в която експортите да бъдат записвани"
#: libraries/config/messages.inc.php:353 msgid "Save directory" @@ -3767,7 +3781,7 @@ msgstr ""
#: libraries/config/messages.inc.php:420 msgid "Add DROP DATABASE" -msgstr "" +msgstr "Добавяне DROP DATABASE"
#: libraries/config/messages.inc.php:421 msgid "" @@ -3777,7 +3791,7 @@ msgstr ""
#: libraries/config/messages.inc.php:422 msgid "Add DROP TABLE" -msgstr "" +msgstr "Добавяне DROP TABLE"
#: libraries/config/messages.inc.php:423 msgid "" @@ -3787,7 +3801,7 @@ msgstr ""
#: libraries/config/messages.inc.php:424 msgid "Add DROP VIEW" -msgstr "" +msgstr "Добавяне DROP VIEW"
#: libraries/config/messages.inc.php:425 msgid "Defines the list of statements the auto-creation uses for new versions." @@ -3868,11 +3882,11 @@ msgstr ""
#: libraries/config/messages.inc.php:442 msgid "Show password change form" -msgstr "" +msgstr "Показване на формуляр за смяна на парола"
#: libraries/config/messages.inc.php:443 msgid "Show create database form" -msgstr "" +msgstr "Показване на формуляр за създаване на БД"
#: libraries/config/messages.inc.php:444 msgid "" @@ -3900,7 +3914,7 @@ msgstr ""
#: libraries/config/messages.inc.php:449 msgid "Show phpinfo() link" -msgstr "" +msgstr "Показване на връзка към phpinfo()"
#: libraries/config/messages.inc.php:450 msgid "Show detailed MySQL server information" @@ -4226,7 +4240,7 @@ msgstr "" #: libraries/config/validate.lib.php:367 #, php-format msgid "Incorrect IP address: %s" -msgstr "" +msgstr "Грешен IP адрес: %s"
#. l10n: Language to use for PHP documentation, please use only languages which do exist in official documentation. #: libraries/core.lib.php:264 @@ -4253,12 +4267,12 @@ msgstr "Име" #: libraries/db_links.inc.php:42 libraries/db_links.inc.php:43 #: libraries/db_links.inc.php:44 msgid "Database seems to be empty!" -msgstr "" +msgstr "БД изглежда празна!"
#: libraries/db_links.inc.php:66 libraries/relation.lib.php:143 #: libraries/tbl_links.inc.php:90 msgid "Tracking" -msgstr "" +msgstr "Проследяване"
#: libraries/db_links.inc.php:71 msgid "Query" @@ -4266,7 +4280,7 @@ msgstr "Запитване по пример"
#: libraries/db_links.inc.php:76 libraries/relation.lib.php:139 msgid "Designer" -msgstr "" +msgstr "Строител"
#: libraries/db_links.inc.php:93 libraries/server_links.inc.php:64 #: server_privileges.php:119 server_privileges.php:1802 @@ -4276,11 +4290,11 @@ msgstr "Привилегии"
#: libraries/db_routines.inc.php:24 libraries/db_routines.inc.php:26 msgid "Routines" -msgstr "" +msgstr "Процедури"
#: libraries/db_routines.inc.php:37 msgid "Return type" -msgstr "" +msgstr "Тип връщани данни"
#: libraries/db_structure.lib.php:48 libraries/display_tbl.lib.php:1929 msgid "" @@ -4362,7 +4376,7 @@ msgstr ""
#: libraries/display_export.lib.php:87 msgid "Exporting databases from the current server" -msgstr "" +msgstr "Експорт на БД от текущия сървър"
#: libraries/display_export.lib.php:89 #, php-format @@ -4380,11 +4394,11 @@ msgstr "Тип на експортирането:"
#: libraries/display_export.lib.php:113 msgid "Quick - display only the minimal options" -msgstr "" +msgstr "Бързо - показване на минимум опции"
#: libraries/display_export.lib.php:129 msgid "Custom - display all possible options" -msgstr "" +msgstr "Потребителско - показване на всички опции"
#: libraries/display_export.lib.php:137 msgid "Database(s):" @@ -4400,7 +4414,7 @@ msgstr "Редове:"
#: libraries/display_export.lib.php:157 msgid "Dump some row(s)" -msgstr "" +msgstr "Схема на няколко реда"
#: libraries/display_export.lib.php:159 msgid "Number of rows:" @@ -4408,7 +4422,7 @@ msgstr "Брой редове:"
#: libraries/display_export.lib.php:162 msgid "Row to begin at:" -msgstr "" +msgstr "Ред започва от:"
#: libraries/display_export.lib.php:173 msgid "Dump all rows" @@ -4453,7 +4467,7 @@ msgstr ""
#: libraries/display_export.lib.php:275 msgid "use this for future exports" -msgstr "" +msgstr "прилагане и към бъдещи експорти"
#: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188 #: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:516 @@ -4484,7 +4498,7 @@ msgstr "bzip-нато"
#: libraries/display_export.lib.php:328 msgid "View output as text" -msgstr "" +msgstr "Показване на изхода като текст"
#: libraries/display_export.lib.php:333 libraries/display_import.lib.php:244 #: libraries/export/codegen.php:37 @@ -4493,7 +4507,7 @@ msgstr "Формат:"
#: libraries/display_export.lib.php:338 msgid "Format-specific options:" -msgstr "" +msgstr "Формат-специфични настройки:"
#: libraries/display_export.lib.php:339 msgid "" @@ -4543,13 +4557,15 @@ msgstr "Файл за импортиране:" #: libraries/display_import.lib.php:156 #, php-format msgid "File may be compressed (%s) or uncompressed." -msgstr "" +msgstr "Файлът може да е компресиран (%s) или некомпресиран"
#: libraries/display_import.lib.php:158 msgid "" "A compressed file's name must end in <b>.[format].[compression]</b>. " "Example: <b>.sql.zip</b>" msgstr "" +"Компресираният файл трябва да завършва на <b>.[format].[compression]</b>. " +"Например: <b>.sql.zip</b>"
#: libraries/display_import.lib.php:178 msgid "File uploads are not allowed on this server." @@ -4723,11 +4739,11 @@ msgstr "Информация за весията"
#: libraries/engines/innodb.lib.php:22 msgid "Data home directory" -msgstr "" +msgstr "Папка с данни"
#: libraries/engines/innodb.lib.php:23 msgid "The common part of the directory path for all InnoDB data files." -msgstr "" +msgstr "Общата част от пътя до папката с всички InnoDB файлове."
#: libraries/engines/innodb.lib.php:26 msgid "Data files" @@ -4771,11 +4787,11 @@ msgstr "страници"
#: libraries/engines/innodb.lib.php:180 msgid "Free pages" -msgstr "" +msgstr "Свободни страници"
#: libraries/engines/innodb.lib.php:186 msgid "Dirty pages" -msgstr "" +msgstr "Мръсни страници"
#: libraries/engines/innodb.lib.php:192 msgid "Pages containing data" @@ -4783,15 +4799,15 @@ msgstr "Страници съдържащи данни"
#: libraries/engines/innodb.lib.php:198 msgid "Pages to be flushed" -msgstr "" +msgstr "Страници за изчистване"
#: libraries/engines/innodb.lib.php:204 msgid "Busy pages" -msgstr "" +msgstr "Заети страници"
#: libraries/engines/innodb.lib.php:213 msgid "Latched pages" -msgstr "" +msgstr "Заключени страници"
#: libraries/engines/innodb.lib.php:224 msgid "Buffer Pool Activity" @@ -4799,27 +4815,27 @@ msgstr ""
#: libraries/engines/innodb.lib.php:228 msgid "Read requests" -msgstr "" +msgstr "Заявки за четене"
#: libraries/engines/innodb.lib.php:234 msgid "Write requests" -msgstr "" +msgstr "Заявки за запис"
#: libraries/engines/innodb.lib.php:240 msgid "Read misses" -msgstr "" +msgstr "Пропуснати прочитания"
#: libraries/engines/innodb.lib.php:246 msgid "Write waits" -msgstr "" +msgstr "Изчаквания за запис"
#: libraries/engines/innodb.lib.php:252 msgid "Read misses in %" -msgstr "" +msgstr "Пропуснати прочитания в %"
#: libraries/engines/innodb.lib.php:260 msgid "Write waits in %" -msgstr "" +msgstr "Изчаквания за запис в %"
#: libraries/engines/myisam.lib.php:22 msgid "Data pointer size" @@ -4946,7 +4962,7 @@ msgstr ""
#: libraries/engines/pbms.lib.php:60 msgid "Metadata Headers" -msgstr "" +msgstr "Заглавки на метаданните"
#: libraries/engines/pbms.lib.php:61 msgid "" @@ -4975,7 +4991,7 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:22 msgid "Index cache size" -msgstr "" +msgstr "Размер на буфера за индекси"
#: libraries/engines/pbxt.lib.php:23 msgid "" @@ -4985,7 +5001,7 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:27 msgid "Record cache size" -msgstr "" +msgstr "Размер на буфера за записи"
#: libraries/engines/pbxt.lib.php:28 msgid "" @@ -4996,7 +5012,7 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:32 msgid "Log cache size" -msgstr "" +msgstr "Размер на буфера на дневника"
#: libraries/engines/pbxt.lib.php:33 msgid "" @@ -5267,7 +5283,7 @@ msgstr "" #: libraries/export/sql.php:107 #, php-format msgid "Add %s statement" -msgstr "" +msgstr "Ново заявление %s"
#: libraries/export/sql.php:91 msgid "Add statements:" @@ -5368,7 +5384,7 @@ msgstr "РЕЛАЦИИ ЗА ТАБЛИЦА" #: libraries/export/sql.php:873 libraries/export/xml.php:38 #: libraries/tbl_triggers.lib.php:18 msgid "Triggers" -msgstr "" +msgstr "Тригери"
#: libraries/export/sql.php:885 #, fuzzy @@ -5950,11 +5966,11 @@ msgstr "Схема на база данни %s - страница %s"
#: libraries/schema/Export_Relation_Schema.class.php:174 msgid "This page does not contain any tables!" -msgstr "" +msgstr "Тази страница не съдържа таблици!"
#: libraries/schema/Export_Relation_Schema.class.php:207 msgid "SCHEMA ERROR: " -msgstr "" +msgstr "ГРЕШКА В СХЕМАТА: "
#: libraries/schema/Pdf_Relation_Schema.class.php:877 #: libraries/schema/Pdf_Relation_Schema.class.php:1116 @@ -5998,7 +6014,7 @@ msgstr "Вътрешни релации"
#: libraries/schema/User_Schema.class.php:116 msgid "FOREIGN KEY" -msgstr "" +msgstr "FOREIGN KEY"
#: libraries/schema/User_Schema.class.php:148 msgid "Please choose a page to edit" @@ -6042,7 +6058,7 @@ msgstr "Всички таблици да бъдат показвани с едн
#: libraries/schema/User_Schema.class.php:389 msgid "Only show keys" -msgstr "" +msgstr "Само ключовете видими"
#: libraries/schema/User_Schema.class.php:391 msgid "Landscape" @@ -6083,7 +6099,7 @@ msgstr "ltr" #: libraries/select_lang.lib.php:502 #, php-format msgid "Unknown language: %1$s." -msgstr "" +msgstr "Непознат език: %1$s."
#: libraries/select_server.lib.php:38 libraries/select_server.lib.php:44 #, fuzzy @@ -6259,7 +6275,7 @@ msgstr "END RAW"
#: libraries/sqlparser.lib.php:364 msgid "Automatically appended backtick to the end of query!" -msgstr "" +msgstr "Автоматично добавяне на апостроф в края на заявката!"
#: libraries/sqlparser.lib.php:367 msgid "Unclosed quote" @@ -6285,12 +6301,12 @@ msgstr ""
#: libraries/tbl_links.inc.php:106 libraries/tbl_links.inc.php:107 msgid "Table seems to be empty!" -msgstr "" +msgstr "Таблицата изглежда празна!"
#: libraries/tbl_links.inc.php:115 #, php-format msgid "Tracking of %s.%s is activated." -msgstr "" +msgstr "Проследяването на %s.%s е активно."
#: libraries/tbl_properties.inc.php:104 msgid "Length/Values" @@ -6350,11 +6366,11 @@ msgstr ""
#: libraries/tbl_properties.inc.php:371 msgid "ENUM or SET data too long?" -msgstr "" +msgstr "Много ENUM или SET данни?"
#: libraries/tbl_properties.inc.php:373 msgid "Get more editing space" -msgstr "" +msgstr "Още място за редакция"
#: libraries/tbl_properties.inc.php:396 #, fuzzy @@ -6365,7 +6381,7 @@ msgstr "Няма"
#: libraries/tbl_properties.inc.php:397 msgid "As defined:" -msgstr "" +msgstr "Дефиниран като:"
#: libraries/tbl_properties.inc.php:516 tbl_structure.php:153 #: tbl_structure.php:157 tbl_structure.php:566 @@ -6511,10 +6527,12 @@ msgid "" "Converts an (IPv4) Internet network address into a string in Internet " "standard dotted format." msgstr "" +"Обръща (IPv4) Интернет мрежови адрес в низ в стандартен Интернет точков " +"формат."
#: libraries/transformations/text_plain__sql.inc.php:9 msgid "Formats text as SQL query with syntax highlighting." -msgstr "" +msgstr "Форматира текст като SQL заявка със синтактично оцветяване."
#: libraries/transformations/text_plain__substr.inc.php:9 msgid "" @@ -6559,6 +6577,8 @@ msgid "" "Your browser has phpMyAdmin configuration for this domain. Would you like to " "import it for current session?" msgstr "" +"Браузърът ви има настройки на phpMyAdmin за този домейн. Искате ли да бъдат " +"използвани за текущата сесия?"
#: libraries/zip_extension.lib.php:25 msgid "No files found inside ZIP archive!" @@ -6622,7 +6642,7 @@ msgstr "Информация за PHP"
#: main.php:213 msgid "Wiki" -msgstr "" +msgstr "Wiki"
#: main.php:216 msgid "Official Homepage" @@ -6636,7 +6656,7 @@ msgstr "Атрибути"
#: main.php:218 msgid "Get support" -msgstr "" +msgstr "Получаване на помощ"
#: main.php:219 #, fuzzy @@ -6663,6 +6683,8 @@ msgid "" "option is incompatible with phpMyAdmin and might cause some data to be " "corrupted!" msgstr "" +"Имате включено mbstring.func_overload в настройките на PHP. Тази опция е " +"несъвместима с phpMyAdmin и може да причини повреда на данни!"
#: main.php:259 msgid "" @@ -6725,6 +6747,8 @@ msgid "" "Server running with Suhosin. Please refer to %sdocumentation%s for possible " "issues." msgstr "" +"Сървърът е с кръпка Suhosin. Прочетете %sдокументацията%s за възможни " +"проблеми."
#: navigation.php:187 server_databases.php:277 server_synchronize.php:1206 msgid "No databases" @@ -6732,7 +6756,7 @@ msgstr "Няма бази от данни"
#: navigation.php:277 msgid "Filter" -msgstr "" +msgstr "Филтър"
#: navigation.php:277 #, fuzzy @@ -6752,11 +6776,11 @@ msgstr "Моля изберете база от данни"
#: pmd_general.php:74 msgid "Show/Hide left menu" -msgstr "" +msgstr "Скриване/Показване на лявото меню"
#: pmd_general.php:78 msgid "Save position" -msgstr "" +msgstr "Запазване на позицията"
#: pmd_general.php:81 server_synchronize.php:428 server_synchronize.php:871 #, fuzzy @@ -6765,15 +6789,15 @@ msgstr "Създай нова Страница"
#: pmd_general.php:84 pmd_general.php:352 msgid "Create relation" -msgstr "" +msgstr "Създаване на отношение"
#: pmd_general.php:90 msgid "Reload" -msgstr "" +msgstr "Презареждане"
#: pmd_general.php:93 msgid "Help" -msgstr "" +msgstr "Помощ"
#: pmd_general.php:97 msgid "Angular links" @@ -6825,7 +6849,7 @@ msgstr "Брой полета"
#: pmd_general.php:418 msgid "Delete relation" -msgstr "" +msgstr "Изтриване на отношение"
#: pmd_general.php:460 pmd_general.php:519 #, fuzzy @@ -6878,7 +6902,7 @@ msgstr "Опции на таблицата"
#: pmd_help.php:26 msgid "To select relation, click :" -msgstr "" +msgstr "За избор на отношение, щракнете:"
#: pmd_help.php:28 msgid "" @@ -6893,7 +6917,7 @@ msgstr "Страница беше създадена"
#: pmd_pdf.php:37 msgid "Page creation failed" -msgstr "" +msgstr "Неуспешно създаване на страница"
#: pmd_pdf.php:89 msgid "Page" @@ -6919,7 +6943,7 @@ msgstr "Създай нов индекс"
#: pmd_pdf.php:111 msgid "New page name: " -msgstr "" +msgstr "Име: "
#: pmd_pdf.php:114 msgid "Export/Import to scale" @@ -6927,19 +6951,19 @@ msgstr ""
#: pmd_pdf.php:119 msgid "recommended" -msgstr "" +msgstr "препоръчително"
#: pmd_relation_new.php:29 msgid "Error: relation already exists." -msgstr "" +msgstr "Грешка: Зависимостта вече съществува."
#: pmd_relation_new.php:61 pmd_relation_new.php:86 msgid "Error: Relation not added." -msgstr "" +msgstr "Грешка: Зависимостта не е добавена."
#: pmd_relation_new.php:62 msgid "FOREIGN KEY relation added" -msgstr "" +msgstr "FOREIGN KEY зависимост е добавена"
#: pmd_relation_new.php:84 #, fuzzy @@ -6953,7 +6977,7 @@ msgstr "Преглед на релациите"
#: pmd_save_pos.php:44 msgid "Error saving coordinates for Designer." -msgstr "" +msgstr "Грешка при запазване на координатите в Строител."
#: pmd_save_pos.php:52 msgid "Modifications have been saved" @@ -6961,7 +6985,7 @@ msgstr "Промените бяха съхранени"
#: prefs_forms.php:78 msgid "Cannot save settings, submitted form contains errors" -msgstr "" +msgstr "Промените не бяха запазени, изпратения формуляр съдържа грешки."
#: prefs_manage.php:80 msgid "Could not import configuration" @@ -6969,15 +6993,15 @@ msgstr "Конфигурацията не може да бъде импорти
#: prefs_manage.php:112 msgid "Configuration contains incorrect data for some fields." -msgstr "" +msgstr "Конфигурацията съдържа грешни данни за някои ключове."
#: prefs_manage.php:128 msgid "Do you want to import remaining settings?" -msgstr "" +msgstr "Искате ли да импортирате оставащите настройки?"
#: prefs_manage.php:225 prefs_manage.php:251 msgid "Saved on: @DATE@" -msgstr "" +msgstr "Записан на: @DATE@"
#: prefs_manage.php:239 #, fuzzy @@ -6995,7 +7019,7 @@ msgstr "Настройки ще бъдат импортирани от лока
#: prefs_manage.php:254 msgid "You have no saved settings!" -msgstr "" +msgstr "Нямате запазени настройки!"
#: prefs_manage.php:258 prefs_manage.php:312 msgid "This feature is not supported by your web browser" @@ -7020,7 +7044,7 @@ msgstr "Запис в хранилището на браузъра"
#: prefs_manage.php:306 msgid "Settings will be saved in your browser's local storage." -msgstr "" +msgstr "Настройките ще бъдат запазени в хранилището на вашия браузър"
#: prefs_manage.php:308 msgid "Existing settings will be overwritten!" @@ -7106,11 +7130,11 @@ msgstr "Статистика за базите данни" #: server_databases.php:183 server_replication.php:179 #: server_replication.php:207 msgid "Master replication" -msgstr "" +msgstr "Главен сървър"
#: server_databases.php:185 server_replication.php:246 msgid "Slave replication" -msgstr "" +msgstr "Подчинен сървър"
#: server_databases.php:268 server_databases.php:269 msgid "Enable Statistics" @@ -7624,6 +7648,8 @@ msgid "" "This server is not configured as master in a replication process. Would you " "like to <a href="%s">configure</a> it?" msgstr "" +"Този сървър не е настроен като главен в репликация. Желаете ли да го <a href=" +""%s">настроите</a>?"
#: server_replication.php:215 msgid "Master configuration" @@ -7682,11 +7708,11 @@ msgstr ""
#: server_replication.php:309 msgid "Synchronize databases with master" -msgstr "" +msgstr "Синхронизиране на БД с главен"
#: server_replication.php:320 msgid "Control slave:" -msgstr "" +msgstr "Контролиране на подчинения:"
#: server_replication.php:323 #, fuzzy @@ -7695,47 +7721,49 @@ msgstr "Пълнотекстово"
#: server_replication.php:323 msgid "Full stop" -msgstr "" +msgstr "Пълно спиране"
#: server_replication.php:324 msgid "Reset slave" -msgstr "" +msgstr "Нулиране на подчинения"
#: server_replication.php:326 msgid "Start SQL Thread only" -msgstr "" +msgstr "Пускане само на SQL нишка"
#: server_replication.php:328 msgid "Stop SQL Thread only" -msgstr "" +msgstr "Спиране само на SQL нишка"
#: server_replication.php:331 msgid "Start IO Thread only" -msgstr "" +msgstr "Пускане само на В/И нишка"
#: server_replication.php:333 msgid "Stop IO Thread only" -msgstr "" +msgstr "Спиране само на В/И нишка"
#: server_replication.php:338 msgid "Error management:" -msgstr "" +msgstr "Обработка на грешки:"
#: server_replication.php:340 msgid "Skipping errors might lead into unsynchronized master and slave!" msgstr "" +"Прескачане на грешки може да доведе до десинхронизация между главния и " +"подчинените сървъри!"
#: server_replication.php:342 msgid "Skip current error" -msgstr "" +msgstr "Прескачане на текущата"
#: server_replication.php:343 msgid "Skip next" -msgstr "" +msgstr "Прескачане на следващата"
#: server_replication.php:346 msgid "errors." -msgstr "" +msgstr "грешки."
#: server_replication.php:361 #, php-format @@ -7743,6 +7771,8 @@ msgid "" "This server is not configured as slave in a replication process. Would you " "like to <a href="%s">configure</a> it?" msgstr "" +"Този сървър не е настроен като подчинен в репликация. Желаете ли да го <a " +"href="%s">настроите</a>?"
#: server_status.php:46 msgid "" @@ -8047,7 +8077,7 @@ msgstr ""
#: server_status.php:106 msgid "The number of rows deleted from InnoDB tables." -msgstr "" +msgstr "Броят изтрити редове от InnoDB таблици."
#: server_status.php:107 #, fuzzy @@ -8056,7 +8086,7 @@ msgstr "Брой заявки за вмъкване на ред в таблиц
#: server_status.php:108 msgid "The number of rows read from InnoDB tables." -msgstr "" +msgstr "Броят прочетени редове от InnoDB таблици."
#: server_status.php:109 #, fuzzy @@ -8138,7 +8168,7 @@ msgstr ""
#: server_status.php:124 msgid "The amount of free memory for query cache." -msgstr "" +msgstr "Количеството свободна памет за буфер за заявки."
#: server_status.php:125 #, fuzzy @@ -8147,7 +8177,7 @@ msgstr "Брой на сортираните редове."
#: server_status.php:126 msgid "The number of queries added to the cache." -msgstr "" +msgstr "Броят заявки добавени към буфера."
#: server_status.php:127 msgid "" @@ -8165,11 +8195,11 @@ msgstr ""
#: server_status.php:129 msgid "The number of queries registered in the cache." -msgstr "" +msgstr "Броят заявки регистрирани в буфера."
#: server_status.php:130 msgid "The total number of blocks in the query cache." -msgstr "" +msgstr "Общият брой блокове в буфера за заявки."
#: server_status.php:131 msgctxt "$strShowStatusReset" @@ -8346,7 +8376,7 @@ msgstr ""
#: server_status.php:415 msgid "Flush query cache" -msgstr "" +msgstr "Изчистване на буфера за заявки"
#: server_status.php:420 msgid "Show processes" @@ -8480,79 +8510,79 @@ msgstr ""
#: server_synchronize.php:263 msgid "Structure Synchronization" -msgstr "" +msgstr "Синхронизиране на структурата"
#: server_synchronize.php:270 msgid "Data Synchronization" -msgstr "" +msgstr "Синхронизиране на данните"
#: server_synchronize.php:399 server_synchronize.php:838 msgid "not present" -msgstr "" +msgstr "не съществува"
#: server_synchronize.php:423 server_synchronize.php:866 msgid "Structure Difference" -msgstr "" +msgstr "Структурни различия"
#: server_synchronize.php:424 server_synchronize.php:867 msgid "Data Difference" -msgstr "" +msgstr "Различия в данните"
#: server_synchronize.php:429 server_synchronize.php:872 msgid "Add column(s)" -msgstr "" +msgstr "Добавяне на колона(и)"
#: server_synchronize.php:430 server_synchronize.php:873 msgid "Remove column(s)" -msgstr "" +msgstr "Изтриване на колона(и)"
#: server_synchronize.php:431 server_synchronize.php:874 msgid "Alter column(s)" -msgstr "" +msgstr "Промяна на колона(и)"
#: server_synchronize.php:432 server_synchronize.php:875 msgid "Remove index(s)" -msgstr "" +msgstr "Изтриване на индекс(и)"
#: server_synchronize.php:433 server_synchronize.php:876 msgid "Apply index(s)" -msgstr "" +msgstr "Добавяне на индекс(и)"
#: server_synchronize.php:434 server_synchronize.php:877 msgid "Update row(s)" -msgstr "" +msgstr "Обновяване на � _synchronize.php:877 �та"