Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into server_refactor2
This commit is contained in:
xmujay
commit
0aeead0d7c
@ -377,6 +377,11 @@ function PMA_getSqlQueryAndCreateDbBeforeCopy()
|
||||
$GLOBALS['dbi']->query($local_query);
|
||||
$GLOBALS['db'] = $original_db;
|
||||
|
||||
// Set the SQL mode to NO_AUTO_VALUE_ON_ZERO to prevent MySQL from creating
|
||||
// export statements it cannot import
|
||||
$sql_set_mode = "SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO'";
|
||||
PMA_DBI_query($sql_set_mode);
|
||||
|
||||
// rebuild the database list because PMA_Table::moveCopy
|
||||
// checks in this list if the target db exists
|
||||
$GLOBALS['pma']->databases->build();
|
||||
|
||||
70
libraries/server_status_advisor.lib.php
Normal file
70
libraries/server_status_advisor.lib.php
Normal file
@ -0,0 +1,70 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
|
||||
/**
|
||||
* functions for displaying server status sub item: advisor
|
||||
*
|
||||
* @usedby server_status_advisor.php
|
||||
*
|
||||
* @package PhpMyAdmin
|
||||
*/
|
||||
if (! defined('PHPMYADMIN')) {
|
||||
exit;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns html with Advisor
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
function PMA_getHtmlForAdvisor()
|
||||
{
|
||||
$output = '<a href="#openAdvisorInstructions">';
|
||||
$output .= PMA_Util::getIcon('b_help.png', __('Instructions'));
|
||||
$output .= '</a>';
|
||||
$output .= '<div id="statustabs_advisor"></div>';
|
||||
$output .= '<div id="advisorInstructionsDialog" style="display:none;">';
|
||||
$output .= '<p>';
|
||||
$output .= __(
|
||||
'The Advisor system can provide recommendations '
|
||||
. 'on server variables by analyzing the server status variables.'
|
||||
);
|
||||
$output .= '</p>';
|
||||
$output .= '<p>';
|
||||
$output .= __(
|
||||
'Do note however that this system provides recommendations '
|
||||
. 'based on simple calculations and by rule of thumb which may '
|
||||
. 'not necessarily apply to your system.'
|
||||
);
|
||||
$output .= '</p>';
|
||||
$output .= '<p>';
|
||||
$output .= __(
|
||||
'Prior to changing any of the configuration, be sure to know '
|
||||
. 'what you are changing (by reading the documentation) and how '
|
||||
. 'to undo the change. Wrong tuning can have a very negative '
|
||||
. 'effect on performance.'
|
||||
);
|
||||
$output .= '</p>';
|
||||
$output .= '<p>';
|
||||
$output .= __(
|
||||
'The best way to tune your system would be to change only one '
|
||||
. 'setting at a time, observe or benchmark your database, and undo '
|
||||
. 'the change if there was no clearly measurable improvement.'
|
||||
);
|
||||
$output .= '</p>';
|
||||
$output .= '</div>';
|
||||
$output .= '<div id="advisorData" style="display:none;">';
|
||||
$advisor = new Advisor();
|
||||
$output .= htmlspecialchars(
|
||||
json_encode(
|
||||
$advisor->run()
|
||||
)
|
||||
);
|
||||
$output .= '</div>';
|
||||
|
||||
return $output;
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
|
||||
@ -69,7 +69,6 @@ function PMA_getTableNameBySQL($sql, $tables)
|
||||
* @param array $sql_data information about SQL statement
|
||||
* @param string $goto URL to go back in case of errors
|
||||
* @param string $pmaThemeImage path for theme images directory
|
||||
* @param string $text_dir text direction
|
||||
* @param string $printview whether printview is enabled
|
||||
* @param string $url_query URL query
|
||||
* @param array $disp_mode the display mode
|
||||
@ -80,7 +79,7 @@ function PMA_getTableNameBySQL($sql, $tables)
|
||||
*/
|
||||
function PMA_getTableHtmlForMultipleQueries(
|
||||
$displayResultsObject, $db, $sql_data, $goto, $pmaThemeImage,
|
||||
$text_dir, $printview, $url_query, $disp_mode, $sql_limit_to_append,
|
||||
$printview, $url_query, $disp_mode, $sql_limit_to_append,
|
||||
$editable
|
||||
) {
|
||||
$table_html = '';
|
||||
@ -187,8 +186,8 @@ function PMA_getTableHtmlForMultipleQueries(
|
||||
$displayResultsObject->setProperties(
|
||||
$unlim_num_rows, $fields_meta, $is_count, $is_export, $is_func,
|
||||
$is_analyse, $num_rows, $fields_cnt, $querytime, $pmaThemeImage,
|
||||
$text_dir, $is_maint, $is_explain, $is_show, $showtable,
|
||||
$printview, $url_query, $editable
|
||||
$GLOBALS['text_dir'], $is_maint, $is_explain, $is_show,
|
||||
$showtable, $printview, $url_query, $editable
|
||||
);
|
||||
}
|
||||
|
||||
@ -1808,7 +1807,6 @@ function PMA_getBookmarkCreatedMessage()
|
||||
* @param string $db current database
|
||||
* @param string $goto goto page url
|
||||
* @param string $pmaThemeImage theme image uri
|
||||
* @param string $text_dir text directory
|
||||
* @param string $url_query url query
|
||||
* @param string $disp_mode display mode
|
||||
* @param string $sql_limit_to_append sql limit to append
|
||||
@ -1819,21 +1817,22 @@ function PMA_getBookmarkCreatedMessage()
|
||||
* @param object $result result of the executed query
|
||||
* @param int $querytime query execution time
|
||||
* @param array $analyzed_sql_results analyzed sql results
|
||||
* @param bool $is_procedure whether it is a procedure call or not
|
||||
*
|
||||
* @return type
|
||||
*/
|
||||
function PMA_getHtmlForSqlQueryResultsTable($sql_data, $displayResultsObject, $db,
|
||||
$goto, $pmaThemeImage, $text_dir, $url_query, $disp_mode, $sql_limit_to_append,
|
||||
$goto, $pmaThemeImage, $url_query, $disp_mode, $sql_limit_to_append,
|
||||
$editable, $unlim_num_rows, $num_rows, $showtable, $result, $querytime,
|
||||
$analyzed_sql_results, $is_procedure
|
||||
$analyzed_sql_results
|
||||
) {
|
||||
$printview = isset($_REQUEST['printview']) ? $_REQUEST['printview'] : null;
|
||||
if (! empty($sql_data) && ($sql_data['valid_queries'] > 1) || $is_procedure) {
|
||||
if (! empty($sql_data) && ($sql_data['valid_queries'] > 1)
|
||||
|| $analyzed_sql_results['is_procedure']
|
||||
) {
|
||||
$_SESSION['is_multi_query'] = true;
|
||||
$table_html = PMA_getTableHtmlForMultipleQueries(
|
||||
$displayResultsObject, $db, $sql_data, $goto,
|
||||
$pmaThemeImage, $text_dir, $printview, $url_query,
|
||||
$pmaThemeImage, $printview, $url_query,
|
||||
$disp_mode, $sql_limit_to_append, $editable
|
||||
);
|
||||
} else {
|
||||
@ -1846,7 +1845,7 @@ function PMA_getHtmlForSqlQueryResultsTable($sql_data, $displayResultsObject, $d
|
||||
$unlim_num_rows, $fields_meta, $analyzed_sql_results['is_count'],
|
||||
$analyzed_sql_results['is_export'], $analyzed_sql_results['is_func'],
|
||||
$analyzed_sql_results['is_analyse'], $num_rows,
|
||||
$fields_cnt, $querytime, $pmaThemeImage, $text_dir,
|
||||
$fields_cnt, $querytime, $pmaThemeImage, $GLOBALS['text_dir'],
|
||||
$analyzed_sql_results['is_maint'], $analyzed_sql_results['is_explain'],
|
||||
$analyzed_sql_results['is_show'], $showtable, $printview, $url_query,
|
||||
$editable
|
||||
@ -1964,4 +1963,174 @@ function PMA_getHtmlForPrintButton()
|
||||
|
||||
return $print_button_html;
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to display results when the executed query returns non empty results
|
||||
*
|
||||
* @param array $result executed query results
|
||||
* @param bool $justBrowsing whether just browsing or not
|
||||
* @param array $analyzed_sql_results analysed sql results
|
||||
* @param string $db current database
|
||||
* @param string $table current table
|
||||
* @param string $disp_mode display mode
|
||||
* @param string $message message to show
|
||||
* @param array $sql_data sql data
|
||||
* @param object $displayResultsObject Instance of DisplyResults.class
|
||||
* @param string $goto goto page url
|
||||
* @param string $pmaThemeImage uri of the theme image
|
||||
* @param string $sql_limit_to_append sql limit to append
|
||||
* @param int $unlim_num_rows unlimited number of rows
|
||||
* @param int $num_rows number of rows
|
||||
* @param int $querytime query time
|
||||
* @param string $full_sql_query full sql query
|
||||
* @param string $disp_query display query
|
||||
* @param string $disp_message display message
|
||||
* @param array $profiling_results profiling results
|
||||
* @param string $query_type query type
|
||||
* @param bool $selected selected
|
||||
* @param string $sql_query sql query
|
||||
* @param string $complete_query complete sql query
|
||||
* @param array $cfg configuration
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
function PMA_sendResponseForResultsReturned($result, $justBrowsing,
|
||||
$analyzed_sql_results, $db, $table, $disp_mode, $message, $sql_data,
|
||||
$displayResultsObject, $goto, $pmaThemeImage, $sql_limit_to_append,
|
||||
$unlim_num_rows, $num_rows, $querytime, $full_sql_query, $disp_query,
|
||||
$disp_message, $profiling_results, $query_type, $selected, $sql_query,
|
||||
$complete_query, $cfg
|
||||
) {
|
||||
// If we are retrieving the full value of a truncated field or the original
|
||||
// value of a transformed field, show it here
|
||||
if (isset($_REQUEST['grid_edit']) && $_REQUEST['grid_edit'] == true) {
|
||||
PMA_sendResponseForGridEdit($result);
|
||||
}
|
||||
|
||||
// Gets the list of fields properties
|
||||
if (isset($result) && $result) {
|
||||
$fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
|
||||
}
|
||||
|
||||
// Should be initialized these parameters before parsing
|
||||
$showtable = isset($showtable) ? $showtable : null;
|
||||
$url_query = isset($url_query) ? $url_query : null;
|
||||
|
||||
$response = PMA_Response::getInstance();
|
||||
$header = $response->getHeader();
|
||||
$scripts = $header->getScripts();
|
||||
|
||||
// hide edit and delete links:
|
||||
// - for information_schema
|
||||
// - if the result set does not contain all the columns of a unique key
|
||||
// and we are not just browing all the columns of an updatable view
|
||||
$updatableView
|
||||
= $justBrowsing
|
||||
&& trim($analyzed_sql_results['analyzed_sql'][0]['select_expr_clause']) == '*'
|
||||
&& PMA_Table::isUpdatableView($db, $table);
|
||||
|
||||
$has_unique = PMA_resultSetContainsUniqueKey(
|
||||
$db, $table, $fields_meta
|
||||
);
|
||||
|
||||
$editable = $has_unique || $updatableView;
|
||||
|
||||
// Displays the results in a table
|
||||
if (empty($disp_mode)) {
|
||||
// see the "PMA_setDisplayMode()" function in
|
||||
// libraries/DisplayResults.class.php
|
||||
$disp_mode = 'urdr111101';
|
||||
}
|
||||
if (!empty($table) && ($GLOBALS['dbi']->isSystemSchema($db) || !$editable)) {
|
||||
$disp_mode = 'nnnn110111';
|
||||
}
|
||||
if ( isset($_REQUEST['printview']) && $_REQUEST['printview'] == '1') {
|
||||
$disp_mode = 'nnnn000000';
|
||||
}
|
||||
|
||||
if (isset($_REQUEST['table_maintenance'])) {
|
||||
$scripts->addFile('makegrid.js');
|
||||
$scripts->addFile('sql.js');
|
||||
if (isset($message)) {
|
||||
$message = PMA_Message::success($message);
|
||||
$table_maintenance_html = PMA_Util::getMessage(
|
||||
$message, $GLOBALS['sql_query'], 'success'
|
||||
);
|
||||
}
|
||||
$table_maintenance_html .= PMA_getHtmlForSqlQueryResultsTable(
|
||||
isset($sql_data) ? $sql_data : null, $displayResultsObject, $db, $goto,
|
||||
$pmaThemeImage, $url_query, $disp_mode, $sql_limit_to_append,
|
||||
false, $unlim_num_rows, $num_rows, $showtable, $result, $querytime,
|
||||
$analyzed_sql_results, false
|
||||
);
|
||||
if (empty($sql_data) || ($sql_data['valid_queries'] = 1)) {
|
||||
$response->addHTML($table_maintenance_html);
|
||||
exit();
|
||||
}
|
||||
}
|
||||
|
||||
if (!isset($_REQUEST['printview']) || $_REQUEST['printview'] != '1') {
|
||||
$scripts->addFile('makegrid.js');
|
||||
$scripts->addFile('sql.js');
|
||||
unset($message);
|
||||
//we don't need to buffer the output in getMessage here.
|
||||
//set a global variable and check against it in the function
|
||||
$GLOBALS['buffer_message'] = false;
|
||||
}
|
||||
|
||||
$print_view_header_html = PMA_getHtmlForPrintViewHeader(
|
||||
$db, $full_sql_query, $num_rows
|
||||
);
|
||||
|
||||
$previous_update_query_html = PMA_getHtmlForPreviousUpdateQuery(
|
||||
isset($disp_query) ? $disp_query : null,
|
||||
$cfg['ShowSQL'], isset($sql_data) ? $sql_data : null,
|
||||
isset($disp_message) ? $disp_message : null
|
||||
);
|
||||
|
||||
$profiling_chart_html = PMA_getHtmlForProfilingChart(
|
||||
$disp_mode, $db, isset($profiling_results) ? $profiling_results : null
|
||||
);
|
||||
|
||||
$missing_unique_column_msg = PMA_getMessageIfMissingColumnIndex(
|
||||
$table, $db, $editable, $disp_mode
|
||||
);
|
||||
|
||||
$bookmark_created_msg = PMA_getBookmarkCreatedMessage();
|
||||
|
||||
$table_html = PMA_getHtmlForSqlQueryResultsTable(
|
||||
isset($sql_data) ? $sql_data : null, $displayResultsObject, $db, $goto,
|
||||
$pmaThemeImage, $url_query, $disp_mode, $sql_limit_to_append,
|
||||
$editable, $unlim_num_rows, $num_rows, $showtable, $result, $querytime,
|
||||
$analyzed_sql_results
|
||||
);
|
||||
|
||||
$indexes_problems_html = PMA_getHtmlForIndexesProblems(
|
||||
isset($query_type) ? $query_type : null,
|
||||
isset($selected) ? $selected : null
|
||||
);
|
||||
|
||||
$bookmark_support_html = PMA_getHtmlForBookmark(
|
||||
$disp_mode, isset($cfg['Bookmark']) ? $cfg['Bookmark'] : '', $sql_query,
|
||||
$db, $table, isset($complete_query) ? $complete_query : $sql_query,
|
||||
$cfg['Bookmark']['user']
|
||||
);
|
||||
|
||||
$print_button_html = PMA_getHtmlForPrintButton();
|
||||
|
||||
$html_output = isset($table_maintenance_html) ? $table_maintenance_html : '';
|
||||
|
||||
$html_output .= isset($print_view_header_html) ? $print_view_header_html : '';
|
||||
|
||||
$html_output .= PMA_getHtmlForSqlQueryResults(
|
||||
$previous_update_query_html, $profiling_chart_html,
|
||||
$missing_unique_column_msg, $bookmark_created_msg,
|
||||
$table_html, $indexes_problems_html, $bookmark_support_html,
|
||||
$print_button_html
|
||||
);
|
||||
|
||||
$response->addHTML($html_output);
|
||||
|
||||
exit();
|
||||
}
|
||||
?>
|
||||
|
||||
@ -1667,7 +1667,7 @@ function PMA_SQP_analyze($arr)
|
||||
$in_limit = false;
|
||||
$after_limit = true;
|
||||
|
||||
// for the presnece of PROCEDURE ANALYSE
|
||||
// for the presence of PROCEDURE ANALYSE
|
||||
if (isset($subresult['queryflags']['select_from'])
|
||||
&& $subresult['queryflags']['select_from'] == 1
|
||||
&& ($i + 1) < $size
|
||||
@ -1678,7 +1678,7 @@ function PMA_SQP_analyze($arr)
|
||||
}
|
||||
}
|
||||
|
||||
// for the presnece of INTO OUTFILE
|
||||
// for the presence of INTO OUTFILE
|
||||
if ($upper_data == 'INTO'
|
||||
&& isset($subresult['queryflags']['select_from'])
|
||||
&& $subresult['queryflags']['select_from'] == 1
|
||||
|
||||
22
po/be.po
22
po/be.po
@ -4,17 +4,17 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2012-12-13 13:06+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:30+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Belarusian <http://l10n.cihar.com/projects/phpmyadmin/master/"
|
||||
"be/>\n"
|
||||
"Language-Team: Belarusian "
|
||||
"<http://l10n.cihar.com/projects/phpmyadmin/master/be/>\n"
|
||||
"Language: be\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
|
||||
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
"X-Generator: Weblate 1.4-dev\n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
|
||||
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
"X-Generator: Weblate 1.6-dev\n"
|
||||
|
||||
#: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:339
|
||||
#: libraries/DisplayResults.class.php:813
|
||||
@ -3130,7 +3130,7 @@ msgstr "Першасны ключ быў выдалены"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Індэкс %s быў выдалены"
|
||||
msgstr "Індэкс %s быў выдалены."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -4092,7 +4092,7 @@ msgstr "тэчка вэб-сэрвэра для загрузкі файлаў"
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Немагчыма адкрыць пазначаную вамі тэчку для загрузкі файлаў"
|
||||
msgstr "Немагчыма адкрыць пазначаную вамі тэчку для загрузкі файлаў."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -8339,7 +8339,7 @@ msgstr ""
|
||||
msgid "No activity within %s seconds; please log in again."
|
||||
msgstr ""
|
||||
"Не было аніякай актыўнасьці на працягу %s сэкундаў. Калі ласка, увайдзіце "
|
||||
"зноў"
|
||||
"зноў."
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:667
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:669
|
||||
@ -8364,7 +8364,7 @@ msgstr "Файл %s ня ўтрымлівае ніякага ідэнтыфік
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
|
||||
msgid "Hardware authentication failed!"
|
||||
msgstr "Апаратная аўтэнтыфікацыя скончылася няўдала"
|
||||
msgstr "Апаратная аўтэнтыфікацыя скончылася няўдала!"
|
||||
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
|
||||
msgid "No valid authentication key plugged"
|
||||
@ -11749,7 +11749,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Здаецца, ваш SQL-запыт утрымлівае памылку. Паведамленьне пра памылку сэрвэра "
|
||||
"MySQL прыведзенае ніжэй, магчыма, таксама дапаможа вам высьветліць прычыну "
|
||||
"памылкі"
|
||||
"памылкі."
|
||||
|
||||
#: libraries/sqlparser.lib.php:178
|
||||
msgid ""
|
||||
|
||||
18
po/bg.po
18
po/bg.po
@ -4,10 +4,10 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-07-12 14:47+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:14+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Bulgarian <http://l10n.cihar.com/projects/phpmyadmin/master/"
|
||||
"bg/>\n"
|
||||
"Language-Team: Bulgarian "
|
||||
"<http://l10n.cihar.com/projects/phpmyadmin/master/bg/>\n"
|
||||
"Language: bg\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -1683,7 +1683,7 @@ msgstr "Добавяне %d стойност(и)"
|
||||
#: js/messages.php:259
|
||||
msgid ""
|
||||
"Note: If the file contains multiple tables, they will be combined into one."
|
||||
msgstr "Заб.: Ако файлът съдържа няколко таблици, те ще бъдат обединени"
|
||||
msgstr "Заб.: Ако файлът съдържа няколко таблици, те ще бъдат обединени."
|
||||
|
||||
#: js/messages.php:262
|
||||
msgid "Hide query box"
|
||||
@ -2882,7 +2882,7 @@ msgstr "Главният ключ беше изтрит"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Индекс %s беше изтрит"
|
||||
msgstr "Индекс %s беше изтрит."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -3805,7 +3805,7 @@ msgstr "Избор от директорията за качване <b>%s</b>:"
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Папката, която сте указали за качване е недостъпна"
|
||||
msgstr "Папката, която сте указали за качване е недостъпна."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -7869,7 +7869,7 @@ msgstr "Входът без парола е забранен от конфигу
|
||||
#: libraries/plugins/auth/AuthenticationSignon.class.php:254
|
||||
#, php-format
|
||||
msgid "No activity within %s seconds; please log in again."
|
||||
msgstr "Няма активност през последните %s секунди; моля влезте отново"
|
||||
msgstr "Няма активност през последните %s секунди; моля влезте отново."
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:667
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:669
|
||||
@ -7893,7 +7893,7 @@ msgstr "Файлът %s не съдържа идентификатор на кл
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
|
||||
msgid "Hardware authentication failed!"
|
||||
msgstr "Неуспешно хардуерно удостоверяване"
|
||||
msgstr "Неуспешно хардуерно удостоверяване!"
|
||||
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
|
||||
msgid "No valid authentication key plugged"
|
||||
@ -10958,7 +10958,7 @@ msgid ""
|
||||
"below, if there is any, may also help you in diagnosing the problem."
|
||||
msgstr ""
|
||||
"Изглежда, че има грешка в SQL заявката ви. Грешката върната от MySQL сървъра "
|
||||
"по долу, ако има такава, би могла да ви помогне в определянето на проблема"
|
||||
"по долу, ако има такава, би могла да ви помогне в определянето на проблема."
|
||||
|
||||
#: libraries/sqlparser.lib.php:178
|
||||
msgid ""
|
||||
|
||||
10
po/br.po
10
po/br.po
@ -8,10 +8,9 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-07-12 15:45+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:11+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Breton <http://l10n.cihar.com/projects/phpmyadmin/master/br/"
|
||||
">\n"
|
||||
"Language-Team: Breton <http://l10n.cihar.com/projects/phpmyadmin/master/br/>\n"
|
||||
"Language: br\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -4195,7 +4194,8 @@ msgstr "%s d'ar muiañ"
|
||||
#: libraries/config/FormDisplay.tpl.php:225
|
||||
msgid "This setting is disabled, it will not be applied to your configuration."
|
||||
msgstr ""
|
||||
"Diweredekaet eo an arventenn; ne vo ket lakaet e pleustr gant ho kefluniadur."
|
||||
"Diweredekaet eo an arventenn; ne vo ket lakaet e pleustr gant ho "
|
||||
"kefluniadur."
|
||||
|
||||
#: libraries/config/FormDisplay.tpl.php:313
|
||||
#, php-format
|
||||
@ -7900,7 +7900,7 @@ msgstr "N'eus anaouder alc'hwez ebet er restr %s"
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
|
||||
msgid "Hardware authentication failed!"
|
||||
msgstr "C'hwitet eo bet dilesadur ar periant."
|
||||
msgstr "C'hwitet eo bet dilesadur ar periant !"
|
||||
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
|
||||
msgid "No valid authentication key plugged"
|
||||
|
||||
14
po/cs.po
14
po/cs.po
@ -6,7 +6,7 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-07-09 13:12+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:06+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Czech <http://l10n.cihar.com/projects/phpmyadmin/master/cs/>\n"
|
||||
"Language: cs\n"
|
||||
@ -1657,7 +1657,7 @@ msgstr "Přidat %d hodnot"
|
||||
#: js/messages.php:259
|
||||
msgid ""
|
||||
"Note: If the file contains multiple tables, they will be combined into one."
|
||||
msgstr "Poznámka: Pokud soubor obsahuje více tabulek, budou sloučeny do jedné"
|
||||
msgstr "Poznámka: Pokud soubor obsahuje více tabulek, budou sloučeny do jedné."
|
||||
|
||||
#: js/messages.php:262
|
||||
msgid "Hide query box"
|
||||
@ -2823,7 +2823,7 @@ msgstr "Primární klíč byl odstraněn"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Klíč %s byl odstraněn"
|
||||
msgstr "Klíč %s byl odstraněn."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -3778,7 +3778,7 @@ msgstr "Zvolte soubor z adresáře pro upload na serveru <b>%s</b>:"
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Adresář určený pro upload souborů nemohl být otevřen"
|
||||
msgstr "Adresář určený pro upload souborů nemohl být otevřen."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -7879,7 +7879,7 @@ msgstr "Přihlášení bez hesla je zakázáno v nastavení (viz AllowNoPassword
|
||||
msgid "No activity within %s seconds; please log in again."
|
||||
msgstr ""
|
||||
"Nebyla zaznamenána žádná aktivita po dobu %s sekund, prosím přihlaste se "
|
||||
"znovu"
|
||||
"znovu."
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:667
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:669
|
||||
@ -7903,7 +7903,7 @@ msgstr "Soubor %s neobsahuje ID klíče"
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
|
||||
msgid "Hardware authentication failed!"
|
||||
msgstr "Hardwarové přihlašování selhala"
|
||||
msgstr "Hardwarové přihlašování selhalo!"
|
||||
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
|
||||
msgid "No valid authentication key plugged"
|
||||
@ -11041,7 +11041,7 @@ msgid ""
|
||||
"below, if there is any, may also help you in diagnosing the problem."
|
||||
msgstr ""
|
||||
"Pravděpodobně máte v SQL dotazu chybu. Níže uvedený výstup MySQL serveru "
|
||||
"(pokud je nějaký) vám také může pomoci při zkoumání problému"
|
||||
"(pokud je nějaký) vám také může pomoci při zkoumání problému."
|
||||
|
||||
#: libraries/sqlparser.lib.php:178
|
||||
msgid ""
|
||||
|
||||
20
po/de.po
20
po/de.po
@ -4,10 +4,9 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-06-19 12:38+0200\n"
|
||||
"Last-Translator: Raimund Meyer <rm@km-it.de>\n"
|
||||
"Language-Team: German <http://l10n.cihar.com/projects/phpmyadmin/master/de/"
|
||||
">\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:31+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: German <http://l10n.cihar.com/projects/phpmyadmin/master/de/>\n"
|
||||
"Language: de\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -1716,7 +1715,7 @@ msgid ""
|
||||
"Note: If the file contains multiple tables, they will be combined into one."
|
||||
msgstr ""
|
||||
"Hinweis: Wenn die Datei mehrere Tabellen enthält, werden diese in einer "
|
||||
"einzigen Tabelle zusammengefasst"
|
||||
"einzigen Tabelle zusammengefasst."
|
||||
|
||||
#: js/messages.php:262
|
||||
msgid "Hide query box"
|
||||
@ -2926,7 +2925,7 @@ msgstr "Der Primärschlüssel wurde gelöscht"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Index %s wurde entfernt"
|
||||
msgstr "Index %s wurde entfernt."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -3920,7 +3919,7 @@ msgstr "Wählen Sie vom Webserver-Uploadverzeichnis <b>%s</b>:"
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Auf das festgelegte Upload-Verzeichnis kann nicht zugegriffen werden"
|
||||
msgstr "Auf das festgelegte Upload-Verzeichnis kann nicht zugegriffen werden."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -8141,7 +8140,7 @@ msgstr ""
|
||||
msgid "No activity within %s seconds; please log in again."
|
||||
msgstr ""
|
||||
"Da Sie seit mindestens %s Sekunden inaktiv waren, wurden Sie automatisch "
|
||||
"abgemeldet. Bitte melden Sie sich erneut an"
|
||||
"abgemeldet. Bitte melden Sie sich erneut an."
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:667
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:669
|
||||
@ -8165,7 +8164,7 @@ msgstr "Die Datei %s enthält keine Schlüsselnummer"
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
|
||||
msgid "Hardware authentication failed!"
|
||||
msgstr "Hardware Authentisierung fehlgeschlagen"
|
||||
msgstr "Hardware Authentisierung fehlgeschlagen!"
|
||||
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
|
||||
msgid "No valid authentication key plugged"
|
||||
@ -11483,7 +11482,8 @@ msgid ""
|
||||
"below, if there is any, may also help you in diagnosing the problem."
|
||||
msgstr ""
|
||||
"Es scheint einen Fehler in Ihrer MySQL-Abfrage zu geben. Die MySQL-"
|
||||
"Fehlerausgabe, falls vorhanden, kann Ihnen auch bei der Fehleranalyse helfen"
|
||||
"Fehlerausgabe, falls vorhanden, kann Ihnen auch bei der Fehleranalyse "
|
||||
"helfen."
|
||||
|
||||
#: libraries/sqlparser.lib.php:178
|
||||
msgid ""
|
||||
|
||||
22
po/el.po
22
po/el.po
@ -4,7 +4,7 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-07-04 19:42+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 07:46+0200\n"
|
||||
"Last-Translator: Panagiotis Papazoglou <papaz_p@yahoo.com>\n"
|
||||
"Language-Team: Greek <http://l10n.cihar.com/projects/phpmyadmin/master/el/>\n"
|
||||
"Language: el\n"
|
||||
@ -1672,7 +1672,7 @@ msgstr "Προσθήκη %d τιμής(ών)"
|
||||
#: js/messages.php:259
|
||||
msgid ""
|
||||
"Note: If the file contains multiple tables, they will be combined into one."
|
||||
msgstr "Σημείωση: Αν το αρχείο περιέχει πολλούς πίνακες, θα ενωθουν σε έναν"
|
||||
msgstr "Σημείωση: Αν το αρχείο περιέχει πολλούς πίνακες, θα ενωθουν σε έναν."
|
||||
|
||||
#: js/messages.php:262
|
||||
msgid "Hide query box"
|
||||
@ -2849,7 +2849,7 @@ msgstr "Το πρωτεύον κλειδί διεγράφη"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Το ευρετήριο %s διεγράφη"
|
||||
msgstr "Το ευρετήριο %s έχει διαγραφεί."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -3312,10 +3312,9 @@ msgid "Reset zoom"
|
||||
msgstr "Επανφορά εστίασης"
|
||||
|
||||
#: libraries/TableSearch.class.php:1281
|
||||
#, fuzzy
|
||||
#| msgid "Replace with"
|
||||
msgid "Replace with:"
|
||||
msgstr "Αντικατάσταση με"
|
||||
msgstr "Αντικατάσταση με:"
|
||||
|
||||
#: libraries/TableSearch.class.php:1341
|
||||
msgid "Find and replace - preview"
|
||||
@ -3827,8 +3826,7 @@ msgstr "Επιλογή από το φάκελο αποστολής του δια
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr ""
|
||||
"Ο υποκατάλογος που ορίσατε για την αποθήκευση αρχείων δεν μπόρεσε να βρεθεί"
|
||||
msgstr "Ο φάκελος που ορίσατε για την αποθήκευση αρχείων δεν μπόρεσε να βρεθεί."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -8014,7 +8012,7 @@ msgstr ""
|
||||
msgid "No activity within %s seconds; please log in again."
|
||||
msgstr ""
|
||||
"Καμιά δραστηριότητα εδώ και %s δευτερόλεπτα τουλάχιστον, για αυτό "
|
||||
"ξανασυνδεθείτε"
|
||||
"ξανασυνδεθείτε."
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:667
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:669
|
||||
@ -8038,7 +8036,7 @@ msgstr "Το αρχείο %s δεν περιέχει καμιά ταυτότητ
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
|
||||
msgid "Hardware authentication failed!"
|
||||
msgstr "Η επικύρωση του υλικού απέτυχε"
|
||||
msgstr "Η επικύρωση του υλικού απέτυχε!"
|
||||
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
|
||||
msgid "No valid authentication key plugged"
|
||||
@ -11279,9 +11277,9 @@ msgid ""
|
||||
"There seems to be an error in your SQL query. The MySQL server error output "
|
||||
"below, if there is any, may also help you in diagnosing the problem."
|
||||
msgstr ""
|
||||
"Φαίνεται να υπάρχει ένα λάθος στο ερώτημά σας. Το παρακάτω λάθος διακομιστή "
|
||||
"MySQL, εάν υπάρχει κάποιο, μπορεί επίσης να σας βοηθήσει να διαγνώσετε το "
|
||||
"πρόβλημα"
|
||||
"Φαίνεται να υπάρχει ένα λάθος στο ερώτημά SQL σας. Το παρακάτω λάθος "
|
||||
"διακομιστή MySQL, εάν υπάρχει κάποιο, μπορεί επίσης να σας βοηθήσει να "
|
||||
"διαγνώσετε το πρόβλημα."
|
||||
|
||||
#: libraries/sqlparser.lib.php:178
|
||||
msgid ""
|
||||
|
||||
14
po/fi.po
14
po/fi.po
@ -4,10 +4,10 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-07-12 14:44+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:12+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Finnish <http://l10n.cihar.com/projects/phpmyadmin/master/fi/"
|
||||
">\n"
|
||||
"Language-Team: Finnish "
|
||||
"<http://l10n.cihar.com/projects/phpmyadmin/master/fi/>\n"
|
||||
"Language: fi\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -1710,7 +1710,7 @@ msgstr "Lisää %d arvo(a)"
|
||||
msgid ""
|
||||
"Note: If the file contains multiple tables, they will be combined into one."
|
||||
msgstr ""
|
||||
"Huom: Mikäli tiedostossa on useita tauluja, ne liitetään yhdeksi tauluksi"
|
||||
"Huom: Mikäli tiedostossa on useita tauluja, ne liitetään yhdeksi tauluksi."
|
||||
|
||||
#: js/messages.php:262
|
||||
msgid "Hide query box"
|
||||
@ -2915,7 +2915,7 @@ msgstr "Perusavain on poistettu"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Indeksi %s on poistettu"
|
||||
msgstr "Indeksi %s on poistettu."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -3862,7 +3862,7 @@ msgstr "Valitse verkkopalvelimen lähetyskansiosta <b>%s</b>:"
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Tiedostojen lähetykseen valittua hakemistoa ei voida käyttää"
|
||||
msgstr "Tiedostojen lähetykseen valittua hakemistoa ei voida käyttää."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -8118,7 +8118,7 @@ msgstr "Tiedosto %s ei sisällä avaintunnusta"
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
|
||||
msgid "Hardware authentication failed!"
|
||||
msgstr "Laitetodennus epäonnistui"
|
||||
msgstr "Laitetodennus epäonnistui!"
|
||||
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
|
||||
msgid "No valid authentication key plugged"
|
||||
|
||||
18
po/gl.po
18
po/gl.po
@ -4,10 +4,10 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-07-12 14:54+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:28+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Galician <http://l10n.cihar.com/projects/phpmyadmin/master/gl/"
|
||||
">\n"
|
||||
"Language-Team: Galician "
|
||||
"<http://l10n.cihar.com/projects/phpmyadmin/master/gl/>\n"
|
||||
"Language: gl\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -1707,7 +1707,7 @@ msgstr "Engadir %d valor(es)"
|
||||
#: js/messages.php:259
|
||||
msgid ""
|
||||
"Note: If the file contains multiple tables, they will be combined into one."
|
||||
msgstr "Nota: Se o ficheiro contén varias táboas, estas combínanse nunha"
|
||||
msgstr "Nota: Se o ficheiro contén varias táboas, estas combínanse nunha."
|
||||
|
||||
#: js/messages.php:262
|
||||
msgid "Hide query box"
|
||||
@ -2902,7 +2902,7 @@ msgstr "Eliminouse a chave primaria"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Eliminouse o índice %s"
|
||||
msgstr "Eliminouse o índice %s."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -3898,7 +3898,7 @@ msgstr "Escoller o directorio de subida do servidor web <b>%s</b>:"
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Non é posíbel acceder ao directorio que designou para os envíos"
|
||||
msgstr "Non é posíbel acceder ao directorio que designou para os envíos."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -8157,7 +8157,7 @@ msgstr ""
|
||||
msgid "No activity within %s seconds; please log in again."
|
||||
msgstr ""
|
||||
"Non se rexistrou actividade ningunha desde hai %s segundos ou máis. Terá que "
|
||||
"entrar de novo"
|
||||
"entrar de novo."
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:667
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:669
|
||||
@ -8181,7 +8181,7 @@ msgstr "O ficheiro %s non contén ningún identificador de chave"
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
|
||||
msgid "Hardware authentication failed!"
|
||||
msgstr "Fallou a autenticación do hardware"
|
||||
msgstr "Fallou a autenticación do hardware!"
|
||||
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
|
||||
msgid "No valid authentication key plugged"
|
||||
@ -11441,7 +11441,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Parece que se produciu un erro na súa consulta de SQL. Se máis abaixo "
|
||||
"aparece unha mensaxe de erro do servidor de MySQL, isto pode axudar a "
|
||||
"diagnosticar o problema"
|
||||
"diagnosticar o problema."
|
||||
|
||||
#: libraries/sqlparser.lib.php:178
|
||||
msgid ""
|
||||
|
||||
10
po/he.po
10
po/he.po
@ -4,10 +4,9 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-06-03 10:24+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Hebrew <http://l10n.cihar.com/projects/phpmyadmin/master/he/"
|
||||
">\n"
|
||||
"PO-Revision-Date: 2013-07-15 21:08+0200\n"
|
||||
"Last-Translator: Bug Me Not <abcdefg@mailinator.com>\n"
|
||||
"Language-Team: Hebrew <http://l10n.cihar.com/projects/phpmyadmin/master/he/>\n"
|
||||
"Language: he\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -829,13 +828,14 @@ msgid ""
|
||||
"Login cookie store is lower than cookie validity configured in phpMyAdmin, "
|
||||
"because of this, your login will expire sooner than configured in phpMyAdmin."
|
||||
msgstr ""
|
||||
"חנות עוגיית כניסה נמוכה מתוקף עוגייה המוגדר בphpMyAdmin, בגלל זה, הכניסה שלך "
|
||||
"תפוג מוקדם יותר מאשר מוגדרת בphpMyAdmin."
|
||||
|
||||
#: index.php:468
|
||||
msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
|
||||
msgstr "קובץ התצורה צריכה ביטוי סיסמה סודית (blowfish_secret)."
|
||||
|
||||
#: index.php:479
|
||||
#, fuzzy
|
||||
#| msgid ""
|
||||
#| "Directory [code]config[/code], which is used by the setup script, still "
|
||||
#| "exists in your phpMyAdmin directory. You should remove it once phpMyAdmin "
|
||||
|
||||
14
po/hr.po
14
po/hr.po
@ -4,16 +4,16 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-05-07 17:20+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:29+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Croatian <http://l10n.cihar.com/projects/phpmyadmin/master/hr/"
|
||||
">\n"
|
||||
"Language-Team: Croatian "
|
||||
"<http://l10n.cihar.com/projects/phpmyadmin/master/hr/>\n"
|
||||
"Language: hr\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
|
||||
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
|
||||
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
"X-Generator: Weblate 1.6-dev\n"
|
||||
|
||||
#: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:339
|
||||
@ -3080,7 +3080,7 @@ msgstr "Primarni ključ je odbačen"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Index %s je odbačen"
|
||||
msgstr "Index %s je odbačen."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -4038,7 +4038,7 @@ msgstr "mapa učitavanja web poslužitelja"
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Mapu koju ste odabrali za potrebe učitavanja nije moguće dohvatiti"
|
||||
msgstr "Mapu koju ste odabrali za potrebe učitavanja nije moguće dohvatiti."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
|
||||
15
po/kk.po
15
po/kk.po
@ -8,10 +8,9 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-05-07 17:20+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:25+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Kazakh <http://l10n.cihar.com/projects/phpmyadmin/master/kk/"
|
||||
">\n"
|
||||
"Language-Team: Kazakh <http://l10n.cihar.com/projects/phpmyadmin/master/kk/>\n"
|
||||
"Language: kk\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -1407,7 +1406,7 @@ msgstr ""
|
||||
|
||||
#: js/messages.php:178
|
||||
msgid "Sum of grouped rows:"
|
||||
msgstr "Топтасқан қатарлар сомасы"
|
||||
msgstr "Топтасқан қатарлар сомасы:"
|
||||
|
||||
#: js/messages.php:179
|
||||
msgid "Total:"
|
||||
@ -2356,7 +2355,7 @@ msgstr ""
|
||||
#: libraries/DBQbe.class.php:1321
|
||||
#, php-format
|
||||
msgid "SQL query on database <b>%s</b>:"
|
||||
msgstr "<b>%s</b> дерекқорына SQL сұранысы"
|
||||
msgstr "<b>%s</b> дерекқорына SQL сұранысы:"
|
||||
|
||||
#: libraries/DBQbe.class.php:1335 libraries/Util.class.php:1286
|
||||
msgid "Submit Query"
|
||||
@ -2461,7 +2460,7 @@ msgstr "Кесте бойынша:"
|
||||
|
||||
#: libraries/DbSearch.class.php:445
|
||||
msgid "Inside column:"
|
||||
msgstr "Бағана бойынша"
|
||||
msgstr "Бағана бойынша:"
|
||||
|
||||
#: libraries/DisplayResults.class.php:702
|
||||
msgid "Save edited data"
|
||||
@ -2809,7 +2808,7 @@ msgstr ""
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Индекс %s жойылған болатын"
|
||||
msgstr "Индекс %s жойылған болатын."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -7425,7 +7424,7 @@ msgstr ""
|
||||
|
||||
#: libraries/operations.lib.php:813
|
||||
msgid "Table comments"
|
||||
msgstr "Кестеге түсініктеме:"
|
||||
msgstr "Кестеге түсініктеме"
|
||||
|
||||
#: libraries/operations.lib.php:822 libraries/server_engines.lib.php:49
|
||||
msgid "Storage Engine"
|
||||
|
||||
22
po/lt.po
22
po/lt.po
@ -4,16 +4,16 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-07-12 14:41+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:14+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Lithuanian <http://l10n.cihar.com/projects/phpmyadmin/master/"
|
||||
"lt/>\n"
|
||||
"Language-Team: Lithuanian "
|
||||
"<http://l10n.cihar.com/projects/phpmyadmin/master/lt/>\n"
|
||||
"Language: lt\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
|
||||
"%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
|
||||
"100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
"X-Generator: Weblate 1.6-dev\n"
|
||||
|
||||
#: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:339
|
||||
@ -1693,7 +1693,7 @@ msgstr "Pridėti %d reikšmę(-es)"
|
||||
#: js/messages.php:259
|
||||
msgid ""
|
||||
"Note: If the file contains multiple tables, they will be combined into one."
|
||||
msgstr "Pastaba: Jei failas turi keletą lentelių jos bus sukombinuotos į vieną"
|
||||
msgstr "Pastaba: Jei failas turi keletą lentelių jos bus sukombinuotos į vieną."
|
||||
|
||||
#: js/messages.php:262
|
||||
msgid "Hide query box"
|
||||
@ -2911,7 +2911,7 @@ msgstr "Panaikintas pirminis raktas"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Indeksas %s ištrintas"
|
||||
msgstr "Indeksas %s ištrintas."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -3856,7 +3856,7 @@ msgstr "Pasirinkti iš saityno serverio atsisiuntimų katalogą <b>%s</b>:"
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Aplankas, kuris nurodytas įkeliamiems failams, nepasiekiamas"
|
||||
msgstr "Aplankas, kuris nurodytas įkeliamiems failams, nepasiekiamas."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -8065,7 +8065,7 @@ msgstr ""
|
||||
msgid "No activity within %s seconds; please log in again."
|
||||
msgstr ""
|
||||
"Daugiau nei %s sekundžių nebuvo atlikta jokių veiksmų, prašome prisijungti "
|
||||
"iš naujo"
|
||||
"iš naujo."
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:667
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:669
|
||||
@ -8089,7 +8089,7 @@ msgstr "Failas %s neturi jokio raktinio id"
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
|
||||
msgid "Hardware authentication failed!"
|
||||
msgstr "Aparatūros atpažinimas nepavyko"
|
||||
msgstr "Aparatūros atpažinimas nepavyko!"
|
||||
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
|
||||
msgid "No valid authentication key plugged"
|
||||
@ -11230,7 +11230,7 @@ msgid ""
|
||||
"below, if there is any, may also help you in diagnosing the problem."
|
||||
msgstr ""
|
||||
"Klaida SQL užklausoje. Žemiau išvestas MySQL serverio pranešimas (jeigu toks "
|
||||
"yra), turėtų padėti Jums nustatyti klaidos priežastį"
|
||||
"yra), turėtų padėti Jums nustatyti klaidos priežastį."
|
||||
|
||||
#: libraries/sqlparser.lib.php:178
|
||||
msgid ""
|
||||
|
||||
15
po/lv.po
15
po/lv.po
@ -4,10 +4,10 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-05-07 17:18+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:30+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Latvian <http://l10n.cihar.com/projects/phpmyadmin/master/lv/"
|
||||
">\n"
|
||||
"Language-Team: Latvian "
|
||||
"<http://l10n.cihar.com/projects/phpmyadmin/master/lv/>\n"
|
||||
"Language: lv\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -2975,7 +2975,7 @@ msgstr "Primārā atslēga tika izdzēsta"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Indekss %s tika izdzēsts"
|
||||
msgstr "Indekss %s tika izdzēsts."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -3921,7 +3921,7 @@ msgstr "web servera augšupielādes direktorija"
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Direktoija, kuru norādijāt augšupielādei, nav pieejama"
|
||||
msgstr "Direktoija, kuru norādijāt augšupielādei, nav pieejama."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -8038,7 +8038,8 @@ msgstr ""
|
||||
#, php-format
|
||||
msgid "No activity within %s seconds; please log in again."
|
||||
msgstr ""
|
||||
"Nebija aktivitātes vairāk kā %s sekunžu laikā, lūdzu autorizējieties vēlreiz"
|
||||
"Nebija aktivitātes vairāk kā %s sekunžu laikā, lūdzu autorizējieties "
|
||||
"vēlreiz."
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:667
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:669
|
||||
@ -11264,7 +11265,7 @@ msgid ""
|
||||
"below, if there is any, may also help you in diagnosing the problem."
|
||||
msgstr ""
|
||||
"Izkatās, ka Jūsu SQL vaicajumā ir kļūda. MySQL servera kļūdas pazinojums "
|
||||
"zemāk, ja tāds ir, var arī palīdzet Jums diagnosticēt problēmu"
|
||||
"zemāk, ja tāds ir, var arī palīdzet Jums diagnosticēt problēmu."
|
||||
|
||||
#: libraries/sqlparser.lib.php:178
|
||||
msgid ""
|
||||
|
||||
18
po/nb.po
18
po/nb.po
@ -4,10 +4,10 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-07-12 14:49+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:14+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Norwegian Bokmål <http://l10n.cihar.com/projects/phpmyadmin/"
|
||||
"master/nb/>\n"
|
||||
"Language-Team: Norwegian Bokmål "
|
||||
"<http://l10n.cihar.com/projects/phpmyadmin/master/nb/>\n"
|
||||
"Language: nb\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -1701,7 +1701,7 @@ msgid ""
|
||||
"Note: If the file contains multiple tables, they will be combined into one."
|
||||
msgstr ""
|
||||
"Legg merke til: Om filen inneholder flere tabeller, så vil de kombineres til "
|
||||
"en tabell"
|
||||
"en tabell."
|
||||
|
||||
#: js/messages.php:262
|
||||
msgid "Hide query box"
|
||||
@ -2884,7 +2884,7 @@ msgstr "Primærnøkkelen har blitt slettet"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Indeksen %s har blitt slettet"
|
||||
msgstr "Indeksen %s har blitt slettet."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -3817,7 +3817,7 @@ msgstr "Merk fra opplastingskatalogen på vevtjeneren <b>%s</b>:"
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Katalogen du anga for opplasting kan ikke nåes"
|
||||
msgstr "Katalogen du anga for opplasting kan ikke nåes."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -8108,7 +8108,7 @@ msgstr ""
|
||||
#: libraries/plugins/auth/AuthenticationSignon.class.php:254
|
||||
#, php-format
|
||||
msgid "No activity within %s seconds; please log in again."
|
||||
msgstr "Ingen aktivitet på %s sekunder eller mer, du må logge inn på nytt"
|
||||
msgstr "Ingen aktivitet på %s sekunder eller mer, du må logge inn på nytt."
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:667
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:669
|
||||
@ -8132,7 +8132,7 @@ msgstr "Fila %s inneholder ingen nøkkel id"
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
|
||||
msgid "Hardware authentication failed!"
|
||||
msgstr "Maskinvaregodkjenning mislyktes"
|
||||
msgstr "Maskinvaregodkjenning mislyktes!"
|
||||
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
|
||||
msgid "No valid authentication key plugged"
|
||||
@ -11493,7 +11493,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Det ser ut til å være en feil i din SQL-spørring. En eventuell feilmelding "
|
||||
"fra MySQL-tjeneren er skrevet ut nedenfor, og kan kanskje hjelpe deg med å "
|
||||
"finne feilen"
|
||||
"finne feilen."
|
||||
|
||||
#: libraries/sqlparser.lib.php:178
|
||||
msgid ""
|
||||
|
||||
18
po/pl.po
18
po/pl.po
@ -4,10 +4,9 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-05-30 13:29+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:28+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Polish <http://l10n.cihar.com/projects/phpmyadmin/master/pl/"
|
||||
">\n"
|
||||
"Language-Team: Polish <http://l10n.cihar.com/projects/phpmyadmin/master/pl/>\n"
|
||||
"Language: pl\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -1704,7 +1703,7 @@ msgstr "Dodaj %d wartość(i)"
|
||||
#: js/messages.php:259
|
||||
msgid ""
|
||||
"Note: If the file contains multiple tables, they will be combined into one."
|
||||
msgstr "Uwaga: Jeśli plik zawiera wiele tabel, będzie połączony w jeden"
|
||||
msgstr "Uwaga: Jeśli plik zawiera wiele tabel, będzie połączony w jeden."
|
||||
|
||||
#: js/messages.php:262
|
||||
msgid "Hide query box"
|
||||
@ -2899,7 +2898,7 @@ msgstr "Klucz podstawowy został usunięty"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Klucz %s został usunięty"
|
||||
msgstr "Klucz %s został usunięty."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -3889,7 +3888,7 @@ msgstr "Wybierz katalog serwera WWW dla uploadu <b>%s</b>:"
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Nie można znaleźć katalogu do zapisu przesyłanych plików"
|
||||
msgstr "Nie można znaleźć katalogu do zapisu przesyłanych plików."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -8117,7 +8116,8 @@ msgstr "Konfiguracja zabrania logowania bez hasła (zobacz AllowNoPassword)"
|
||||
#, php-format
|
||||
msgid "No activity within %s seconds; please log in again."
|
||||
msgstr ""
|
||||
"Brak aktywności przez co najmniej %s sekund, proszę zalogować się jeszcze raz"
|
||||
"Brak aktywności przez co najmniej %s sekund, proszę zalogować się jeszcze "
|
||||
"raz."
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:667
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:669
|
||||
@ -8141,7 +8141,7 @@ msgstr "Plik %s nie zawiera żadnego identyfikatora klucza"
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
|
||||
msgid "Hardware authentication failed!"
|
||||
msgstr "Uwierzytelnianie sprzętowe nie powiodło się"
|
||||
msgstr "Uwierzytelnianie sprzętowe nie powiodło się!"
|
||||
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
|
||||
msgid "No valid authentication key plugged"
|
||||
@ -11387,7 +11387,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Wygląda na to, że w twoim zapytaniu SQL jest błąd. W znalezieniu przyczyny "
|
||||
"problemu może pomóc także - jeśli się pojawi - poniższy opis błędu serwera "
|
||||
"MySQL"
|
||||
"MySQL."
|
||||
|
||||
#: libraries/sqlparser.lib.php:178
|
||||
msgid ""
|
||||
|
||||
18
po/pt.po
18
po/pt.po
@ -4,10 +4,10 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-07-12 14:48+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:13+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Portuguese <http://l10n.cihar.com/projects/phpmyadmin/master/"
|
||||
"pt/>\n"
|
||||
"Language-Team: Portuguese "
|
||||
"<http://l10n.cihar.com/projects/phpmyadmin/master/pt/>\n"
|
||||
"Language: pt\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -1691,7 +1691,7 @@ msgstr "Add %d valor(es)"
|
||||
#: js/messages.php:259
|
||||
msgid ""
|
||||
"Note: If the file contains multiple tables, they will be combined into one."
|
||||
msgstr "Nota: Se o arquivo contém várias tabelas, estas serão combinadas numa"
|
||||
msgstr "Nota: Se o arquivo contém várias tabelas, estas serão combinadas numa."
|
||||
|
||||
#: js/messages.php:262
|
||||
msgid "Hide query box"
|
||||
@ -2884,7 +2884,7 @@ msgstr "A chave primária foi eliminada"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "O Índice %s foi eliminado"
|
||||
msgstr "O Índice %s foi eliminado."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -3843,7 +3843,7 @@ msgstr "Selecionar a partir da directoria de upload do servidor <b>%s</b>:"
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Não é possivel alcançar a directoria que configurou para fazer upload"
|
||||
msgstr "Não é possivel alcançar a directoria que configurou para fazer upload."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -8107,7 +8107,7 @@ msgstr ""
|
||||
#, php-format
|
||||
msgid "No activity within %s seconds; please log in again."
|
||||
msgstr ""
|
||||
"Sem actividade há %s segundos ou mais; Por favor, faça o login novamente"
|
||||
"Sem actividade há %s segundos ou mais; Por favor, faça o login novamente."
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:667
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:669
|
||||
@ -8131,7 +8131,7 @@ msgstr "Arquivo %s não contém qualquer identificação de chave"
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
|
||||
msgid "Hardware authentication failed!"
|
||||
msgstr "Falha na autenticação de hardware"
|
||||
msgstr "Falha na autenticação de hardware!"
|
||||
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
|
||||
msgid "No valid authentication key plugged"
|
||||
@ -11263,7 +11263,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Parece haver um erro na sua consulta SQL. A mensagem de erro do servidor "
|
||||
"MySQL abaixo, isto se existir alguma, também o poderá ajudar a diagnosticar "
|
||||
"o problema"
|
||||
"o problema."
|
||||
|
||||
#: libraries/sqlparser.lib.php:178
|
||||
msgid ""
|
||||
|
||||
18
po/ro.po
18
po/ro.po
@ -4,10 +4,10 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-07-12 14:41+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:14+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Romanian <http://l10n.cihar.com/projects/phpmyadmin/master/ro/"
|
||||
">\n"
|
||||
"Language-Team: Romanian "
|
||||
"<http://l10n.cihar.com/projects/phpmyadmin/master/ro/>\n"
|
||||
"Language: ro\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -1774,7 +1774,7 @@ msgid ""
|
||||
"Note: If the file contains multiple tables, they will be combined into one."
|
||||
msgstr ""
|
||||
"Notă: Dacă fișierul conține mai multe tabele, acestea vor fi combinate într-"
|
||||
"unul singur"
|
||||
"unul singur."
|
||||
|
||||
#: js/messages.php:262
|
||||
msgid "Hide query box"
|
||||
@ -3038,7 +3038,7 @@ msgstr "Cheia primară a fost aruncată"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Indexul %s a fost aruncat"
|
||||
msgstr "Indexul %s a fost aruncat."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -3994,7 +3994,7 @@ msgstr "director de încărcare al serverului Web"
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Directorul stabilit pentru încărcare nu poate fi găsit"
|
||||
msgstr "Directorul stabilit pentru încărcare nu poate fi găsit."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -8468,7 +8468,7 @@ msgstr ""
|
||||
msgid "No activity within %s seconds; please log in again."
|
||||
msgstr ""
|
||||
"Nu ați avut activitate de mai mult de %s secunde, vă rugăm să vă "
|
||||
"autentificați din nou"
|
||||
"autentificați din nou."
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:667
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:669
|
||||
@ -8493,7 +8493,7 @@ msgstr ""
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
|
||||
msgid "Hardware authentication failed!"
|
||||
msgstr "Autentificarea hardware a eșuat"
|
||||
msgstr "Autentificarea hardware a eșuat!"
|
||||
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
|
||||
msgid "No valid authentication key plugged"
|
||||
@ -11762,7 +11762,7 @@ msgid ""
|
||||
"below, if there is any, may also help you in diagnosing the problem."
|
||||
msgstr ""
|
||||
"Pare sa fie o eroare in comanda SQL. Eroarea MySQL de mai jos, daca e "
|
||||
"vreuna, poate sa te ajute la diagnosticarea problemei"
|
||||
"vreuna, poate sa te ajute la diagnosticarea problemei."
|
||||
|
||||
#: libraries/sqlparser.lib.php:178
|
||||
msgid ""
|
||||
|
||||
40
po/ru.po
40
po/ru.po
@ -4,16 +4,16 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-05-11 21:28+0200\n"
|
||||
"Last-Translator: Victor Volkov <hanut@php-myadmin.ru>\n"
|
||||
"Language-Team: Russian <http://l10n.cihar.com/projects/phpmyadmin/master/ru/"
|
||||
">\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:29+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Russian "
|
||||
"<http://l10n.cihar.com/projects/phpmyadmin/master/ru/>\n"
|
||||
"Language: ru\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
|
||||
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
|
||||
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
"X-Generator: Weblate 1.6-dev\n"
|
||||
|
||||
#: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:339
|
||||
@ -1671,7 +1671,7 @@ msgstr "Добавить %d значение(й)"
|
||||
msgid ""
|
||||
"Note: If the file contains multiple tables, they will be combined into one."
|
||||
msgstr ""
|
||||
"Замечание: если файл содержит множество таблиц, они будут объединены в одну"
|
||||
"Замечание: если файл содержит множество таблиц, они будут объединены в одну."
|
||||
|
||||
#: js/messages.php:262
|
||||
msgid "Hide query box"
|
||||
@ -2236,17 +2236,17 @@ msgstr "PHP вернул следующую ошибку: %s"
|
||||
#: libraries/Advisor.class.php:107
|
||||
#, php-format
|
||||
msgid "Failed evaluating precondition for rule '%s'."
|
||||
msgstr "Не удалось определить условия для правила '%s'"
|
||||
msgstr "Не удалось определить условия для правила '%s'."
|
||||
|
||||
#: libraries/Advisor.class.php:124
|
||||
#, php-format
|
||||
msgid "Failed calculating value for rule '%s'."
|
||||
msgstr "Не удалось подсчитать значение для правила '%s'"
|
||||
msgstr "Не удалось подсчитать значение для правила '%s'."
|
||||
|
||||
#: libraries/Advisor.class.php:143
|
||||
#, php-format
|
||||
msgid "Failed running test for rule '%s'."
|
||||
msgstr "Не удалось запустить проверку правила '%s'"
|
||||
msgstr "Не удалось запустить проверку правила '%s'."
|
||||
|
||||
#: libraries/Advisor.class.php:225
|
||||
#, php-format
|
||||
@ -2259,17 +2259,17 @@ msgid ""
|
||||
"Invalid rule declaration on line %1$s, expected line %2$s of previous rule."
|
||||
msgstr ""
|
||||
"Неверное определение правила на строке %1$s, ожидается строка %2$s "
|
||||
"предыдущего правила"
|
||||
"предыдущего правила."
|
||||
|
||||
#: libraries/Advisor.class.php:412
|
||||
#, php-format
|
||||
msgid "Invalid rule declaration on line %s."
|
||||
msgstr "Неверное определение правила на строке %s"
|
||||
msgstr "Неверное определение правила на строке %s."
|
||||
|
||||
#: libraries/Advisor.class.php:420
|
||||
#, php-format
|
||||
msgid "Unexpected characters on line %s."
|
||||
msgstr "Неожиданные символы на строке %s"
|
||||
msgstr "Неожиданные символы на строке %s."
|
||||
|
||||
#: libraries/Advisor.class.php:434
|
||||
#, fuzzy, php-format
|
||||
@ -2856,7 +2856,7 @@ msgstr "Первичный ключ был удален"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Индекс %s был удален"
|
||||
msgstr "Индекс %s был удален."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -3840,7 +3840,7 @@ msgstr "Выберите из каталога загрузки сервера <
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Установленный каталог загрузки не доступен"
|
||||
msgstr "Установленный каталог загрузки не доступен."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -4171,7 +4171,7 @@ msgstr "максимум %s"
|
||||
|
||||
#: libraries/config/FormDisplay.tpl.php:225
|
||||
msgid "This setting is disabled, it will not be applied to your configuration."
|
||||
msgstr "Эта настройка отключена и не будет применена при конфигурации"
|
||||
msgstr "Эта настройка отключена и не будет применена при конфигурации."
|
||||
|
||||
#: libraries/config/FormDisplay.tpl.php:313
|
||||
#, php-format
|
||||
@ -8020,7 +8020,7 @@ msgstr "Вход без пароля запрещен при конфигура
|
||||
#, php-format
|
||||
msgid "No activity within %s seconds; please log in again."
|
||||
msgstr ""
|
||||
"Отсутствие активности более %s секунд, пожалуйста, авторизуйтесь заново"
|
||||
"Отсутствие активности более %s секунд, пожалуйста, авторизуйтесь заново."
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:667
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:669
|
||||
@ -8044,7 +8044,7 @@ msgstr "Файл %s не содержит ключа идентификации"
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
|
||||
msgid "Hardware authentication failed!"
|
||||
msgstr "Ошибка аппаратной идентификации"
|
||||
msgstr "Ошибка аппаратной идентификации!"
|
||||
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
|
||||
msgid "No valid authentication key plugged"
|
||||
@ -8843,8 +8843,8 @@ msgid ""
|
||||
"master."
|
||||
msgstr ""
|
||||
"Сразу после перезапуска MySQL сервера, пожалуйста, нажмите кнопку OK, после "
|
||||
"чего вы должны увидеть сообщение указывающее, что данный сервер <b>настроен</"
|
||||
"b> как головной"
|
||||
"чего вы должны увидеть сообщение указывающее, что данный сервер "
|
||||
"<b>настроен</b> как головной."
|
||||
|
||||
#: libraries/replication_gui.lib.php:139
|
||||
#: libraries/server_databases.lib.php:395
|
||||
|
||||
19
po/sk.po
19
po/sk.po
@ -4,10 +4,9 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-06-11 16:36+0200\n"
|
||||
"Last-Translator: Peter Rosa <peter.rosa@pro.sk>\n"
|
||||
"Language-Team: Slovak <http://l10n.cihar.com/projects/phpmyadmin/master/sk/"
|
||||
">\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:31+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Slovak <http://l10n.cihar.com/projects/phpmyadmin/master/sk/>\n"
|
||||
"Language: sk\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -1705,7 +1704,7 @@ msgstr "Pridať %d hodnôt"
|
||||
msgid ""
|
||||
"Note: If the file contains multiple tables, they will be combined into one."
|
||||
msgstr ""
|
||||
"Poznámka: Ak súbor obsahuje viac tabuliek, tieto budú spojené do jednej"
|
||||
"Poznámka: Ak súbor obsahuje viac tabuliek, tieto budú spojené do jednej."
|
||||
|
||||
#: js/messages.php:262
|
||||
msgid "Hide query box"
|
||||
@ -2885,7 +2884,7 @@ msgstr "Primárny kľúč bol zrušený"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Index pre %s bol odstránený"
|
||||
msgstr "Index pre %s bol odstránený."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -3868,7 +3867,7 @@ msgstr "Zvoľte súbor z upload adresára <b>%s</b> web servera:"
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Adresár určený pre upload súborov sa nedá otvoriť"
|
||||
msgstr "Adresár určený pre upload súborov sa nedá otvoriť."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -8009,7 +8008,7 @@ msgstr ""
|
||||
#: libraries/plugins/auth/AuthenticationSignon.class.php:254
|
||||
#, php-format
|
||||
msgid "No activity within %s seconds; please log in again."
|
||||
msgstr "Boli ste neaktívni viac ako %s sekúnd, prihláste sa prosím znovu"
|
||||
msgstr "Boli ste neaktívni viac ako %s sekúnd, prihláste sa prosím znovu."
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:667
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:669
|
||||
@ -8033,7 +8032,7 @@ msgstr "Súbor %s neobsahuje ID kľúč"
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
|
||||
msgid "Hardware authentication failed!"
|
||||
msgstr "Hardwarové prihlasovanie zlyhalo"
|
||||
msgstr "Hardwarové prihlasovanie zlyhalo!"
|
||||
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
|
||||
msgid "No valid authentication key plugged"
|
||||
@ -11165,7 +11164,7 @@ msgid ""
|
||||
"below, if there is any, may also help you in diagnosing the problem."
|
||||
msgstr ""
|
||||
"Vyskytla sa chyba v SQL dopyte. Nižšie uvedený MySQL výstup (ak je nejaký) "
|
||||
"Vám môže pomôcť odstrániť problém"
|
||||
"Vám môže pomôcť odstrániť problém."
|
||||
|
||||
#: libraries/sqlparser.lib.php:178
|
||||
msgid ""
|
||||
|
||||
@ -4,16 +4,16 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-07-12 14:41+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:13+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Serbian (latin) <http://l10n.cihar.com/projects/phpmyadmin/"
|
||||
"master/sr@latin/>\n"
|
||||
"Language-Team: Serbian (latin) "
|
||||
"<http://l10n.cihar.com/projects/phpmyadmin/master/sr@latin/>\n"
|
||||
"Language: sr@latin\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
|
||||
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
|
||||
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
"X-Generator: Weblate 1.6-dev\n"
|
||||
|
||||
#: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:339
|
||||
@ -1690,7 +1690,7 @@ msgid ""
|
||||
"Note: If the file contains multiple tables, they will be combined into one."
|
||||
msgstr ""
|
||||
"Imajte u vidu: Ako datoteka sadrži više tabela, one će biti kombinovane u "
|
||||
"jednu"
|
||||
"jednu."
|
||||
|
||||
#: js/messages.php:262
|
||||
msgid "Hide query box"
|
||||
@ -2897,7 +2897,7 @@ msgstr "Primarni ključ je obrisan"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Indeks %s je obrisan"
|
||||
msgstr "Indeks %s je obrisan."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -3834,7 +3834,7 @@ msgstr ""
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Direktorijum koji ste izabrali za slanje nije dostupan"
|
||||
msgstr "Direktorijum koji ste izabrali za slanje nije dostupan."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -7909,7 +7909,7 @@ msgstr ""
|
||||
#: libraries/plugins/auth/AuthenticationSignon.class.php:254
|
||||
#, php-format
|
||||
msgid "No activity within %s seconds; please log in again."
|
||||
msgstr "Nije bilo aktivnosti %s ili više sekundi, molimo prijavite se ponovo"
|
||||
msgstr "Nije bilo aktivnosti %s ili više sekundi, molimo prijavite se ponovo."
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:667
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:669
|
||||
@ -7933,7 +7933,7 @@ msgstr "Datoteka %s ne sadrži ni jedan identifikator ključa"
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
|
||||
msgid "Hardware authentication failed!"
|
||||
msgstr "Hardverska autentikacija nije uspela"
|
||||
msgstr "Hardverska autentikacija nije uspela!"
|
||||
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
|
||||
msgid "No valid authentication key plugged"
|
||||
@ -11077,7 +11077,7 @@ msgid ""
|
||||
"below, if there is any, may also help you in diagnosing the problem."
|
||||
msgstr ""
|
||||
"Izgleda da postoji greška u vašem SQL upitu. Ovde je poruka o greški MySQL "
|
||||
"servera, koja vam može pomoći u otkrivanju problema"
|
||||
"servera, koja vam može pomoći u otkrivanju problema."
|
||||
|
||||
#: libraries/sqlparser.lib.php:178
|
||||
msgid ""
|
||||
|
||||
22
po/uk.po
22
po/uk.po
@ -4,16 +4,16 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-07-12 14:49+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:14+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Ukrainian <http://l10n.cihar.com/projects/phpmyadmin/master/"
|
||||
"uk/>\n"
|
||||
"Language-Team: Ukrainian "
|
||||
"<http://l10n.cihar.com/projects/phpmyadmin/master/uk/>\n"
|
||||
"Language: uk\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
|
||||
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
|
||||
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
"X-Generator: Weblate 1.6-dev\n"
|
||||
|
||||
#: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:339
|
||||
@ -1703,7 +1703,7 @@ msgstr "Додати %d значення(ь)"
|
||||
msgid ""
|
||||
"Note: If the file contains multiple tables, they will be combined into one."
|
||||
msgstr ""
|
||||
"Примітка: Якщо файл містить кілька таблиць, то вони будуть об'єднані в одну"
|
||||
"Примітка: Якщо файл містить кілька таблиць, то вони будуть об'єднані в одну."
|
||||
|
||||
#: js/messages.php:262
|
||||
msgid "Hide query box"
|
||||
@ -2897,7 +2897,7 @@ msgstr "Первинний ключ було знищено"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "Індекс %s було знищено"
|
||||
msgstr "Індекс %s було знищено."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -3834,7 +3834,7 @@ msgstr "Виберіть з каталога веб-сервера для від
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Встановлений Вами каталог для завантаження файлів недоступний"
|
||||
msgstr "Встановлений Вами каталог для завантаження файлів недоступний."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -8085,7 +8085,7 @@ msgstr "Авторизація без паролю заборонена в на
|
||||
#: libraries/plugins/auth/AuthenticationSignon.class.php:254
|
||||
#, php-format
|
||||
msgid "No activity within %s seconds; please log in again."
|
||||
msgstr "Відсутня діяльність протягом %s секунд; будь ласка, увійдіть знову"
|
||||
msgstr "Відсутня діяльність протягом %s секунд; будь ласка, увійдіть знову."
|
||||
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:667
|
||||
#: libraries/plugins/auth/AuthenticationCookie.class.php:669
|
||||
@ -8110,7 +8110,7 @@ msgstr "Файл %s не містить ідентифікатора (id) клю
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
|
||||
msgid "Hardware authentication failed!"
|
||||
msgstr "Апаратна аутентифікація не вдалася"
|
||||
msgstr "Апаратна аутентифікація не вдалася!"
|
||||
|
||||
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
|
||||
msgid "No valid authentication key plugged"
|
||||
@ -11381,7 +11381,7 @@ msgid ""
|
||||
"below, if there is any, may also help you in diagnosing the problem."
|
||||
msgstr ""
|
||||
"Схоже на помилку у SQL запиті. У визначенні проблеми може допомогти "
|
||||
"повідомлення про помилку сервера MySQL, що наведено нижче (якщо таке є)"
|
||||
"повідомлення про помилку сервера MySQL, що наведено нижче (якщо таке є)."
|
||||
|
||||
#: libraries/sqlparser.lib.php:178
|
||||
msgid ""
|
||||
|
||||
@ -4,10 +4,10 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-05-07 17:31+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:32+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"Language-Team: Uzbek (latin) <http://l10n.cihar.com/projects/phpmyadmin/"
|
||||
"master/uz@latin/>\n"
|
||||
"Language-Team: Uzbek (latin) "
|
||||
"<http://l10n.cihar.com/projects/phpmyadmin/master/uz@latin/>\n"
|
||||
"Language: uz@latin\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -1914,7 +1914,7 @@ msgstr "Maksimum bajarilish vaqti"
|
||||
#: libraries/DisplayResults.class.php:733
|
||||
#, php-format
|
||||
msgid "%d is not valid row number."
|
||||
msgstr "%d soni to‘g‘ri qator raqami emas!"
|
||||
msgstr "%d soni to‘g‘ri qator raqami emas."
|
||||
|
||||
#: js/messages.php:271 libraries/display_indexes.lib.php:195
|
||||
#: libraries/insert_edit.lib.php:1462
|
||||
@ -3089,7 +3089,7 @@ msgstr ""
|
||||
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
|
||||
msgstr ""
|
||||
"Yuklanayotgan fayl hajmi PHP konfiguratsion faylida (php.ini) ko‘rsatilgan "
|
||||
"\"upload_max_filesize\" direktivasi qiymatidan katta!"
|
||||
"\"upload_max_filesize\" direktivasi qiymatidan katta."
|
||||
|
||||
#: libraries/File.class.php:282
|
||||
msgid ""
|
||||
@ -3097,7 +3097,7 @@ msgid ""
|
||||
"the HTML form."
|
||||
msgstr ""
|
||||
"Yuklanayotgan fayl hajmi HTML formada ko‘rsatilgan \"MAX_FILE_SIZE\" "
|
||||
"direktivasi qiymatidan katta!"
|
||||
"direktivasi qiymatidan katta."
|
||||
|
||||
#: libraries/File.class.php:285
|
||||
msgid "The uploaded file was only partially uploaded."
|
||||
@ -3198,7 +3198,7 @@ msgstr "Birlamchi kalit o‘chirildi"
|
||||
#: libraries/Index.class.php:608
|
||||
#, php-format
|
||||
msgid "Index %s has been dropped."
|
||||
msgstr "\"%s\" indeksi o‘chirildi"
|
||||
msgstr "\"%s\" indeksi o‘chirildi."
|
||||
|
||||
#: libraries/Index.class.php:731
|
||||
#, php-format
|
||||
@ -4170,7 +4170,7 @@ msgstr "Yuklash katalogidan"
|
||||
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
|
||||
#: libraries/sql_query_form.lib.php:483
|
||||
msgid "The directory you set for upload work cannot be reached."
|
||||
msgstr "Ko‘rsatilgan katalokka yuklab bo‘lmadi"
|
||||
msgstr "Ko‘rsatilgan katalokka yuklab bo‘lmadi."
|
||||
|
||||
#: libraries/Util.class.php:3452
|
||||
msgid "There are no files to upload"
|
||||
@ -10668,12 +10668,12 @@ msgstr "Ma`lumotlar bazalarini va jadvallarni o‘chirishga ruxsat beradi."
|
||||
msgid "Allows reloading server settings and flushing the server's caches."
|
||||
msgstr ""
|
||||
"Server sozlanishlarini qayta yuklashga va uning keshlarini tozalashga ruxsat "
|
||||
"beradi"
|
||||
"beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:202
|
||||
#: libraries/server_privileges.lib.php:960 server_privileges.php:90
|
||||
msgid "Allows shutting down the server."
|
||||
msgstr "Server ishini yakunlashga ruxsat beradi"
|
||||
msgstr "Server ishini yakunlashga ruxsat beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:207
|
||||
#: libraries/server_privileges.lib.php:952 server_privileges.php:82
|
||||
@ -10683,7 +10683,7 @@ msgstr "Barcha foydalanuvchilarning jarayonlarini ko‘rishga ruxsat beradi"
|
||||
#: libraries/server_privileges.lib.php:212
|
||||
#: libraries/server_privileges.lib.php:848 server_privileges.php:73
|
||||
msgid "Allows importing data from and exporting data into files."
|
||||
msgstr "Ma`lumotlarni fayldan import va faylga eksport qilishga ruxsat beradi"
|
||||
msgstr "Ma`lumotlarni fayldan import va faylga eksport qilishga ruxsat beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:217
|
||||
#: libraries/server_privileges.lib.php:679
|
||||
@ -10694,17 +10694,17 @@ msgstr "MySQL-serverning ushbu versiyada bunday xususiyat mavjud emas!"
|
||||
#: libraries/server_privileges.lib.php:222
|
||||
#: libraries/server_privileges.lib.php:876 server_privileges.php:75
|
||||
msgid "Allows creating and dropping indexes."
|
||||
msgstr "Indekslar qo‘shish va ularni o‘chirishga ruxsat beradi"
|
||||
msgstr "Indekslar qo‘shish va ularni o‘chirishga ruxsat beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:227
|
||||
#: libraries/server_privileges.lib.php:874 server_privileges.php:60
|
||||
msgid "Allows altering the structure of existing tables."
|
||||
msgstr "Mavjud jadvallarning tuzilishini o‘zgartirishga ruxsat beradi"
|
||||
msgstr "Mavjud jadvallarning tuzilishini o‘zgartirishga ruxsat beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:232
|
||||
#: libraries/server_privileges.lib.php:964 server_privileges.php:88
|
||||
msgid "Gives access to the complete list of databases."
|
||||
msgstr "Ma`lumotlar bazalarining to‘liq ro‘yxatiga ruxsat beradi"
|
||||
msgstr "Ma`lumotlar bazalarining to‘liq ro‘yxatiga ruxsat beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:237
|
||||
#: libraries/server_privileges.lib.php:948 server_privileges.php:91
|
||||
@ -10716,37 +10716,37 @@ msgstr ""
|
||||
"Ulanishlar maksimal qiymatga yetganda ham ulanish o‘rnatishga ruxsat "
|
||||
"beradi. (Ko‘pgina administrativ vazifalarni bajarish uchun kerak, masalan, "
|
||||
"global o‘zgaruvchilar o‘rnatish yoki boshqa foydalanuvchi jarayonini "
|
||||
"o‘chirish)"
|
||||
"o‘chirish)."
|
||||
|
||||
#: libraries/server_privileges.lib.php:242
|
||||
#: libraries/server_privileges.lib.php:886 server_privileges.php:65
|
||||
msgid "Allows creating temporary tables."
|
||||
msgstr "Vaqtinchalik jadvallar tuzishga ruxsat beradi"
|
||||
msgstr "Vaqtinchalik jadvallar tuzishga ruxsat beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:247
|
||||
#: libraries/server_privileges.lib.php:969 server_privileges.php:77
|
||||
msgid "Allows locking tables for the current thread."
|
||||
msgstr "Joriy oqim uchun jadvalni blokirovku qilishga ruxsat beradi"
|
||||
msgstr "Joriy oqim uchun jadvalni blokirovku qilishga ruxsat beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:252
|
||||
#: libraries/server_privileges.lib.php:982 server_privileges.php:86
|
||||
msgid "Needed for the replication slaves."
|
||||
msgstr ""
|
||||
"Replikatsiya (zaxira nusxa ko‘chirish) vaqtida tobe serverlar uchun kerak"
|
||||
"Replikatsiya (zaxira nusxa ko‘chirish) vaqtida tobe serverlar uchun kerak."
|
||||
|
||||
#: libraries/server_privileges.lib.php:257
|
||||
#: libraries/server_privileges.lib.php:978 server_privileges.php:85
|
||||
msgid "Allows the user to ask where the slaves / masters are."
|
||||
msgstr ""
|
||||
"Bosh va tobe serverlarning joylashishi haqidagi ma`lumotni talab qilishga "
|
||||
"ruxsat beradi"
|
||||
"ruxsat beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:262
|
||||
#: libraries/server_privileges.lib.php:278
|
||||
#: libraries/server_privileges.lib.php:906
|
||||
#: libraries/server_privileges.lib.php:913 server_privileges.php:67
|
||||
msgid "Allows creating new views."
|
||||
msgstr "Yangi namoyishlar tuzish(CREATE VIEW)ga ruxsat beradi"
|
||||
msgstr "Yangi namoyishlar tuzish(CREATE VIEW)ga ruxsat beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:267
|
||||
#: libraries/server_privileges.lib.php:920 server_privileges.php:71
|
||||
@ -10764,28 +10764,29 @@ msgstr ""
|
||||
#: libraries/server_privileges.lib.php:289
|
||||
#: libraries/server_privileges.lib.php:890 server_privileges.php:89
|
||||
msgid "Allows performing SHOW CREATE VIEW queries."
|
||||
msgstr "Namoyish tuzadigan so‘rov(SHOW CREATE VIEW)ni bajarishga ruxsat beradi"
|
||||
msgstr "Namoyish tuzadigan so‘rov(SHOW CREATE VIEW)ni bajarishga ruxsat beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:294
|
||||
#: libraries/server_privileges.lib.php:894 server_privileges.php:63
|
||||
msgid "Allows creating stored routines."
|
||||
msgstr "Saqlanadigan muolajalar tuzishga ruxsat beradi"
|
||||
msgstr "Saqlanadigan muolajalar tuzishga ruxsat beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:299
|
||||
#: libraries/server_privileges.lib.php:898 server_privileges.php:61
|
||||
msgid "Allows altering and dropping stored routines."
|
||||
msgstr "Saqlanadigan muolajalarni o‘zgartirish va o‘chirishga ruxsat beradi"
|
||||
msgstr "Saqlanadigan muolajalarni o‘zgartirish va o‘chirishga ruxsat beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:304
|
||||
#: libraries/server_privileges.lib.php:986 server_privileges.php:66
|
||||
msgid "Allows creating, dropping and renaming user accounts."
|
||||
msgstr ""
|
||||
"Foydalanuvchilar hisobini qo‘shish, o‘chirish va o‘zgartirishga ruxsat beradi"
|
||||
"Foydalanuvchilar hisobini qo‘shish, o‘chirish va o‘zgartirishga ruxsat "
|
||||
"beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:309
|
||||
#: libraries/server_privileges.lib.php:900 server_privileges.php:72
|
||||
msgid "Allows executing stored routines."
|
||||
msgstr "Saqlanadigan muolajalarni bajarishga ruxsat beradi"
|
||||
msgstr "Saqlanadigan muolajalarni bajarishga ruxsat beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:357
|
||||
#: libraries/server_privileges.lib.php:358
|
||||
@ -10809,7 +10810,7 @@ msgstr ""
|
||||
#: libraries/server_privileges.lib.php:537 server_privileges.php:79
|
||||
msgid "Limits the number of queries the user may send to the server per hour."
|
||||
msgstr ""
|
||||
"Foydalanuvchi bir soat davomida yuborishi mumkin bo‘lgan so‘rovlar soni"
|
||||
"Foydalanuvchi bir soat davomida yuborishi mumkin bo‘lgan so‘rovlar soni."
|
||||
|
||||
#: libraries/server_privileges.lib.php:544
|
||||
#: libraries/server_privileges.lib.php:550 server_privileges.php:80
|
||||
@ -10818,21 +10819,21 @@ msgid ""
|
||||
"execute per hour."
|
||||
msgstr ""
|
||||
"Foydalanuvchi bir soat davomida bajarishi mumkin bo‘lgan biron-bir jadval "
|
||||
"yoki ma`lumotlar bazasini o‘zgartiradigan buyruqlar soni"
|
||||
"yoki ma`lumotlar bazasini o‘zgartiradigan buyruqlar soni."
|
||||
|
||||
#: libraries/server_privileges.lib.php:557
|
||||
#: libraries/server_privileges.lib.php:562 server_privileges.php:78
|
||||
msgid "Limits the number of new connections the user may open per hour."
|
||||
msgstr ""
|
||||
"Foydalanuvchi bir soat davomida o‘rnatishi mumkin bo‘lgan yangi ulanishlar "
|
||||
"soni"
|
||||
"soni."
|
||||
|
||||
#: libraries/server_privileges.lib.php:569
|
||||
#: libraries/server_privileges.lib.php:577 server_privileges.php:81
|
||||
msgid "Limits the number of simultaneous connections the user may have."
|
||||
msgstr ""
|
||||
"Bir foydalanuvchi tomonidan bir vaqtning o‘zida o‘rnatishi mumkin bo‘lgan "
|
||||
"ulanishlar soni"
|
||||
"ulanishlar soni."
|
||||
|
||||
#: libraries/server_privileges.lib.php:630
|
||||
#: libraries/server_privileges.lib.php:804
|
||||
@ -10863,18 +10864,18 @@ msgstr "Ma`lumotlar bazasi privilegiyalari"
|
||||
|
||||
#: libraries/server_privileges.lib.php:869 server_privileges.php:64
|
||||
msgid "Allows creating new tables."
|
||||
msgstr "Yangi jadvallar tuzishga ruxsat beradi"
|
||||
msgstr "Yangi jadvallar tuzishga ruxsat beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:881 server_privileges.php:70
|
||||
msgid "Allows dropping tables."
|
||||
msgstr "Jadvallarni o‘chirishga rux`sat beradi"
|
||||
msgstr "Jadvallarni o‘chirishga rux`sat beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:942 server_privileges.php:74
|
||||
msgid ""
|
||||
"Allows adding users and privileges without reloading the privilege tables."
|
||||
msgstr ""
|
||||
"Foydalanuvchilarni qo‘shish va privilegiyalar jadvalini qayta yuklamasdan "
|
||||
"privilegiyalar qo‘shishga ruxsat beradi"
|
||||
"privilegiyalar qo‘shishga ruxsat beradi."
|
||||
|
||||
#: libraries/server_privileges.lib.php:1050
|
||||
msgid "Login Information"
|
||||
|
||||
@ -9,6 +9,8 @@
|
||||
require_once 'libraries/common.inc.php';
|
||||
require_once 'libraries/Advisor.class.php';
|
||||
require_once 'libraries/ServerStatusData.class.php';
|
||||
require_once 'libraries/server_status_advisor.lib.php';
|
||||
|
||||
if (PMA_DRIZZLE) {
|
||||
$server_master_status = false;
|
||||
$server_slave_status = false;
|
||||
@ -28,62 +30,10 @@ $scripts->addFile('server_status_advisor.js');
|
||||
*/
|
||||
$response->addHTML('<div>');
|
||||
$response->addHTML($ServerStatusData->getMenuHtml());
|
||||
$response->addHTML(PMA_getAdvisorHtml());
|
||||
$response->addHTML(PMA_getHtmlForAdvisor());
|
||||
$response->addHTML('</div>');
|
||||
exit;
|
||||
|
||||
|
||||
/**
|
||||
* Returns html with Advisor
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
function PMA_getAdvisorHtml()
|
||||
{
|
||||
$output = '<a href="#openAdvisorInstructions">';
|
||||
$output .= PMA_Util::getIcon('b_help.png', __('Instructions'));
|
||||
$output .= '</a>';
|
||||
$output .= '<div id="statustabs_advisor"></div>';
|
||||
$output .= '<div id="advisorInstructionsDialog" style="display:none;">';
|
||||
$output .= '<p>';
|
||||
$output .= __(
|
||||
'The Advisor system can provide recommendations '
|
||||
. 'on server variables by analyzing the server status variables.'
|
||||
);
|
||||
$output .= '</p>';
|
||||
$output .= '<p>';
|
||||
$output .= __(
|
||||
'Do note however that this system provides recommendations '
|
||||
. 'based on simple calculations and by rule of thumb which may '
|
||||
. 'not necessarily apply to your system.'
|
||||
);
|
||||
$output .= '</p>';
|
||||
$output .= '<p>';
|
||||
$output .= __(
|
||||
'Prior to changing any of the configuration, be sure to know '
|
||||
. 'what you are changing (by reading the documentation) and how '
|
||||
. 'to undo the change. Wrong tuning can have a very negative '
|
||||
. 'effect on performance.'
|
||||
);
|
||||
$output .= '</p>';
|
||||
$output .= '<p>';
|
||||
$output .= __(
|
||||
'The best way to tune your system would be to change only one '
|
||||
. 'setting at a time, observe or benchmark your database, and undo '
|
||||
. 'the change if there was no clearly measurable improvement.'
|
||||
);
|
||||
$output .= '</p>';
|
||||
$output .= '</div>';
|
||||
$output .= '<div id="advisorData" style="display:none;">';
|
||||
$advisor = new Advisor();
|
||||
$output .= htmlspecialchars(
|
||||
json_encode(
|
||||
$advisor->run()
|
||||
)
|
||||
);
|
||||
$output .= '</div>';
|
||||
|
||||
return $output;
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
138
sql.php
138
sql.php
@ -219,135 +219,19 @@ if ((0 == $num_rows && 0 == $unlim_num_rows) || $is_affected) {
|
||||
);
|
||||
|
||||
} else {
|
||||
// At least one row is returned -> displays a table with results
|
||||
// If we are retrieving the full value of a truncated field or the original
|
||||
// value of a transformed field, show it here and exit
|
||||
if ($_REQUEST['grid_edit'] == true) {
|
||||
PMA_sendResponseForGridEdit($result);
|
||||
}
|
||||
|
||||
// Gets the list of fields properties
|
||||
if (isset($result) && $result) {
|
||||
$fields_meta = $GLOBALS['dbi']->getFieldsMeta($result);
|
||||
}
|
||||
|
||||
// Should be initialized these parameters before parsing
|
||||
$showtable = isset($showtable) ? $showtable : null;
|
||||
$url_query = isset($url_query) ? $url_query : null;
|
||||
|
||||
$response = PMA_Response::getInstance();
|
||||
$header = $response->getHeader();
|
||||
$scripts = $header->getScripts();
|
||||
|
||||
// hide edit and delete links:
|
||||
// - for information_schema
|
||||
// - if the result set does not contain all the columns of a unique key
|
||||
// and we are not just browing all the columns of an updatable view
|
||||
$updatableView
|
||||
= $justBrowsing
|
||||
&& trim($analyzed_sql[0]['select_expr_clause']) == '*'
|
||||
&& PMA_Table::isUpdatableView($db, $table);
|
||||
|
||||
$has_unique = PMA_resultSetContainsUniqueKey(
|
||||
$db, $table, $fields_meta
|
||||
);
|
||||
|
||||
$editable = $has_unique || $updatableView;
|
||||
|
||||
// Displays the results in a table
|
||||
if (empty($disp_mode)) {
|
||||
// see the "PMA_setDisplayMode()" function in
|
||||
// libraries/DisplayResults.class.php
|
||||
$disp_mode = 'urdr111101';
|
||||
}
|
||||
if (!empty($table) && ($GLOBALS['dbi']->isSystemSchema($db) || !$editable)) {
|
||||
$disp_mode = 'nnnn110111';
|
||||
}
|
||||
if ( isset($_REQUEST['printview']) && $_REQUEST['printview'] == '1') {
|
||||
$disp_mode = 'nnnn000000';
|
||||
}
|
||||
|
||||
if (isset($_REQUEST['table_maintenance'])) {
|
||||
$scripts->addFile('makegrid.js');
|
||||
$scripts->addFile('sql.js');
|
||||
if (isset($message)) {
|
||||
$message = PMA_Message::success($message);
|
||||
$table_maintenance_html = PMA_Util::getMessage(
|
||||
$message, $GLOBALS['sql_query'], 'success'
|
||||
);
|
||||
}
|
||||
$table_maintenance_html .= PMA_getHtmlForSqlQueryResultsTable(
|
||||
isset($sql_data) ? $sql_data : null, $displayResultsObject, $db, $goto,
|
||||
$pmaThemeImage, $text_dir, $url_query, $disp_mode, $sql_limit_to_append,
|
||||
false, $unlim_num_rows, $num_rows, $showtable, $result, $querytime,
|
||||
$analyzed_sql_results, false
|
||||
);
|
||||
if (empty($sql_data) || ($sql_data['valid_queries'] = 1)) {
|
||||
$response->addHTML($table_maintenance_html);
|
||||
exit();
|
||||
}
|
||||
}
|
||||
|
||||
if (!isset($_REQUEST['printview']) || $_REQUEST['printview'] != '1') {
|
||||
$scripts->addFile('makegrid.js');
|
||||
$scripts->addFile('sql.js');
|
||||
unset($message);
|
||||
//we don't need to buffer the output in getMessage here.
|
||||
//set a global variable and check against it in the function
|
||||
$GLOBALS['buffer_message'] = false;
|
||||
}
|
||||
|
||||
$print_view_header_html = PMA_getHtmlForPrintViewHeader(
|
||||
$db, $full_sql_query, $num_rows
|
||||
);
|
||||
|
||||
$previous_update_query_html = PMA_getHtmlForPreviousUpdateQuery(
|
||||
// At least one row is returned -> displays a table with results
|
||||
PMA_sendResponseForResultsReturned(
|
||||
isset($result) ? $result : null, $justBrowsing, $analyzed_sql_results,
|
||||
$db, $table, isset($disp_mode) ? $disp_mode : null,
|
||||
isset($message) ? $message : null, isset($sql_data) ? $sql_data : null,
|
||||
$displayResultsObject, $goto, $pmaThemeImage,
|
||||
$sql_limit_to_append, $unlim_num_rows,
|
||||
$num_rows, $querytime, $full_sql_query,
|
||||
isset($disp_query) ? $disp_query : null,
|
||||
$cfg['ShowSQL'], isset($sql_data) ? $sql_data : null,
|
||||
isset($disp_message) ? $disp_message : null
|
||||
);
|
||||
|
||||
$profiling_chart_html = PMA_getHtmlForProfilingChart(
|
||||
$disp_mode, $db, isset($profiling_results) ? $profiling_results : null
|
||||
);
|
||||
|
||||
$missing_unique_column_msg = PMA_getMessageIfMissingColumnIndex(
|
||||
$table, $db, $editable, $disp_mode
|
||||
);
|
||||
|
||||
$bookmark_created_msg = PMA_getBookmarkCreatedMessage();
|
||||
|
||||
$table_html = PMA_getHtmlForSqlQueryResultsTable(
|
||||
isset($sql_data) ? $sql_data : null, $displayResultsObject, $db, $goto,
|
||||
$pmaThemeImage, $text_dir, $url_query, $disp_mode, $sql_limit_to_append,
|
||||
$editable, $unlim_num_rows, $num_rows, $showtable, $result, $querytime,
|
||||
$analyzed_sql_results, $is_procedure
|
||||
);
|
||||
|
||||
$indexes_problems_html = PMA_getHtmlForIndexesProblems(
|
||||
isset($disp_message) ? $disp_message : null, $profiling_results,
|
||||
isset($query_type) ? $query_type : null,
|
||||
isset($selected) ? $selected : null
|
||||
isset($selected) ? $selected : null, $sql_query,
|
||||
isset($complete_query) ? $complete_query : null, $cfg
|
||||
);
|
||||
|
||||
$bookmark_support_html = PMA_getHtmlForBookmark(
|
||||
$disp_mode, isset($cfg['Bookmark']) ? $cfg['Bookmark'] : '', $sql_query,
|
||||
$db, $table, isset($complete_query) ? $complete_query : $sql_query,
|
||||
$cfg['Bookmark']['user']
|
||||
);
|
||||
|
||||
$print_button_html = PMA_getHtmlForPrintButton();
|
||||
|
||||
$html_output = isset($table_maintenance_html) ? $table_maintenance_html : '';
|
||||
|
||||
$html_output .= isset($print_view_header_html) ? $print_view_header_html : '';
|
||||
|
||||
$html_output .= PMA_getHtmlForSqlQueryResults(
|
||||
$previous_update_query_html, $profiling_chart_html,
|
||||
$missing_unique_column_msg, $bookmark_created_msg,
|
||||
$table_html, $indexes_problems_html, $bookmark_support_html,
|
||||
$print_button_html
|
||||
);
|
||||
|
||||
$response->addHTML($html_output);
|
||||
} // end rows returned
|
||||
?>
|
||||
|
||||
@ -34,4 +34,41 @@ $_SESSION[' PMA_token '] = 'token';
|
||||
$GLOBALS['lang'] = 'en';
|
||||
$GLOBALS['is_ajax_request'] = false;
|
||||
|
||||
|
||||
define('PMA_HAS_RUNKIT', function_exists('runkit_constant_redefine'));
|
||||
$GLOBALS['runkit_internal_override'] = ini_get('runkit.internal_override');
|
||||
|
||||
|
||||
/**
|
||||
* Function to emulate headers() function by storing headers in GLOBAL array.
|
||||
*/
|
||||
function test_header($string, $replace = true, $http_response_code = 200)
|
||||
{
|
||||
if (! isset($GLOBALS['header'])) {
|
||||
$GLOBALS['header'] = array();
|
||||
}
|
||||
|
||||
$GLOBALS['header'][] = $string;
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to emulate headers_hest.
|
||||
*/
|
||||
function test_headers_sent()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (PMA_HAS_RUNKIT && $GLOBALS['runkit_internal_override']) {
|
||||
echo "Enabling headers testing...\n";
|
||||
runkit_function_rename('header', 'test_header_override');
|
||||
runkit_function_rename('headers_sent', 'test_headers_sent_override');
|
||||
runkit_function_rename('test_header', 'header');
|
||||
runkit_function_rename('test_headers_sent', 'headers_sent');
|
||||
define('PMA_TEST_HEADERS', true);
|
||||
} else {
|
||||
echo "No headers testing.\n";
|
||||
echo "Please install runkit and enable runkit.internal_override!\n";
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
107
test/classes/PMA_TableSearch_test.php
Normal file
107
test/classes/PMA_TableSearch_test.php
Normal file
@ -0,0 +1,107 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* Tests for PMA_TableSearch
|
||||
*
|
||||
* @package PhpMyAdmin-test
|
||||
*/
|
||||
|
||||
/*
|
||||
* Include to test.
|
||||
*/
|
||||
require_once 'libraries/TableSearch.class.php';
|
||||
require_once 'libraries/Util.class.php';
|
||||
require_once 'libraries/php-gettext/gettext.inc';
|
||||
require_once 'libraries/database_interface.inc.php';
|
||||
require_once 'libraries/relation.lib.php';
|
||||
require_once 'libraries/sqlparser.lib.php';
|
||||
|
||||
/**
|
||||
* Tests for PMA_TableSearch
|
||||
*
|
||||
* @package PhpMyAdmin-test
|
||||
*/
|
||||
class PMA_TableSearch_Test extends PHPUnit_Framework_TestCase
|
||||
{
|
||||
|
||||
/**
|
||||
* Setup function for test cases
|
||||
*
|
||||
* @access protected
|
||||
* @return void
|
||||
*/
|
||||
protected function setUp()
|
||||
{
|
||||
/**
|
||||
* SET these to avoid undefined index error
|
||||
*/
|
||||
$GLOBALS['server'] = 1;
|
||||
|
||||
$dbi = $this->getMockBuilder('PMA_DatabaseInterface')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
|
||||
$columns =array(
|
||||
array(
|
||||
'Field' => 'Field1',
|
||||
'Type' => 'Type1',
|
||||
'Null' => 'Null1',
|
||||
'Collation' => 'Collation1',
|
||||
),
|
||||
array(
|
||||
'Field' => 'Field2',
|
||||
'Type' => 'Type2',
|
||||
'Null' => 'Null2',
|
||||
'Collation' => 'Collation2',
|
||||
)
|
||||
);
|
||||
$dbi->expects($this->any())->method('getColumns')
|
||||
->will($this->returnValue($columns));
|
||||
|
||||
$show_create_table = "CREATE TABLE `pma_bookmark` (
|
||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||
`dbase` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
|
||||
`user` varchar(255) COLLATE utf8_bin NOT NULL DEFAULT '',
|
||||
`label` varchar(255) CHARACTER SET utf8 NOT NULL DEFAULT '',
|
||||
`query` text COLLATE utf8_bin NOT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
KEY `foreign_field` (`foreign_db`,`foreign_table`)
|
||||
) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Bookmarks'";
|
||||
|
||||
$dbi->expects($this->any())->method('fetchValue')
|
||||
->will($this->returnValue($show_create_table));
|
||||
|
||||
$GLOBALS['dbi'] = $dbi;
|
||||
}
|
||||
|
||||
/**
|
||||
* tearDown function for test cases
|
||||
*
|
||||
* @access protected
|
||||
* @return void
|
||||
*/
|
||||
protected function tearDown()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Test for __construct
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testConstruct()
|
||||
{
|
||||
$tableSearch = new PMA_TableSearch("PMA", "PMA_BookMark", "normal");
|
||||
$columNames = $tableSearch->getColumnNames();
|
||||
$this->assertEquals(
|
||||
'Field1',
|
||||
$columNames[0]
|
||||
);
|
||||
$this->assertEquals(
|
||||
'Field2',
|
||||
$columNames[1]
|
||||
);
|
||||
}
|
||||
}
|
||||
?>
|
||||
@ -1,4 +1,5 @@
|
||||
<?php
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* Tests for Table.class.php
|
||||
*
|
||||
@ -8,7 +9,6 @@
|
||||
/*
|
||||
* Include to test.
|
||||
*/
|
||||
|
||||
require_once 'libraries/Table.class.php';
|
||||
require_once 'libraries/Util.class.php';
|
||||
require_once 'libraries/database_interface.inc.php';
|
||||
@ -18,7 +18,6 @@ require_once 'libraries/Theme.class.php';
|
||||
require_once 'libraries/Tracker.class.php';
|
||||
require_once 'libraries/relation.lib.php';
|
||||
|
||||
|
||||
/**
|
||||
* Tests behaviour of PMA_Table class
|
||||
*
|
||||
@ -33,6 +32,9 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase
|
||||
*/
|
||||
protected function setUp()
|
||||
{
|
||||
/**
|
||||
* SET these to avoid undefined index error
|
||||
*/
|
||||
$GLOBALS['server'] = 0;
|
||||
$GLOBALS['cfg']['Server']['DisableIS'] = false;
|
||||
$GLOBALS['cfg']['ServerDefault'] = 1;
|
||||
@ -43,8 +45,93 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['pmaThemeImage'] = 'themes/dot.gif';
|
||||
$GLOBALS['is_ajax_request'] = false;
|
||||
$GLOBALS['cfgRelation'] = PMA_getRelationsParam();
|
||||
|
||||
$dbi = $this->getMockBuilder('PMA_DatabaseInterface')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
|
||||
$sql_isView_true = "SELECT TABLE_NAME
|
||||
FROM information_schema.VIEWS
|
||||
WHERE TABLE_SCHEMA = 'PMA'
|
||||
AND TABLE_NAME = 'PMA_BookMark'";
|
||||
|
||||
$sql_isView_false = "SELECT TABLE_NAME
|
||||
FROM information_schema.VIEWS
|
||||
WHERE TABLE_SCHEMA = 'PMA'
|
||||
AND TABLE_NAME = 'PMA_BookMark_2'";
|
||||
|
||||
$sql_isUpdatableView_true = "SELECT TABLE_NAME
|
||||
FROM information_schema.VIEWS
|
||||
WHERE TABLE_SCHEMA = 'PMA'
|
||||
AND TABLE_NAME = 'PMA_BookMark'
|
||||
AND IS_UPDATABLE = 'YES'";
|
||||
|
||||
$sql_isUpdatableView_false = "SELECT TABLE_NAME
|
||||
FROM information_schema.VIEWS
|
||||
WHERE TABLE_SCHEMA = 'PMA'
|
||||
AND TABLE_NAME = 'PMA_BookMark_2'
|
||||
AND IS_UPDATABLE = 'YES'";
|
||||
|
||||
$sql_analyzeStructure_true = "SELECT COLUMN_NAME, DATA_TYPE
|
||||
FROM information_schema.COLUMNS
|
||||
WHERE TABLE_SCHEMA = 'PMA'
|
||||
AND TABLE_NAME = 'PMA_BookMark'";
|
||||
|
||||
$fetchResult = array(
|
||||
array(
|
||||
$sql_isView_true,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
0,
|
||||
true
|
||||
),
|
||||
array(
|
||||
$sql_isView_false,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
0,
|
||||
false
|
||||
),
|
||||
array(
|
||||
$sql_isUpdatableView_true,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
0,
|
||||
true
|
||||
),
|
||||
array(
|
||||
$sql_isUpdatableView_false,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
0,
|
||||
false
|
||||
),
|
||||
array(
|
||||
$sql_analyzeStructure_true,
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
0,
|
||||
array(
|
||||
array('COLUMN_NAME'=>'COLUMN_NAME', 'DATA_TYPE'=>'DATA_TYPE')
|
||||
)
|
||||
),
|
||||
);
|
||||
|
||||
$dbi = $this->getMockBuilder('PMA_DatabaseInterface')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
|
||||
$dbi->expects($this->any())->method('fetchResult')
|
||||
->will($this->returnValueMap($fetchResult));
|
||||
|
||||
$GLOBALS['dbi'] = $dbi;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Test object creating
|
||||
*
|
||||
@ -57,17 +144,37 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase
|
||||
}
|
||||
|
||||
/**
|
||||
* Test renaming
|
||||
* Test for constructor
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testRename()
|
||||
public function testConstruct()
|
||||
{
|
||||
$table = new PMA_Table('table1', 'pma_test');
|
||||
$table->rename('table3');
|
||||
$this->assertEquals('table3', $table->getName());
|
||||
$table = new PMA_Table("PMA_BookMark", "PMA");
|
||||
$this->assertEquals(
|
||||
'PMA_BookMark',
|
||||
$table->__toString()
|
||||
);
|
||||
$this->assertEquals(
|
||||
'PMA_BookMark',
|
||||
$table->getName()
|
||||
);
|
||||
$this->assertEquals(
|
||||
'PMA',
|
||||
$table->getDbName()
|
||||
);
|
||||
$this->assertEquals(
|
||||
'PMA.PMA_BookMark',
|
||||
$table->getFullName()
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test object creating
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
|
||||
/**
|
||||
* Test Set & Get
|
||||
*
|
||||
@ -88,34 +195,6 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test getting columns
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testColumns()
|
||||
{
|
||||
$table = new PMA_Table('table1', 'pma_test');
|
||||
$this->assertEquals(
|
||||
array('`pma_test`.`table1`.`i`', '`pma_test`.`table1`.`o`'),
|
||||
$table->getColumns()
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test getting unique columns
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testUniqueColumns()
|
||||
{
|
||||
$table = new PMA_Table('table1', 'pma_test');
|
||||
$this->assertEquals(
|
||||
array(),
|
||||
$table->getUniqueColumns()
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test name validation
|
||||
*
|
||||
@ -148,5 +227,72 @@ class PMA_Table_Test extends PHPUnit_Framework_TestCase
|
||||
array('te\\st', false),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Test for isView
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testIsView()
|
||||
{
|
||||
$this->assertEquals(
|
||||
false,
|
||||
PMA_Table::isView()
|
||||
);
|
||||
|
||||
//validate that it is the same as DBI fetchResult
|
||||
$this->assertEquals(
|
||||
true,
|
||||
PMA_Table::isView('PMA', 'PMA_BookMark')
|
||||
);
|
||||
$this->assertEquals(
|
||||
false,
|
||||
PMA_Table::isView('PMA', 'PMA_BookMark_2')
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test for isUpdatableView
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testIsUpdatableView()
|
||||
{
|
||||
$this->assertEquals(
|
||||
false,
|
||||
PMA_Table::isUpdatableView()
|
||||
);
|
||||
|
||||
//validate that it is the same as DBI fetchResult
|
||||
$this->assertEquals(
|
||||
true,
|
||||
PMA_Table::isUpdatableView('PMA', 'PMA_BookMark')
|
||||
);
|
||||
$this->assertEquals(
|
||||
false,
|
||||
PMA_Table::isUpdatableView('PMA', 'PMA_BookMark_2')
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test for analyzeStructure
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testAnalyzeStructure()
|
||||
{
|
||||
$this->assertEquals(
|
||||
false,
|
||||
PMA_Table::analyzeStructure()
|
||||
);
|
||||
|
||||
//validate that it is the same as DBI fetchResult
|
||||
$show_create_table = PMA_Table::analyzeStructure('PMA', 'PMA_BookMark');
|
||||
$this->assertEquals(
|
||||
array('type'=>'DATA_TYPE'),
|
||||
$show_create_table[0]['create_table_fields']['COLUMN_NAME']
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
|
||||
@ -41,7 +41,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* tearDown for test cases
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected function tearDown()
|
||||
@ -51,11 +51,11 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for FormDisplay::__constructor
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testFormDisplayContructor()
|
||||
{
|
||||
{
|
||||
$this->assertCount(
|
||||
5,
|
||||
$this->readAttribute($this->object, '_jsLangStrings')
|
||||
@ -64,13 +64,13 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for FormDisplay::registerForm
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testRegisterForm()
|
||||
{
|
||||
$reflection = new \ReflectionClass('FormDisplay');
|
||||
|
||||
|
||||
$attrForms = $reflection->getProperty('_forms');
|
||||
$attrForms->setAccessible(true);
|
||||
|
||||
@ -109,7 +109,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for FormDisplay::process
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testProcess()
|
||||
@ -145,13 +145,13 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for FormDisplay::displayErrors
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testDisplayErrors()
|
||||
{
|
||||
$reflection = new \ReflectionClass('FormDisplay');
|
||||
|
||||
|
||||
$attrIsValidated = $reflection->getProperty('_isValidated');
|
||||
$attrIsValidated->setAccessible(true);
|
||||
$attrIsValidated->setValue($this->object, true);
|
||||
@ -192,13 +192,13 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for FormDisplay::fixErrors
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testFixErrors()
|
||||
{
|
||||
$reflection = new \ReflectionClass('FormDisplay');
|
||||
|
||||
|
||||
$attrIsValidated = $reflection->getProperty('_isValidated');
|
||||
$attrIsValidated->setAccessible(true);
|
||||
$attrIsValidated->setValue($this->object, true);
|
||||
@ -228,7 +228,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
$attrIsValidated->setValue($this->object, $arr);
|
||||
|
||||
$this->object->fixErrors();
|
||||
|
||||
|
||||
$this->assertEquals(
|
||||
array(
|
||||
'Servers' => array(
|
||||
@ -243,17 +243,17 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for FormDisplay::_validateSelect
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testValidateSelect()
|
||||
{
|
||||
{
|
||||
$attrValidateSelect = new \ReflectionMethod(
|
||||
'FormDisplay',
|
||||
'_validateSelect'
|
||||
);
|
||||
$attrValidateSelect->setAccessible(true);
|
||||
|
||||
|
||||
$arr = array('foo' => 'var');
|
||||
$value = 'foo';
|
||||
$this->assertTrue(
|
||||
@ -284,7 +284,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
array(&$value, $arr)
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
$arr = array('1' => 'foobar');
|
||||
$value = 0;
|
||||
$this->assertFalse(
|
||||
@ -297,7 +297,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for FormDisplay::hasErrors
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testHasErrors()
|
||||
@ -321,7 +321,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for FormDisplay::getDocLink
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testGetDocLink()
|
||||
@ -346,25 +346,25 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for FormDisplay::getWikiLink
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testGetWikiLink()
|
||||
{
|
||||
$this->assertEquals(
|
||||
"./url.php?url=http%3A%2F%2Fwiki.phpmyadmin.net%2Fpma%2FConfig%23" .
|
||||
"./url.php?url=http%3A%2F%2Fwiki.phpmyadmin.net%2Fpma%2FConfig%23" .
|
||||
"AllowDeny.29&server=0&lang=en&token=token",
|
||||
$this->object->getWikiLink('Servers/1/AllowDeny')
|
||||
);
|
||||
|
||||
$this->assertEquals(
|
||||
"./url.php?url=http%3A%2F%2Fwiki.phpmyadmin.net%2Fpma%2FConfig%23" .
|
||||
"./url.php?url=http%3A%2F%2Fwiki.phpmyadmin.net%2Fpma%2FConfig%23" .
|
||||
"format_2&server=0&lang=en&token=token",
|
||||
$this->object->getWikiLink('Import/format')
|
||||
);
|
||||
|
||||
$this->assertEquals(
|
||||
"./url.php?url=http%3A%2F%2Fwiki.phpmyadmin.net%2Fpma%2FConfig%23" .
|
||||
"./url.php?url=http%3A%2F%2Fwiki.phpmyadmin.net%2Fpma%2FConfig%23" .
|
||||
"test&server=0&lang=en&token=token",
|
||||
$this->object->getWikiLink('Export/test')
|
||||
);
|
||||
@ -373,7 +373,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for FormDisplay::_getOptName
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testGetOptName()
|
||||
@ -394,14 +394,14 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for FormDisplay::_loadUserprefsInfo
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testLoadUserprefsInfo()
|
||||
{
|
||||
$method = new \ReflectionMethod('FormDisplay', '_loadUserprefsInfo');
|
||||
$method->setAccessible(true);
|
||||
|
||||
|
||||
$attrUserprefs = new \ReflectionProperty(
|
||||
'FormDisplay',
|
||||
'_userprefsDisallow'
|
||||
@ -417,12 +417,12 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for FormDisplay::_setComments
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testSetComments()
|
||||
{
|
||||
if (!function_exists('runkit_constant_redefine')) {
|
||||
if (! PMA_HAS_RUNKIT) {
|
||||
$this->markTestSkipped('Cannot redefine constant');
|
||||
}
|
||||
|
||||
@ -447,11 +447,11 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
}
|
||||
if (!function_exists('recode_string')) {
|
||||
$expect['values']['recode'] .= " (unavailable)";
|
||||
$expect['comment'] .= ($expect['comment'] ? ", " : '') .
|
||||
$expect['comment'] .= ($expect['comment'] ? ", " : '') .
|
||||
'"recode" requires recode extension';
|
||||
}
|
||||
$expect['comment_warning'] = 1;
|
||||
|
||||
|
||||
$this->assertEquals(
|
||||
$expect,
|
||||
$opts
|
||||
@ -531,7 +531,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
);
|
||||
|
||||
// SQLValidate
|
||||
|
||||
|
||||
$GLOBALS['cfg']['SQLValidator']['use'] = false;
|
||||
|
||||
$method->invokeArgs(
|
||||
@ -555,7 +555,7 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['cfg']['MaxDbList'] = 10;
|
||||
$GLOBALS['cfg']['MaxTableList'] = 10;
|
||||
$GLOBALS['cfg']['QueryHistoryMax'] = 10;
|
||||
|
||||
|
||||
$method->invokeArgs(
|
||||
$this->object,
|
||||
array('MaxDbList', &$opts)
|
||||
|
||||
@ -44,7 +44,7 @@ class PMA_ConfigFile_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
unset($_SESSION[$this->readAttribute($this->object, "_id")]);
|
||||
unset($this->object);
|
||||
|
||||
|
||||
// reset the instance
|
||||
$attr_instance = new ReflectionProperty("ConfigFile", "_instance");
|
||||
$attr_instance->setAccessible(true);
|
||||
@ -58,7 +58,7 @@ class PMA_ConfigFile_Test extends PHPUnit_Framework_TestCase
|
||||
* @test
|
||||
*/
|
||||
public function testConfigFileConstructor()
|
||||
{
|
||||
{
|
||||
$attr_instance = new ReflectionProperty("ConfigFile", "_instance");
|
||||
$attr_instance->setAccessible(true);
|
||||
$attr_instance->setValue(null, null);
|
||||
@ -237,7 +237,7 @@ class PMA_ConfigFile_Test extends PHPUnit_Framework_TestCase
|
||||
*/
|
||||
public function testConfigFileSet()
|
||||
{
|
||||
if (!function_exists("runkit_constant_redefine")) {
|
||||
if (! PMA_HAS_RUNKIT) {
|
||||
$this->markTestSkipped("Cannot redefine constant");
|
||||
}
|
||||
|
||||
|
||||
@ -24,10 +24,10 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
/**
|
||||
* Return the tag array to be used with assertTag by parsing
|
||||
* a given HTML element
|
||||
*
|
||||
*
|
||||
* @param string $elementHTML HTML for element to be parsed
|
||||
* @param array $arr Additional array elements like content, parent
|
||||
*
|
||||
*
|
||||
* @return array Tag array to be used with assertTag
|
||||
*/
|
||||
private function _getTagArray($elementHTML, $arr = array())
|
||||
@ -51,7 +51,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_displayFormTop()
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testDisplayFormTop()
|
||||
@ -64,7 +64,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
$this->assertTag(
|
||||
$this->_getTagArray(
|
||||
'<form method="get" action="http://www.phpmyadmin.net" ' .
|
||||
'<form method="get" action="http://www.phpmyadmin.net" ' .
|
||||
'class="config-form disableAjax">'
|
||||
),
|
||||
$result
|
||||
@ -109,7 +109,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_displayTabsTop()
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testDisplayTabsTop()
|
||||
@ -141,7 +141,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_displayFieldsetTop()
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testDisplayFieldsetTop()
|
||||
@ -214,12 +214,12 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_displayInput()
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testDisplayInput()
|
||||
{
|
||||
if (!function_exists('runkit_constant_remove')) {
|
||||
{
|
||||
if (! PMA_HAS_RUNKIT) {
|
||||
$this->markTestSkipped('Cannot modify constant');
|
||||
}
|
||||
|
||||
@ -241,7 +241,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
'desc', false, $opts
|
||||
);
|
||||
$result = ob_get_clean();
|
||||
|
||||
|
||||
$this->assertTag(
|
||||
$this->_getTagArray(
|
||||
'<tr class="group-header-field group-header-1 disabled-field">'
|
||||
@ -338,9 +338,9 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
'<dl class="inline_errors"><dd>e1</dd></dl>',
|
||||
$result
|
||||
);
|
||||
|
||||
|
||||
// second case
|
||||
|
||||
|
||||
define('PMA_SETUP', true);
|
||||
$GLOBALS['_FormDislayGroup'] = 0;
|
||||
$GLOBALS['cfg']['ThemePath'] = 'themePath';
|
||||
@ -351,7 +351,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
$opts['show_restore_default'] = true;
|
||||
$opts['userprefs_comment'] = 'userprefsComment';
|
||||
$opts['userprefs_allow'] = true;
|
||||
|
||||
|
||||
ob_start();
|
||||
PMA_displayInput(
|
||||
'test/path', 'testName', 'checkbox', 'val',
|
||||
@ -447,7 +447,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
),
|
||||
$result
|
||||
);
|
||||
|
||||
|
||||
// select case 1
|
||||
$opts['values_escaped'] = true;
|
||||
$opts['values_disabled'] = array(1, 2);
|
||||
@ -523,7 +523,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
'', true, $opts
|
||||
);
|
||||
$result = ob_get_clean();
|
||||
|
||||
|
||||
$this->assertTag(
|
||||
$this->_getTagArray(
|
||||
'<select name="test/path" id="test/path">'
|
||||
@ -545,7 +545,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
);
|
||||
|
||||
// list
|
||||
|
||||
|
||||
ob_start();
|
||||
PMA_displayInput(
|
||||
'test/path', 'testName', 'list', array('foo', 'bar'),
|
||||
@ -567,15 +567,15 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_displayGroupHeader()
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testDisplayGroupHeader()
|
||||
{
|
||||
if (!function_exists('runkit_constant_remove')) {
|
||||
if (! PMA_HAS_RUNKIT) {
|
||||
$this->markTestSkipped('Cannot modify constant');
|
||||
}
|
||||
|
||||
|
||||
$this->assertNull(
|
||||
PMA_displayGroupHeader('')
|
||||
);
|
||||
@ -609,11 +609,11 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
runkit_constant_remove('PMA_SETUP');
|
||||
$GLOBALS['_FormDisplayGroup'] = 3;
|
||||
|
||||
|
||||
ob_start();
|
||||
PMA_displayGroupHeader('headerText');
|
||||
$result = ob_get_clean();
|
||||
|
||||
|
||||
$this->assertTag(
|
||||
$this->_getTagArray(
|
||||
'<tr class="group-header group-header-4">',
|
||||
@ -633,7 +633,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_displayGroupFooter()
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testDisplayGroupFooter()
|
||||
@ -648,17 +648,17 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_displayFieldsetBottom()
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testDisplayFieldsetBottom()
|
||||
{
|
||||
if (!function_exists('runkit_constant_remove')) {
|
||||
if (! PMA_HAS_RUNKIT) {
|
||||
$this->markTestSkipped('Cannot modify constant');
|
||||
}
|
||||
|
||||
// with PMA_SETUP
|
||||
|
||||
|
||||
if (!defined('PMA_SETUP')) {
|
||||
define('PMA_SETUP', true);
|
||||
}
|
||||
@ -700,7 +700,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
);
|
||||
|
||||
// without PMA_SETUP
|
||||
|
||||
|
||||
runkit_constant_remove('PMA_SETUP');
|
||||
|
||||
ob_start();
|
||||
@ -717,7 +717,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_displayFieldsetBottomSimple()
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testDisplayFieldsetBottomSimple()
|
||||
@ -730,7 +730,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_displayTabsBottom()
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testDisplayTabsBottom()
|
||||
@ -743,7 +743,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_displayFormBottom()
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testDisplayFormBottom()
|
||||
@ -756,7 +756,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_addJsValidate()
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testAddJsValidate()
|
||||
@ -782,7 +782,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_displayJavascript()
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testDisplayJavascript()
|
||||
@ -795,7 +795,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
"<script type=\"text/javascript\">\n" .
|
||||
"var i = 1;\n" .
|
||||
"i++;\n" .
|
||||
"</script>\n"
|
||||
"</script>\n"
|
||||
);
|
||||
|
||||
PMA_displayJavascript(array('var i = 1', 'i++'));
|
||||
@ -803,7 +803,7 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_displayErrors()
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testDisplayErrors()
|
||||
|
||||
@ -29,6 +29,11 @@ class PMA_From_Processing_Test extends PHPUnit_Framework_TestCase
|
||||
*/
|
||||
public function testProcessFormSet()
|
||||
{
|
||||
if (!defined('PMA_TEST_HEADERS')) {
|
||||
$this->markTestSkipped(
|
||||
'Cannot redefine constant/function - missing runkit extension'
|
||||
);
|
||||
}
|
||||
|
||||
// case 1
|
||||
$formDisplay = $this->getMockBuilder('FormDisplay')
|
||||
@ -106,7 +111,7 @@ class PMA_From_Processing_Test extends PHPUnit_Framework_TestCase
|
||||
process_formset($formDisplay);
|
||||
|
||||
$this->assertEquals(
|
||||
'HTTP/1.1 303 See OtherLocation: index.php',
|
||||
array('HTTP/1.1 303 See Other', 'Location: index.php'),
|
||||
$GLOBALS['header']
|
||||
);
|
||||
|
||||
|
||||
@ -312,7 +312,7 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
|
||||
*/
|
||||
public function testCheckConfigRW()
|
||||
{
|
||||
if (!function_exists('runkit_constant_redefine')) {
|
||||
if (! PMA_HAS_RUNKIT) {
|
||||
$this->markTestSkipped('Cannot redefine constant');
|
||||
}
|
||||
|
||||
|
||||
@ -46,7 +46,7 @@ class PMA_Tracker_Test extends PHPUnit_Framework_TestCase
|
||||
if (!defined("PMA_DRIZZLE")) {
|
||||
define("PMA_DRIZZLE", false);
|
||||
} elseif (PMA_DRIZZLE) {
|
||||
if (function_exists("runkit_constant_redefine")) {
|
||||
if (PMA_HAS_RUNKIT) {
|
||||
runkit_constant_redefine("PMA_DRIZZLE", false);
|
||||
} else {
|
||||
$this->markTestSkipped("Cannot redefine constant");
|
||||
@ -63,7 +63,7 @@ class PMA_Tracker_Test extends PHPUnit_Framework_TestCase
|
||||
*/
|
||||
protected function tearDown()
|
||||
{
|
||||
if (function_exists("runkit_constant_redefine")) {
|
||||
if (PMA_HAS_RUNKIT) {
|
||||
runkit_constant_redefine("PMA_DRIZZLE", false);
|
||||
}
|
||||
}
|
||||
@ -669,7 +669,7 @@ class PMA_Tracker_Test extends PHPUnit_Framework_TestCase
|
||||
*/
|
||||
public function testGetVersion()
|
||||
{
|
||||
if (!function_exists("runkit_constant_redefine")) {
|
||||
if (! PMA_HAS_RUNKIT) {
|
||||
$this->markTestSkipped("Cannot redefine constant");
|
||||
}
|
||||
|
||||
@ -1050,7 +1050,7 @@ class PMA_Tracker_Test extends PHPUnit_Framework_TestCase
|
||||
*/
|
||||
public function testTransformTrackingSet()
|
||||
{
|
||||
if (!function_exists("runkit_constant_redefine")) {
|
||||
if (! PMA_HAS_RUNKIT) {
|
||||
$this->markTestSkipped("Cannot redefine constant");
|
||||
}
|
||||
|
||||
|
||||
@ -33,9 +33,9 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase
|
||||
public function testGenerateCharsetQueryPart(
|
||||
$drizzle, $collation, $expected
|
||||
) {
|
||||
if (! function_exists("runkit_constant_redefine")) {
|
||||
if (! PMA_HAS_RUNKIT) {
|
||||
$this->markTestSkipped(
|
||||
'Cannot redefine constant/function - missing APD or/and runkit extension'
|
||||
'Cannot redefine constant - missing runkit extension'
|
||||
);
|
||||
} else {
|
||||
if (defined('PMA_DRIZZLE')) {
|
||||
@ -75,9 +75,9 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase
|
||||
*/
|
||||
public function testGetDbCollation()
|
||||
{
|
||||
if (! function_exists("runkit_constant_redefine")) {
|
||||
if (! PMA_HAS_RUNKIT) {
|
||||
$this->markTestSkipped(
|
||||
'Cannot redefine constant/function - missing APD or/and runkit extension'
|
||||
'Cannot redefine constant - missing runkit extension'
|
||||
);
|
||||
} else {
|
||||
$GLOBALS['server'] = 1;
|
||||
|
||||
@ -34,7 +34,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_userprefsPageInit
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testUserPrefPageInit()
|
||||
@ -50,8 +50,8 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
array('test' => 'val')
|
||||
)
|
||||
);
|
||||
|
||||
PMA_userprefsPageInit();
|
||||
|
||||
PMA_userprefsPageInit();
|
||||
|
||||
$this->assertEquals(
|
||||
array(
|
||||
@ -67,16 +67,16 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_loadUserprefs
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testLoadUserprefs()
|
||||
{
|
||||
$_SESSION['relation'][$GLOBALS['server']]['userconfigwork'] = null;
|
||||
unset($_SESSION['userconfig']);
|
||||
|
||||
|
||||
$result = PMA_loadUserprefs();
|
||||
|
||||
|
||||
$this->assertCount(
|
||||
3,
|
||||
$result
|
||||
@ -104,7 +104,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
$_SESSION['relation'][$GLOBALS['server']]['userconfig'] = "testconf";
|
||||
$_SESSION['relation'][$GLOBALS['server']]['user'] = "user";
|
||||
$GLOBALS['controllink'] = null;
|
||||
|
||||
|
||||
$dbi = $this->getMockBuilder('PMA_DatabaseInterface')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
@ -149,9 +149,9 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
$GLOBALS['server'] = 2;
|
||||
$_SESSION['relation'][2]['userconfigwork'] = null;
|
||||
unset($_SESSION['userconfig']);
|
||||
|
||||
|
||||
$result = PMA_saveUserprefs(array(1));
|
||||
|
||||
|
||||
$this->assertTrue(
|
||||
$result
|
||||
);
|
||||
@ -173,7 +173,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
);
|
||||
|
||||
$assert = true;
|
||||
|
||||
|
||||
if (isset($_SESSION['cache']['server_2']['userprefs'])) {
|
||||
$assert = false;
|
||||
}
|
||||
@ -198,7 +198,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
UPDATE `pmadb`.`testconf`
|
||||
SET `config_data` = \'' . json_encode(array(1)) . '\'
|
||||
WHERE `username` = \'user\'';
|
||||
|
||||
|
||||
$dbi = $this->getMockBuilder('PMA_DatabaseInterface')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
@ -219,7 +219,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
);
|
||||
|
||||
// case 3
|
||||
|
||||
|
||||
$query1 = '
|
||||
SELECT `username`
|
||||
FROM `pmadb`.`testconf`
|
||||
@ -229,7 +229,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
INSERT INTO `pmadb`.`testconf` (`username`, `config_data`)
|
||||
VALUES (\'user\',
|
||||
\'' . json_encode(array(1)) . '\')';
|
||||
|
||||
|
||||
$dbi = $this->getMockBuilder('PMA_DatabaseInterface')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
@ -248,11 +248,11 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
->method('getError')
|
||||
->with(null)
|
||||
->will($this->returnValue("err1"));
|
||||
|
||||
|
||||
$GLOBALS['dbi'] = $dbi;
|
||||
|
||||
|
||||
$result = PMA_saveUserprefs(array(1));
|
||||
|
||||
|
||||
$this->assertEquals(
|
||||
'Could not save configuration <br /><br /> err1',
|
||||
$result->getMessage()
|
||||
@ -261,7 +261,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_applyUserprefs
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testApplyUserprefs()
|
||||
@ -293,7 +293,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_readUserprefsFieldNames
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testReadUserprefsFieldNames()
|
||||
@ -318,7 +318,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_persistOption
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testPersistOption()
|
||||
@ -333,7 +333,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
$GLOBALS['server'] = 2;
|
||||
$_SESSION['relation'][2]['userconfigwork'] = null;
|
||||
|
||||
|
||||
$this->assertNull(
|
||||
PMA_persistOption('Server/hide_db', 'val', 'val')
|
||||
);
|
||||
@ -349,13 +349,15 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_userprefsRedirect
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testUserprefsRedirect()
|
||||
{
|
||||
if (!function_exists('runkit_constant_redefine')) {
|
||||
$this->markTestSkipped('Cannot redefine constant');
|
||||
if (!defined('PMA_TEST_HEADERS')) {
|
||||
$this->markTestSkipped(
|
||||
'Cannot redefine constant/function - missing runkit extension'
|
||||
);
|
||||
}
|
||||
|
||||
$GLOBALS['cfg']['PmaAbsoluteUri'] = 'http://www.phpmyadmin.net';
|
||||
@ -379,7 +381,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
$this->assertContains(
|
||||
'Location: http://www.phpmyadmin.netfile.html?a=b&saved=1&server=0&' .
|
||||
'token=token#h+ash',
|
||||
$GLOBALS['header']
|
||||
$GLOBALS['header'][0]
|
||||
);
|
||||
|
||||
if ($redefine !== null) {
|
||||
@ -391,7 +393,7 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
/**
|
||||
* Test for PMA_userprefsAutoloadGetHeader
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testUserprefsAutoloadGetHeader()
|
||||
@ -452,10 +454,10 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
|
||||
/**
|
||||
* Return the tag array to be used with assertTag by parsing
|
||||
* a given HTML element
|
||||
*
|
||||
*
|
||||
* @param string $elementHTML HTML for element to be parsed
|
||||
* @param array $arr Additional array elements like content, parent
|
||||
*
|
||||
*
|
||||
* @return array Tag array to be used with assertTag
|
||||
*/
|
||||
private function _getTagArray($elementHTML, $arr = array())
|
||||
|
||||
@ -22,12 +22,11 @@ class PMA_WhichCrlf_Test extends PHPUnit_Framework_TestCase
|
||||
*/
|
||||
public function testWhichCrlf()
|
||||
{
|
||||
$runkit = function_exists('runkit_constant_redefine');
|
||||
if ($runkit && defined('PMA_USR_OS')) {
|
||||
if (PMA_HAS_RUNKIT && defined('PMA_USR_OS')) {
|
||||
$pma_usr_os = PMA_USR_OS;
|
||||
}
|
||||
|
||||
if (defined('PMA_USR_OS') && !$runkit) {
|
||||
if (defined('PMA_USR_OS') && !PMA_HAS_RUNKIT) {
|
||||
|
||||
if (PMA_USR_OS == 'Win') {
|
||||
$this->assertEquals(
|
||||
@ -43,7 +42,7 @@ class PMA_WhichCrlf_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
} else {
|
||||
|
||||
if ($runkit) {
|
||||
if (PMA_HAS_RUNKIT) {
|
||||
if (!defined('PMA_USR_OS')) {
|
||||
define('PMA_USR_OS', 'Linux');
|
||||
} else {
|
||||
@ -55,7 +54,7 @@ class PMA_WhichCrlf_Test extends PHPUnit_Framework_TestCase
|
||||
);
|
||||
}
|
||||
|
||||
if ($runkit) {
|
||||
if (PMA_HAS_RUNKIT) {
|
||||
runkit_constant_redefine('PMA_USR_OS', 'Win');
|
||||
} else {
|
||||
define('PMA_USR_OS', 'Win');
|
||||
@ -66,7 +65,7 @@ class PMA_WhichCrlf_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
}
|
||||
|
||||
if ($runkit) {
|
||||
if (PMA_HAS_RUNKIT) {
|
||||
if (isset($pma_usr_os)) {
|
||||
runkit_constant_redefine('PMA_USR_OS', 'Win');
|
||||
} else {
|
||||
|
||||
@ -50,110 +50,12 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
|
||||
protected $runkitExt;
|
||||
protected $apdExt;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
$this->runkitExt = false;
|
||||
if (function_exists("runkit_constant_redefine")) {
|
||||
$this->runkitExt = true;
|
||||
}
|
||||
|
||||
$this->apdExt = false;
|
||||
if (function_exists("rename_function")) {
|
||||
$this->apdExt = true;
|
||||
}
|
||||
|
||||
if ($this->apdExt && !$GLOBALS['test_header']) {
|
||||
|
||||
/*
|
||||
* using apd extension to overriding header and headers_sent
|
||||
* functions for test purposes
|
||||
*/
|
||||
$GLOBALS['test_header'] = 1;
|
||||
|
||||
/*
|
||||
* rename_function() of header and headers_sent may cause CLI error
|
||||
* report in Windows XP
|
||||
*/
|
||||
rename_function('header', 'test_header');
|
||||
rename_function('headers_sent', 'test_headers_sent');
|
||||
|
||||
/*
|
||||
* solution from:
|
||||
* http://unixwars.com/2008/11/29/override_function-in-php/
|
||||
* to overriding more than one function
|
||||
*/
|
||||
|
||||
$substs = array(
|
||||
'header' =>
|
||||
'if (isset($GLOBALS["header"])) {'
|
||||
. '$GLOBALS["header"] .= $a;'
|
||||
. '} else {'
|
||||
. '$GLOBALS["header"] = $a;'
|
||||
. '}',
|
||||
'headers_sent' => 'return false;'
|
||||
);
|
||||
|
||||
$args = array(
|
||||
'header' => '$a',
|
||||
'headers_sent' => ''
|
||||
);
|
||||
|
||||
foreach ($substs as $func => $ren_func) {
|
||||
if (function_exists("__overridden__")) {
|
||||
rename_function(
|
||||
"__overridden__",
|
||||
str_replace(
|
||||
array('.', ' '),
|
||||
array('', ''),
|
||||
microtime()
|
||||
)
|
||||
);
|
||||
}
|
||||
override_function($func, $args[$func], $substs[$func]);
|
||||
rename_function(
|
||||
"__overridden__",
|
||||
str_replace(array('.', ' '), array('', ''), microtime())
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public function __destruct()
|
||||
{
|
||||
/*
|
||||
* rename_function may causes CLI error report in Windows XP, but
|
||||
* nothing more happen
|
||||
*/
|
||||
|
||||
if ($this->apdExt && $GLOBALS['test_header']) {
|
||||
$GLOBALS['test_header'] = 0;
|
||||
|
||||
rename_function(
|
||||
'header',
|
||||
'header' . str_replace(
|
||||
array('.', ' '), array('', ''), microtime()
|
||||
)
|
||||
);
|
||||
rename_function(
|
||||
'headers_sent',
|
||||
'headers_sent' . str_replace(
|
||||
array('.', ' '), array('', ''), microtime()
|
||||
)
|
||||
);
|
||||
|
||||
rename_function('test_header', 'header');
|
||||
rename_function('test_headers_sent', 'headers_sent');
|
||||
}
|
||||
}
|
||||
|
||||
public function setUp()
|
||||
{
|
||||
//session_start();
|
||||
|
||||
// cleaning constants
|
||||
if ($this->runkitExt) {
|
||||
if (PMA_HAS_RUNKIT) {
|
||||
|
||||
$this->oldIISvalue = 'non-defined';
|
||||
|
||||
@ -189,7 +91,7 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
|
||||
//session_destroy();
|
||||
|
||||
// cleaning constants
|
||||
if ($this->runkitExt) {
|
||||
if (PMA_HAS_RUNKIT) {
|
||||
|
||||
if ($this->oldIISvalue != 'non-defined') {
|
||||
runkit_constant_redefine('PMA_IS_IIS', $this->oldIISvalue);
|
||||
@ -203,23 +105,19 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
|
||||
runkit_constant_remove('SID');
|
||||
}
|
||||
}
|
||||
|
||||
if ($this->apdExt) {
|
||||
unset($GLOBALS['header']);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public function testSendHeaderLocationWithSidUrlWithQuestionMark()
|
||||
{
|
||||
if ($this->runkitExt && $this->apdExt) {
|
||||
if (defined('PMA_TEST_HEADERS')) {
|
||||
|
||||
runkit_constant_redefine('SID', md5('test_hash'));
|
||||
|
||||
$testUri = 'http://testurl.com/test.php?test=test';
|
||||
$separator = PMA_get_arg_separator();
|
||||
|
||||
$header = 'Location: ' . $testUri . $separator . SID;
|
||||
$header = array('Location: ' . $testUri . $separator . SID);
|
||||
|
||||
/* sets $GLOBALS['header'] */
|
||||
PMA_sendHeaderLocation($testUri);
|
||||
@ -228,7 +126,7 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
} else {
|
||||
$this->markTestSkipped(
|
||||
'Cannot redefine constant/function - missing APD or/and runkit extension'
|
||||
'Cannot redefine constant/function - missing runkit extension'
|
||||
);
|
||||
}
|
||||
|
||||
@ -236,74 +134,74 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
|
||||
|
||||
public function testSendHeaderLocationWithSidUrlWithoutQuestionMark()
|
||||
{
|
||||
if ($this->runkitExt && $this->apdExt) {
|
||||
if (defined('PMA_TEST_HEADERS')) {
|
||||
|
||||
runkit_constant_redefine('SID', md5('test_hash'));
|
||||
|
||||
$testUri = 'http://testurl.com/test.php';
|
||||
$separator = PMA_get_arg_separator();
|
||||
|
||||
$header = 'Location: ' . $testUri . '?' . SID;
|
||||
$header = array('Location: ' . $testUri . '?' . SID);
|
||||
|
||||
PMA_sendHeaderLocation($testUri); // sets $GLOBALS['header']
|
||||
$this->assertEquals($header, $GLOBALS['header']);
|
||||
|
||||
} else {
|
||||
$this->markTestSkipped('Cannot redefine constant/function - missing APD or/and runkit extension');
|
||||
$this->markTestSkipped('Cannot redefine constant/function - missing runkit extension');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public function testSendHeaderLocationWithoutSidWithIis()
|
||||
{
|
||||
if ($this->runkitExt && $this->apdExt) {
|
||||
if (defined('PMA_TEST_HEADERS')) {
|
||||
|
||||
runkit_constant_redefine('PMA_IS_IIS', true);
|
||||
|
||||
$testUri = 'http://testurl.com/test.php';
|
||||
$separator = PMA_get_arg_separator();
|
||||
|
||||
$header = 'Location: ' . $testUri;
|
||||
$header = array('Location: ' . $testUri);
|
||||
PMA_sendHeaderLocation($testUri); // sets $GLOBALS['header']
|
||||
$this->assertEquals($header, $GLOBALS['header']);
|
||||
|
||||
//reset $GLOBALS['header'] for the next assertion
|
||||
unset($GLOBALS['header']);
|
||||
|
||||
$header = 'Refresh: 0; ' . $testUri;
|
||||
$header = array('Refresh: 0; ' . $testUri);
|
||||
PMA_sendHeaderLocation($testUri, true); // sets $GLOBALS['header']
|
||||
$this->assertEquals($header, $GLOBALS['header']);
|
||||
|
||||
} else {
|
||||
$this->markTestSkipped('Cannot redefine constant/function - missing APD or/and runkit extension');
|
||||
$this->markTestSkipped('Cannot redefine constant/function - missing runkit extension');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public function testSendHeaderLocationWithoutSidWithoutIis()
|
||||
{
|
||||
if ($this->apdExt) {
|
||||
if (defined('PMA_TEST_HEADERS')) {
|
||||
|
||||
$testUri = 'http://testurl.com/test.php';
|
||||
$header = 'Location: ' . $testUri;
|
||||
$header = array('Location: ' . $testUri);
|
||||
|
||||
PMA_sendHeaderLocation($testUri); // sets $GLOBALS['header']
|
||||
$this->assertEquals($header, $GLOBALS['header']);
|
||||
|
||||
} else {
|
||||
$this->markTestSkipped('Cannot redefine constant/function - missing APD or/and runkit extension');
|
||||
$this->markTestSkipped('Cannot redefine constant/function - missing runkit extension');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public function testSendHeaderLocationIisLongUri()
|
||||
{
|
||||
if (defined('PMA_IS_IIS') && $this->runkitExt) {
|
||||
if (defined('PMA_IS_IIS') && PMA_HAS_RUNKIT) {
|
||||
runkit_constant_redefine('PMA_IS_IIS', true);
|
||||
} elseif (!defined('PMA_IS_IIS')) {
|
||||
define('PMA_IS_IIS', true);
|
||||
} else {
|
||||
$this->markTestSkipped('Cannot redefine constant/function - missing APD or/and runkit extension');
|
||||
$this->markTestSkipped('Cannot redefine constant/function - missing runkit extension');
|
||||
}
|
||||
|
||||
// over 600 chars
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
