diff --git a/ChangeLog b/ChangeLog index 5bd00092f0..077a04f30f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ phpMyAdmin - ChangeLog ====================== +4.7.7 (2017-12-23) +- issue #13865 Fixed displaying of formatted numeric values for some locales +- issue #13856 Ensure datetimepicker is always loaded for datetime fields +- issue #13848 Fixed PHP error when browsing certain results +- issue [security] Fix XSRF/CSRF vulnerability, see PMASA-2017-09 + 4.7.6 (2017-11-29) - issue #13517 Fixed check all interaction with filtering - issue #13803 Add SJIS-win to default list of allowed charsets diff --git a/README b/README index bc6a62844a..07dd28290d 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.7.6 +Version 4.7.7 A web interface for MySQL and MariaDB. diff --git a/composer.json b/composer.json index 02266a149f..cc181ede49 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "ext-pcre": "*", "ext-json": "*", "phpmyadmin/sql-parser": "^4.2.3", - "phpmyadmin/motranslator": "^3.0", + "phpmyadmin/motranslator": "^3.4", "phpmyadmin/shapefile": "^2.0", "tecnickcom/tcpdf": "^6.2", "phpseclib/phpseclib": "^2.0", diff --git a/doc/conf.py b/doc/conf.py index 70efc69937..0a2c00baf6 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2017, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.7.6' +version = '4.7.7' # The full version, including alpha/beta/rc tags. release = version diff --git a/doc/faq.rst b/doc/faq.rst index 54de8b8d06..32bd0224ef 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -433,7 +433,8 @@ Since release 4.5, phpMyAdmin supports only PHP 5.5 and newer. Since release 4.1 phpMyAdmin supports only PHP 5.3 and newer. For PHP 5.2 you can use 4.0.x releases. -PHP 7 is supported since phpMyAdmin 4.6, PHP 7.1 is supported since 4.6.5. +PHP 7 is supported since phpMyAdmin 4.6, PHP 7.1 is supported since 4.6.5, +PHP 7.2 is supported since 4.7.4. phpMyAdmin also works fine with HHVM. diff --git a/js/functions.js b/js/functions.js index a11c1a5226..5f43f5bdff 100644 --- a/js/functions.js +++ b/js/functions.js @@ -156,16 +156,12 @@ function PMA_addDatepicker($this_element, type, options) } } }; - if (type == "datetime" || type == "timestamp") { - $this_element.datetimepicker($.extend(defaultOptions, options)); - } - else if (type == "date") { - $this_element.datetimepicker($.extend(defaultOptions, options)); - } - else if (type == "time") { + if (type == "time") { $this_element.timepicker($.extend(defaultOptions, options)); // Add a tip regarding entering MySQL allowed-values for TIME data-type PMA_tooltip($this_element, 'input', PMA_messages.strMysqlAllowedValuesTipTime); + } else { + $this_element.datetimepicker($.extend(defaultOptions, options)); } } diff --git a/libraries/Config.php b/libraries/Config.php index 301c1a1f8c..c1af5a9d42 100644 --- a/libraries/Config.php +++ b/libraries/Config.php @@ -103,7 +103,7 @@ class Config */ public function checkSystem() { - $this->set('PMA_VERSION', '4.7.6'); + $this->set('PMA_VERSION', '4.7.7'); /** * @deprecated */ diff --git a/libraries/DisplayResults.php b/libraries/DisplayResults.php index 43e3bb38fb..5915bf7969 100644 --- a/libraries/DisplayResults.php +++ b/libraries/DisplayResults.php @@ -3402,7 +3402,7 @@ class DisplayResults $fields_cnt = $this->__get('fields_cnt'); foreach ($col_order as $value) { if ($value >= $fields_cnt) { - $this->removeUiProp(Table::PROP_COLUMN_ORDER); + $pmatable->removeUiProp(Table::PROP_COLUMN_ORDER); $fields_cnt = false; } } diff --git a/libraries/URL.php b/libraries/URL.php index c26491f8d2..2d21d6821d 100644 --- a/libraries/URL.php +++ b/libraries/URL.php @@ -223,6 +223,10 @@ class URL $params['collation_connection'] = $GLOBALS['collation_connection']; } + if (isset($_SESSION[' PMA_token '])) { + $params['token'] = $_SESSION[' PMA_token ']; + } + $query = http_build_query($params, null, $separator); if ($divider != '?' || strlen($query) > 0) { diff --git a/libraries/Util.php b/libraries/Util.php index e105fa1bc9..fbc944a59c 100644 --- a/libraries/Util.php +++ b/libraries/Util.php @@ -1422,6 +1422,10 @@ class Util 7 => 'Z', 8 => 'Y' ); + /* l10n: Decimal separator */ + $decimal_sep = __('.'); + /* l10n: Thousands separator */ + $thousands_sep = __(','); // check for negative value to retain sign if ($value < 0) { @@ -1459,24 +1463,20 @@ class Util $formattedValue = number_format( $value, $digits_right, - /* l10n: Decimal separator */ - __('.'), - /* l10n: Thousands separator */ - __(',') + $decimal_sep, + $thousands_sep ); // If we don't want any zeros, remove them now - if ($noTrailingZero && strpos($formattedValue, '.') !== false) { - $formattedValue = preg_replace('/\.?0+$/', '', $formattedValue); + if ($noTrailingZero && strpos($formattedValue, $decimal_sep) !== false) { + $formattedValue = preg_replace('/' . preg_quote($decimal_sep) . '?0+$/', '', $formattedValue); } if ($originalValue != 0 && floatval($value) == 0) { return ' <' . number_format( (1 / pow(10, $digits_right)), $digits_right, - /* l10n: Decimal separator */ - __('.'), - /* l10n: Thousands separator */ - __(',') + $decimal_sep, + $thousands_sep ) . ' ' . $unit; } @@ -1822,6 +1822,7 @@ class Util if (($url_length <= $GLOBALS['cfg']['LinkLengthLimit']) && $in_suhosin_limits && ! $force_button + && strpos($url, 'sql_query=') === false ) { $tag_params_strings = array(); foreach ($tag_params as $par_name => $par_value) { diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 686fc16c58..a6dbc60516 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -361,31 +361,56 @@ if (PMA_checkPageValidity($_REQUEST['back'], $goto_whitelist)) { * could access this variables before we reach this point * f.e. PMA\libraries\Config: fontsize * - * Check for token mismatch only if the Request method is POST - * GET Requests would never have token and therefore checking - * mis-match does not make sense - * * @todo variables should be handled by their respective owners (objects) * f.e. lang, server, collation_connection in PMA\libraries\Config */ - $token_mismatch = true; $token_provided = false; +if (PMA_isValid($_REQUEST['token'])) { + $token_provided = true; + $token_mismatch = ! hash_equals($_SESSION[' PMA_token '], $_REQUEST['token']); +} -if ($_SERVER['REQUEST_METHOD'] == 'POST') { - if (PMA_isValid($_POST['token'])) { - $token_provided = true; - $token_mismatch = ! @hash_equals($_SESSION[' PMA_token '], $_POST['token']); - } - - if ($token_mismatch) { - /** - * We don't allow any POST operation parameters if the token is mismatched - * or is not provided +if ($token_mismatch) { + /** + * List of parameters which are allowed from unsafe source + */ + $allow_list = array( + /* needed for direct access, see FAQ 1.34 + * also, server needed for cookie login screen (multi-server) */ - $whitelist = array('ajax_request'); - PMA\libraries\Sanitize::removeRequestVars($whitelist); + 'server', 'db', 'table', 'target', 'lang', + /* Session ID */ + 'phpMyAdmin', + /* Cookie preferences */ + 'pma_lang', 'pma_collation_connection', + /* Possible login form */ + 'pma_servername', 'pma_username', 'pma_password', + 'g-recaptcha-response', + /* Needed to send the correct reply */ + 'ajax_request', + /* Permit to log out even if there is a token mismatch */ + 'old_usr', + /* Permit redirection with token-mismatch in url.php */ + 'url', + /* Permit session expiry flag */ + 'session_expired', + /* JS loading */ + 'scripts', 'call_done', + /* Navigation panel */ + 'aPath', 'vPath', 'pos', 'pos2_name', 'pos2_value', 'searchClause', 'searchClause2' + ); + /** + * Allow changing themes in test/theme.php + */ + if (defined('PMA_TEST_THEME')) { + $allow_list[] = 'set_theme'; } + /** + * Do actual cleanup + */ + PMA\libraries\Sanitize::removeRequestVars($allow_list); + } diff --git a/libraries/navigation/NavigationTree.php b/libraries/navigation/NavigationTree.php index 5db11df455..590a849aa6 100644 --- a/libraries/navigation/NavigationTree.php +++ b/libraries/navigation/NavigationTree.php @@ -1264,6 +1264,7 @@ class NavigationTree ); $children = $this->_tree->children; $url_params = array( + 'token' => $_SESSION[' PMA_token '], 'server' => $GLOBALS['server'], ); $retval .= '
'; diff --git a/libraries/navigation/nodes/NodeColumn.php b/libraries/navigation/nodes/NodeColumn.php index 99b8afeaf8..75f64b6ff7 100644 --- a/libraries/navigation/nodes/NodeColumn.php +++ b/libraries/navigation/nodes/NodeColumn.php @@ -31,10 +31,12 @@ class NodeColumn extends Node $this->links = array( 'text' => 'tbl_structure.php?server=' . $GLOBALS['server'] . '&db=%3$s&table=%2$s&field=%1$s' - . '&change_column=1', + . '&change_column=1' + . '&token=' . $_SESSION[' PMA_token '], 'icon' => 'tbl_structure.php?server=' . $GLOBALS['server'] . '&db=%3$s&table=%2$s&field=%1$s' - . '&change_column=1', + . '&change_column=1' + . '&token=' . $_SESSION[' PMA_token '], 'title' => __('Structure'), ); } diff --git a/libraries/navigation/nodes/NodeColumnContainer.php b/libraries/navigation/nodes/NodeColumnContainer.php index c3eceff6d0..aa678a72b6 100644 --- a/libraries/navigation/nodes/NodeColumnContainer.php +++ b/libraries/navigation/nodes/NodeColumnContainer.php @@ -27,9 +27,11 @@ class NodeColumnContainer extends Node $this->icon = Util::getImage('pause.png', __('Columns')); $this->links = array( 'text' => 'tbl_structure.php?server=' . $GLOBALS['server'] - . '&db=%2$s&table=%1$s', + . '&db=%2$s&table=%1$s' + . '&token=' . $_SESSION[' PMA_token '], 'icon' => 'tbl_structure.php?server=' . $GLOBALS['server'] - . '&db=%2$s&table=%1$s', + . '&db=%2$s&table=%1$s' + . '&token=' . $_SESSION[' PMA_token '], ); $this->real_name = 'columns'; @@ -43,10 +45,12 @@ class NodeColumnContainer extends Node $new->links = array( 'text' => 'tbl_addfield.php?server=' . $GLOBALS['server'] . '&db=%3$s&table=%2$s' - . '&field_where=last&after_field=', + . '&field_where=last&after_field=' + . '&token=' . $_SESSION[' PMA_token '], 'icon' => 'tbl_addfield.php?server=' . $GLOBALS['server'] . '&db=%3$s&table=%2$s' - . '&field_where=last&after_field=', + . '&field_where=last&after_field=' + . '&token=' . $_SESSION[' PMA_token '], ); $new->classes = 'new_column italics'; $this->addChild($new); diff --git a/libraries/navigation/nodes/NodeDatabase.php b/libraries/navigation/nodes/NodeDatabase.php index 821c47febb..1df6ff9121 100644 --- a/libraries/navigation/nodes/NodeDatabase.php +++ b/libraries/navigation/nodes/NodeDatabase.php @@ -47,9 +47,9 @@ class NodeDatabase extends Node $this->links = array( 'text' => $script_name . '?server=' . $GLOBALS['server'] - . '&db=%1$s', + . '&db=%1$s&token=' . $_SESSION[' PMA_token '], 'icon' => 'db_operations.php?server=' . $GLOBALS['server'] - . '&db=%1$s&', + . '&db=%1$s&token=' . $_SESSION[' PMA_token '], 'title' => __('Structure'), ); $this->classes = 'database'; diff --git a/libraries/navigation/nodes/NodeDatabaseContainer.php b/libraries/navigation/nodes/NodeDatabaseContainer.php index 9c5dc3c788..b636748cef 100644 --- a/libraries/navigation/nodes/NodeDatabaseContainer.php +++ b/libraries/navigation/nodes/NodeDatabaseContainer.php @@ -38,8 +38,10 @@ class NodeDatabaseContainer extends Node $new->isNew = true; $new->icon = PMA\libraries\Util::getImage('b_newdb.png', ''); $new->links = array( - 'text' => 'server_databases.php?server=' . $GLOBALS['server'], - 'icon' => 'server_databases.php?server=' . $GLOBALS['server'], + 'text' => 'server_databases.php?server=' . $GLOBALS['server'] + . '&token=' . $_SESSION[' PMA_token '], + 'icon' => 'server_databases.php?server=' . $GLOBALS['server'] + . '&token=' . $_SESSION[' PMA_token '], ); $new->classes = 'new_database italics'; $this->addChild($new); diff --git a/libraries/navigation/nodes/NodeEvent.php b/libraries/navigation/nodes/NodeEvent.php index 6723bab43d..d394682005 100644 --- a/libraries/navigation/nodes/NodeEvent.php +++ b/libraries/navigation/nodes/NodeEvent.php @@ -30,9 +30,11 @@ class NodeEvent extends NodeDatabaseChild $this->icon = PMA\libraries\Util::getImage('b_events.png'); $this->links = array( 'text' => 'db_events.php?server=' . $GLOBALS['server'] - . '&db=%2$s&item_name=%1$s&edit_item=1', + . '&db=%2$s&item_name=%1$s&edit_item=1' + . '&token=' . $_SESSION[' PMA_token '], 'icon' => 'db_events.php?server=' . $GLOBALS['server'] - . '&db=%2$s&item_name=%1$s&export_item=1', + . '&db=%2$s&item_name=%1$s&export_item=1' + . '&token=' . $_SESSION[' PMA_token '], ); $this->classes = 'event'; } diff --git a/libraries/navigation/nodes/NodeEventContainer.php b/libraries/navigation/nodes/NodeEventContainer.php index 5c3efbad5a..a244231fb5 100644 --- a/libraries/navigation/nodes/NodeEventContainer.php +++ b/libraries/navigation/nodes/NodeEventContainer.php @@ -26,9 +26,9 @@ class NodeEventContainer extends NodeDatabaseChildContainer $this->icon = PMA\libraries\Util::getImage('b_events.png', ''); $this->links = array( 'text' => 'db_events.php?server=' . $GLOBALS['server'] - . '&db=%1$s', + . '&db=%1$s&token=' . $_SESSION[' PMA_token '], 'icon' => 'db_events.php?server=' . $GLOBALS['server'] - . '&db=%1$s', + . '&db=%1$s&token=' . $_SESSION[' PMA_token '], ); $this->real_name = 'events'; @@ -40,9 +40,11 @@ class NodeEventContainer extends NodeDatabaseChildContainer $new->icon = PMA\libraries\Util::getImage('b_event_add.png', ''); $new->links = array( 'text' => 'db_events.php?server=' . $GLOBALS['server'] - . '&db=%2$s&add_item=1', + . '&db=%2$s&token=' . $_SESSION[' PMA_token '] + . '&add_item=1', 'icon' => 'db_events.php?server=' . $GLOBALS['server'] - . '&db=%2$s&add_item=1', + . '&db=%2$s&token=' . $_SESSION[' PMA_token '] + . '&add_item=1', ); $new->classes = 'new_event italics'; $this->addChild($new); diff --git a/libraries/navigation/nodes/NodeFunction.php b/libraries/navigation/nodes/NodeFunction.php index 1cf75a694c..61d87b2b26 100644 --- a/libraries/navigation/nodes/NodeFunction.php +++ b/libraries/navigation/nodes/NodeFunction.php @@ -31,10 +31,10 @@ class NodeFunction extends NodeDatabaseChild $this->links = array( 'text' => 'db_routines.php?server=' . $GLOBALS['server'] . '&db=%2$s&item_name=%1$s&item_type=FUNCTION' - . '&edit_item=1', + . '&edit_item=1&token=' . $_SESSION[' PMA_token '], 'icon' => 'db_routines.php?server=' . $GLOBALS['server'] . '&db=%2$s&item_name=%1$s&item_type=FUNCTION' - . '&execute_dialog=1', + . '&execute_dialog=1&token=' . $_SESSION[' PMA_token '], ); $this->classes = 'function'; } diff --git a/libraries/navigation/nodes/NodeFunctionContainer.php b/libraries/navigation/nodes/NodeFunctionContainer.php index 1c6d510eec..523d6b62c0 100644 --- a/libraries/navigation/nodes/NodeFunctionContainer.php +++ b/libraries/navigation/nodes/NodeFunctionContainer.php @@ -29,9 +29,11 @@ class NodeFunctionContainer extends NodeDatabaseChildContainer ); $this->links = array( 'text' => 'db_routines.php?server=' . $GLOBALS['server'] - . '&db=%1$s&type=FUNCTION', + . '&db=%1$s&token=' . $_SESSION[' PMA_token '] + . '&type=FUNCTION', 'icon' => 'db_routines.php?server=' . $GLOBALS['server'] - . '&db=%1$s&type=FUNCTION', + . '&db=%1$s&token=' . $_SESSION[' PMA_token '] + . '&type=FUNCTION', ); $this->real_name = 'functions'; @@ -44,9 +46,11 @@ class NodeFunctionContainer extends NodeDatabaseChildContainer $new->icon = PMA\libraries\Util::getImage('b_routine_add.png', $new_label); $new->links = array( 'text' => 'db_routines.php?server=' . $GLOBALS['server'] - . '&db=%2$s&add_item=1&item_type=FUNCTION', + . '&db=%2$s&token=' . $_SESSION[' PMA_token '] + . '&add_item=1&item_type=FUNCTION', 'icon' => 'db_routines.php?server=' . $GLOBALS['server'] - . '&db=%2$s&add_item=1&item_type=FUNCTION', + . '&db=%2$s&token=' . $_SESSION[' PMA_token '] + . '&add_item=1&item_type=FUNCTION', ); $new->classes = 'new_function italics'; $this->addChild($new); diff --git a/libraries/navigation/nodes/NodeIndex.php b/libraries/navigation/nodes/NodeIndex.php index 1cf06f87d6..fa964a0d2d 100644 --- a/libraries/navigation/nodes/NodeIndex.php +++ b/libraries/navigation/nodes/NodeIndex.php @@ -30,9 +30,11 @@ class NodeIndex extends Node $this->icon = PMA\libraries\Util::getImage('b_index.png', __('Index')); $this->links = array( 'text' => 'tbl_indexes.php?server=' . $GLOBALS['server'] - . '&db=%3$s&table=%2$s&index=%1$s', + . '&db=%3$s&table=%2$s&index=%1$s' + . '&token=' . $_SESSION[' PMA_token '], 'icon' => 'tbl_indexes.php?server=' . $GLOBALS['server'] - . '&db=%3$s&table=%2$s&index=%1$s', + . '&db=%3$s&table=%2$s&index=%1$s' + . '&token=' . $_SESSION[' PMA_token '], ); $this->classes = 'index'; } diff --git a/libraries/navigation/nodes/NodeIndexContainer.php b/libraries/navigation/nodes/NodeIndexContainer.php index e914cfd6d8..8398729f77 100644 --- a/libraries/navigation/nodes/NodeIndexContainer.php +++ b/libraries/navigation/nodes/NodeIndexContainer.php @@ -26,9 +26,11 @@ class NodeIndexContainer extends Node $this->icon = PMA\libraries\Util::getImage('b_index.png', __('Indexes')); $this->links = array( 'text' => 'tbl_structure.php?server=' . $GLOBALS['server'] - . '&db=%2$s&table=%1$s', + . '&db=%2$s&table=%1$s' + . '&token=' . $_SESSION[' PMA_token '], 'icon' => 'tbl_structure.php?server=' . $GLOBALS['server'] - . '&db=%2$s&table=%1$s', + . '&db=%2$s&table=%1$s' + . '&token=' . $_SESSION[' PMA_token '], ); $this->real_name = 'indexes'; @@ -42,10 +44,12 @@ class NodeIndexContainer extends Node $new->links = array( 'text' => 'tbl_indexes.php?server=' . $GLOBALS['server'] . '&create_index=1&added_fields=2' - . '&db=%3$s&table=%2$s', + . '&db=%3$s&table=%2$s&token=' + . $_SESSION[' PMA_token '], 'icon' => 'tbl_indexes.php?server=' . $GLOBALS['server'] . '&create_index=1&added_fields=2' - . '&db=%3$s&table=%2$s', + . '&db=%3$s&table=%2$s&token=' + . $_SESSION[' PMA_token '], ); $new->classes = 'new_index italics'; $this->addChild($new); diff --git a/libraries/navigation/nodes/NodeProcedure.php b/libraries/navigation/nodes/NodeProcedure.php index 069d7f3df4..579b116839 100644 --- a/libraries/navigation/nodes/NodeProcedure.php +++ b/libraries/navigation/nodes/NodeProcedure.php @@ -34,10 +34,10 @@ class NodeProcedure extends NodeDatabaseChild $this->links = array( 'text' => 'db_routines.php?server=' . $GLOBALS['server'] . '&db=%2$s&item_name=%1$s&item_type=PROCEDURE' - . '&edit_item=1', + . '&edit_item=1&token=' . $_SESSION[' PMA_token '], 'icon' => 'db_routines.php?server=' . $GLOBALS['server'] . '&db=%2$s&item_name=%1$s&item_type=PROCEDURE' - . '&execute_dialog=1', + . '&execute_dialog=1&token=' . $_SESSION[' PMA_token '], ); $this->classes = 'procedure'; } diff --git a/libraries/navigation/nodes/NodeProcedureContainer.php b/libraries/navigation/nodes/NodeProcedureContainer.php index 9e1d5dab97..21acc48454 100644 --- a/libraries/navigation/nodes/NodeProcedureContainer.php +++ b/libraries/navigation/nodes/NodeProcedureContainer.php @@ -29,9 +29,11 @@ class NodeProcedureContainer extends NodeDatabaseChildContainer ); $this->links = array( 'text' => 'db_routines.php?server=' . $GLOBALS['server'] - . '&db=%1$s&type=PROCEDURE', + . '&db=%1$s&token=' . $_SESSION[' PMA_token '] + . '&type=PROCEDURE', 'icon' => 'db_routines.php?server=' . $GLOBALS['server'] - . '&db=%1$s&type=PROCEDURE', + . '&db=%1$s&token=' . $_SESSION[' PMA_token '] + . '&type=PROCEDURE', ); $this->real_name = 'procedures'; @@ -44,9 +46,11 @@ class NodeProcedureContainer extends NodeDatabaseChildContainer $new->icon = PMA\libraries\Util::getImage('b_routine_add.png', $new_label); $new->links = array( 'text' => 'db_routines.php?server=' . $GLOBALS['server'] - . '&db=%2$s&add_item=1', + . '&db=%2$s&token=' . $_SESSION[' PMA_token '] + . '&add_item=1', 'icon' => 'db_routines.php?server=' . $GLOBALS['server'] - . '&db=%2$s&add_item=1', + . '&db=%2$s&token=' . $_SESSION[' PMA_token '] + . '&add_item=1', ); $new->classes = 'new_procedure italics'; $this->addChild($new); diff --git a/libraries/navigation/nodes/NodeTable.php b/libraries/navigation/nodes/NodeTable.php index 5c0a04cc2e..89020caebc 100644 --- a/libraries/navigation/nodes/NodeTable.php +++ b/libraries/navigation/nodes/NodeTable.php @@ -53,20 +53,22 @@ class NodeTable extends NodeDatabaseChild 'text' => $script_name . '?server=' . $GLOBALS['server'] . '&db=%2$s&table=%1$s' - . '&pos=0', + . '&pos=0&token=' . $_SESSION[' PMA_token '], 'icon' => array( Util::getScriptNameForOption( $GLOBALS['cfg']['NavigationTreeDefaultTabTable'], 'table' ) . '?server=' . $GLOBALS['server'] - . '&db=%2$s&table=%1$s', + . '&db=%2$s&table=%1$s&token=' + . $_SESSION[' PMA_token '], Util::getScriptNameForOption( $GLOBALS['cfg']['NavigationTreeDefaultTabTable2'], 'table' ) . '?server=' . $GLOBALS['server'] - . '&db=%2$s&table=%1$s', + . '&db=%2$s&table=%1$s&token=' + . $_SESSION[' PMA_token '], ), 'title' => $this->title, ); diff --git a/libraries/navigation/nodes/NodeTableContainer.php b/libraries/navigation/nodes/NodeTableContainer.php index 9b506ea2bb..8928fb017e 100644 --- a/libraries/navigation/nodes/NodeTableContainer.php +++ b/libraries/navigation/nodes/NodeTableContainer.php @@ -26,9 +26,11 @@ class NodeTableContainer extends NodeDatabaseChildContainer $this->icon = PMA\libraries\Util::getImage('b_browse.png', __('Tables')); $this->links = array( 'text' => 'db_structure.php?server=' . $GLOBALS['server'] - . '&db=%1$s&tbl_type=table', + . '&db=%1$s&tbl_type=table' + . '&token=' . $_SESSION[' PMA_token '], 'icon' => 'db_structure.php?server=' . $GLOBALS['server'] - . '&db=%1$s&tbl_type=table', + . '&db=%1$s&tbl_type=table' + . '&token=' . $_SESSION[' PMA_token '], ); $this->real_name = 'tables'; $this->classes = 'tableContainer subContainer'; @@ -42,9 +44,9 @@ class NodeTableContainer extends NodeDatabaseChildContainer $new->icon = PMA\libraries\Util::getImage('b_table_add.png', $new_label); $new->links = array( 'text' => 'tbl_create.php?server=' . $GLOBALS['server'] - . '&db=%2$s', + . '&db=%2$s&token=' . $_SESSION[' PMA_token '], 'icon' => 'tbl_create.php?server=' . $GLOBALS['server'] - . '&db=%2$s', + . '&db=%2$s&token=' . $_SESSION[' PMA_token '], ); $new->classes = 'new_table italics'; $this->addChild($new); diff --git a/libraries/navigation/nodes/NodeTrigger.php b/libraries/navigation/nodes/NodeTrigger.php index a90ddda179..ee0960bac3 100644 --- a/libraries/navigation/nodes/NodeTrigger.php +++ b/libraries/navigation/nodes/NodeTrigger.php @@ -30,9 +30,11 @@ class NodeTrigger extends Node $this->icon = PMA\libraries\Util::getImage('b_triggers.png'); $this->links = array( 'text' => 'db_triggers.php?server=' . $GLOBALS['server'] - . '&db=%3$s&item_name=%1$s&edit_item=1', + . '&db=%3$s&item_name=%1$s&edit_item=1' + . '&token=' . $_SESSION[' PMA_token '], 'icon' => 'db_triggers.php?server=' . $GLOBALS['server'] - . '&db=%3$s&item_name=%1$s&export_item=1', + . '&db=%3$s&item_name=%1$s&export_item=1' + . '&token=' . $_SESSION[' PMA_token '], ); $this->classes = 'trigger'; } diff --git a/libraries/navigation/nodes/NodeTriggerContainer.php b/libraries/navigation/nodes/NodeTriggerContainer.php index 1cd379017b..5d1e643af7 100644 --- a/libraries/navigation/nodes/NodeTriggerContainer.php +++ b/libraries/navigation/nodes/NodeTriggerContainer.php @@ -26,9 +26,11 @@ class NodeTriggerContainer extends Node $this->icon = PMA\libraries\Util::getImage('b_triggers.png'); $this->links = array( 'text' => 'db_triggers.php?server=' . $GLOBALS['server'] - . '&db=%2$s&table=%1$s', + . '&db=%2$s&table=%1$s&token=' + . $_SESSION[' PMA_token '], 'icon' => 'db_triggers.php?server=' . $GLOBALS['server'] - . '&db=%2$s&table=%1$s', + . '&db=%2$s&table=%1$s&token=' + . $_SESSION[' PMA_token '], ); $this->real_name = 'triggers'; @@ -40,9 +42,11 @@ class NodeTriggerContainer extends Node $new->icon = PMA\libraries\Util::getImage('b_trigger_add.png', ''); $new->links = array( 'text' => 'db_triggers.php?server=' . $GLOBALS['server'] - . '&db=%3$s&add_item=1', + . '&db=%3$s&token=' . $_SESSION[' PMA_token '] + . '&add_item=1', 'icon' => 'db_triggers.php?server=' . $GLOBALS['server'] - . '&db=%3$s&add_item=1', + . '&db=%3$s&token=' . $_SESSION[' PMA_token '] + . '&add_item=1', ); $new->classes = 'new_trigger italics'; $this->addChild($new); diff --git a/libraries/navigation/nodes/NodeView.php b/libraries/navigation/nodes/NodeView.php index 2ec500cd34..8040797278 100644 --- a/libraries/navigation/nodes/NodeView.php +++ b/libraries/navigation/nodes/NodeView.php @@ -30,9 +30,11 @@ class NodeView extends NodeDatabaseChild $this->icon = PMA\libraries\Util::getImage('b_props.png', __('View')); $this->links = array( 'text' => 'sql.php?server=' . $GLOBALS['server'] - . '&db=%2$s&table=%1$s&pos=0', + . '&db=%2$s&table=%1$s&pos=0' + . '&token=' . $_SESSION[' PMA_token '], 'icon' => 'tbl_structure.php?server=' . $GLOBALS['server'] - . '&db=%2$s&table=%1$s', + . '&db=%2$s&table=%1$s' + . '&token=' . $_SESSION[' PMA_token '], ); $this->classes = 'view'; } diff --git a/libraries/navigation/nodes/NodeViewContainer.php b/libraries/navigation/nodes/NodeViewContainer.php index 78df8085c5..89dfbe77e9 100644 --- a/libraries/navigation/nodes/NodeViewContainer.php +++ b/libraries/navigation/nodes/NodeViewContainer.php @@ -26,9 +26,11 @@ class NodeViewContainer extends NodeDatabaseChildContainer $this->icon = PMA\libraries\Util::getImage('b_views.png', __('Views')); $this->links = array( 'text' => 'db_structure.php?server=' . $GLOBALS['server'] - . '&db=%1$s&tbl_type=view', + . '&db=%1$s&tbl_type=view' + . '&token=' . $_SESSION[' PMA_token '], 'icon' => 'db_structure.php?server=' . $GLOBALS['server'] - . '&db=%1$s&tbl_type=view', + . '&db=%1$s&tbl_type=view' + . '&token=' . $_SESSION[' PMA_token '], ); $this->classes = 'viewContainer subContainer'; $this->real_name = 'views'; @@ -42,9 +44,9 @@ class NodeViewContainer extends NodeDatabaseChildContainer $new->icon = PMA\libraries\Util::getImage('b_view_add.png', $new_label); $new->links = array( 'text' => 'view_create.php?server=' . $GLOBALS['server'] - . '&db=%2$s', + . '&db=%2$s&token=' . $_SESSION[' PMA_token '], 'icon' => 'view_create.php?server=' . $GLOBALS['server'] - . '&db=%2$s', + . '&db=%2$s&token=' . $_SESSION[' PMA_token '], ); $new->classes = 'new_view italics'; $this->addChild($new); diff --git a/po/ar.po b/po/ar.po index 0897ecfb22..0c0f972261 100644 --- a/po/ar.po +++ b/po/ar.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.6-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-11-02 14:03+0100\n" -"PO-Revision-Date: 2017-11-26 11:44+0000\n" -"Last-Translator: Aref Ben Lazrek \n" +"PO-Revision-Date: 2017-12-16 12:04+0000\n" +"Last-Translator: Waleed Abdeen \n" "Language-Team: Arabic " "\n" "Language: ar\n" @@ -14,7 +14,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: Weblate 2.18-dev\n" +"X-Generator: Weblate 2.18\n" #: ajax.php:16 ajax.php:33 export.php:192 schema_export.php:64 msgid "Bad type!" @@ -557,12 +557,12 @@ msgstr "تم إنشاء العلامة المرجعية %s." #, php-format msgid "Import has been successfully finished, %d query executed." msgid_plural "Import has been successfully finished, %d queries executed." -msgstr[0] "الإستيراد إنتهى بنجاح , %d إستعلام تم تنفيذه." -msgstr[1] "الإستيراد إنتهى بنجاح , %d إستعلام تم تنفيذه." -msgstr[2] "الإستيراد إنتهى بنجاح , %d إستعلام تم تنفيذه." -msgstr[3] "الإستيراد إنتهى بنجاح , %d إستعلام تم تنفيذه." -msgstr[4] "الإستيراد إنتهى بنجاح , %d إستعلام تم تنفيذه." -msgstr[5] "الإستيراد إنتهى بنجاح , %d إستعلام تم تنفيذه." +msgstr[0] "انتهى الإستيراد بنجاح، %d استعلام تم تنفيذه." +msgstr[1] "انتهى الإستيراد بنجاح، %d استعلام تم تنفيذه." +msgstr[2] "انتهى الإستيراد بنجاح، %d استعلام تم تنفيذه." +msgstr[3] "انتهى الإستيراد بنجاح، %d استعلام تم تنفيذه." +msgstr[4] "انتهى الإستيراد بنجاح، %d استعلام تم تنفيذه." +msgstr[5] "انتهى الإستيراد بنجاح، %d استعلام تم تنفيذه." #: import.php:612 #, php-format @@ -629,7 +629,7 @@ msgstr "تغيير كلمة السر" #: index.php:221 msgid "Server connection collation" -msgstr "إعدادات الأتصال بالخادم" +msgstr "إعدادات الاتصال بالخادم" #: index.php:242 msgid "Appearance settings" @@ -1963,6 +1963,8 @@ msgid "" "Note: a, b -> d,f implies values of columns a and b combined together can " "determine values of column d and column f." msgstr "" +"ملاحظة: a,b -> d,f تدل على أن قيم الأعمدة a و b مجتمعة يمكن أن تحدد قيم " +"العمود d و العمود f." #: js/messages.php:458 msgid "No partial dependencies selected!" @@ -2277,11 +2279,15 @@ msgid "Click to sort results by this column." msgstr "انقر لترتيب النتائج حسب هذا العمود." #: js/messages.php:590 +#, fuzzy msgid "" "Shift+Click to add this column to ORDER BY clause or to toggle ASC/DESC.
- Ctrl+Click or Alt+Click (Mac: Shift+Option+Click) to remove column from " "ORDER BY clause" msgstr "" +"Shift+انقر للإضافة هذا العمود الى بند ORDER BY أو للتبديل بين ASC/DESC.
- Ctrl+Click أو Alt+انقر (Mac: Shift+Option+Click) لإزالة عمود من بند " +"ORDER BY" #: js/messages.php:594 msgid "Click to mark/unmark." @@ -2471,6 +2477,8 @@ msgid "" "Warning: a form on this page has more than %d fields. On submission, some of " "the fields might be ignored, due to PHP's max_input_vars configuration." msgstr "" +"تحذير: يحتوي النموذج الموجود في هذه الصفحة على أكثر من %d من الحقول. عند " +"الإرسال، قد يتم تجاهل بعض الحقول، وذلك بسبب تكوين ترتيب PHP max_input_vars ." #: js/messages.php:695 js/messages.php:708 msgid "Some errors have been detected on the server!" @@ -2952,10 +2960,9 @@ msgid "Unexpected characters on line %s." msgstr "أحرف غير متوقعة على السطر %s." #: libraries/Advisor.php:570 -#, fuzzy, php-format -#| msgid "Unexpected characters on line %s." +#, php-format msgid "Unexpected character on line %1$s. Expected tab, but found \"%2$s\"." -msgstr "أحرف غير متوقعة على السطر %s" +msgstr "حرف غير متوقع على السطر %1$s. متوقع tab ، ولكن \"%2$s\" وجد." #: libraries/Charsets.php:160 #: templates/database/structure/table_header.phtml:84 @@ -2977,9 +2984,6 @@ msgid "Collation" msgstr "" #: libraries/Charsets.php:244 -#, fuzzy -#| msgctxt "Collation" -#| msgid "Unknown" msgid "Unknown" msgstr "غير معروف" @@ -3103,7 +3107,7 @@ msgstr "البلغارية" #: libraries/Charsets.php:374 msgctxt "Collation" msgid "Chinese" -msgstr "" +msgstr "الصينية" #: libraries/Charsets.php:379 msgctxt "Collation" @@ -3143,7 +3147,7 @@ msgstr "الألمانية (ترتيب القاموس)" #: libraries/Charsets.php:405 libraries/Charsets.php:516 msgctxt "Collation" msgid "German (phone book order)" -msgstr "" +msgstr "الألمانية (ترتيب دفتر الهاتف)" #: libraries/Charsets.php:414 msgctxt "Collation" @@ -3173,7 +3177,7 @@ msgstr "الليتوانية" #: libraries/Charsets.php:441 msgctxt "Collation" msgid "Burmese" -msgstr "" +msgstr "البورمية" #: libraries/Charsets.php:444 msgctxt "Collation" @@ -3421,11 +3425,11 @@ msgstr "تعديل :" #: libraries/DbQbe.php:969 msgid "Ins:" -msgstr "" +msgstr "إدخال:" #: libraries/DbQbe.php:984 msgid "Del:" -msgstr "" +msgstr "حذف:" #: libraries/DbQbe.php:1847 #, php-format @@ -3670,10 +3674,8 @@ msgid "Kill" msgstr "حذف" #: libraries/DisplayResults.php:4290 -#, fuzzy -#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]" msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]." -msgstr "ممكن أن يكون تقريبي. أنظر إلى [doc@faq3-11]الأسئلة المتكررة 3.11[/doc]" +msgstr "ممكن أن يكون تقريبي. أنظر إلى [doc@faq3-11]الأسئلة المتكررة 3.11[/doc]." #: libraries/DisplayResults.php:4363 libraries/Message.php:171 #: libraries/controllers/table/TableRelationController.php:242 @@ -3711,7 +3713,7 @@ msgstr "المجموع %d" #: libraries/DisplayResults.php:4755 libraries/sql.lib.php:1383 #, php-format msgid "Query took %01.4f seconds." -msgstr "استغرق الاستعلام %01.4f ثانية" +msgstr "استغرق الاستعلام %01.4f ثانية." #: libraries/DisplayResults.php:4857 libraries/DisplayResults.php:4864 #: libraries/mult_submits.inc.php:53 @@ -3843,11 +3845,11 @@ msgstr "انت تحاول رفع ملف بصيغة ضغط غير معروفة (% #: libraries/Footer.php:73 #, php-format msgid "Currently running Git revision %1$s from the %2$s branch." -msgstr "" +msgstr "قيد التشغيل Git مراجعة %1$s من الفرع ال %2$s." #: libraries/Footer.php:80 msgid "Git information missing!" -msgstr "" +msgstr "معلومات Git مفقودة!" #: libraries/Footer.php:195 libraries/Footer.php:199 libraries/Footer.php:202 msgid "Open new phpMyAdmin window" @@ -3976,7 +3978,7 @@ msgstr "تم تعطيل ميزة Linting لهذا الاستعلام لأنه ي #: libraries/Linter.php:165 #, php-format msgid "%1$s (near %2$s)" -msgstr "" +msgstr "%1$s (بالقرب من %2$s)" #: libraries/Menu.php:208 libraries/ServerStatusData.php:425 #: libraries/config/messages.inc.php:917 @@ -4210,7 +4212,7 @@ msgstr "تعذر حفظ الجدول المفضل!" #: libraries/RecentFavoriteTable.php:209 #: templates/database/structure/favorite_anchor.phtml:12 msgid "Remove from Favorites" -msgstr "Remove from Favorites" +msgstr "إزالة من المفضلة" #: libraries/RecentFavoriteTable.php:231 msgid "There are no recent tables." @@ -4344,7 +4346,7 @@ msgstr "جميع متغيرات الحالة" #: libraries/ServerStatusData.php:441 msgid "Monitor" -msgstr "" +msgstr "مراقبة" #: libraries/ServerStatusData.php:445 msgid "Advisor" @@ -4356,7 +4358,7 @@ msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d ثانية" msgstr[1] "%d ثانية" -msgstr[2] "%d ثانية" +msgstr[2] "%d ثانيتين" msgstr[3] "%d ثواني" msgstr[4] "%d ثانية" msgstr[5] "%d ثانية" @@ -4421,10 +4423,9 @@ msgid "Invalid table name:" msgstr "اسم الجدول غير صالح :" #: libraries/Table.php:1369 -#, fuzzy, php-format -#| msgid "Error renaming table %1$s to %2$s" +#, php-format msgid "Failed to rename table %1$s to %2$s!" -msgstr "خطأ في إعادة تسمية الجدول %1$s إلى %2$s" +msgstr "فشل في إعادة تسمية الجدول %1$s إلى %2$s!" #: libraries/Table.php:1388 #, php-format @@ -5230,7 +5231,7 @@ msgstr "قيمة غير صحيحة!" #: libraries/config/FormDisplay.php:103 libraries/config/Validator.php:579 #, php-format msgid "Value must be equal or lower than %s!" -msgstr "القيمة يجب أن تساوي أو أقل من %s" +msgstr "القيمة يجب أن تساوي أو أقل من %s!" #: libraries/config/FormDisplay.php:619 #, php-format @@ -5616,7 +5617,7 @@ msgstr "ملف التكوين" msgid "" "Whether a warning (\"Are your really sure…\") should be displayed when " "you're about to lose data." -msgstr "التحذير (\" هل أنت متأكد \" ) يظهر عندما تكون على وشك فقدان بيانات" +msgstr "التحذير (\" هل أنت متأكد \" ) يظهر عندما تكون على وشك فقدان بيانات." #: libraries/config/messages.inc.php:95 msgid "Confirm DROP queries" @@ -6114,7 +6115,7 @@ msgstr "خيارات عرض الجداول." #: libraries/config/messages.inc.php:275 setup/frames/menu.inc.php:25 msgid "Main panel" -msgstr "الإطار الرئيسي." +msgstr "الإطار الرئيسي" #: libraries/config/messages.inc.php:276 msgid "Microsoft Office" @@ -6148,7 +6149,7 @@ msgid "" "limit MySQL." msgstr "" "فضلاً , تذكر أن phpMyAdmin هي واجهه إستخدام فقط وميزاتها لا يمكن أن تتجاوز " -"حدود MySQL" +"حدود MySQL." #: libraries/config/messages.inc.php:294 msgid "Basic settings" @@ -6573,7 +6574,7 @@ msgstr "" #: libraries/config/messages.inc.php:474 msgid "Show logo in navigation panel." -msgstr "عرض تنقل قواعد البيانات على شكل شجرة" +msgstr "عرض تنقل قواعد البيانات على شكل شجرة." #: libraries/config/messages.inc.php:475 msgid "Display logo" @@ -8012,7 +8013,7 @@ msgstr[5] "" #: libraries/controllers/table/TableStructureController.php:250 msgid "No column selected." -msgstr "لايوجد صفوف مختارة" +msgstr "لايوجد صفوف مختارة." #: libraries/controllers/table/TableStructureController.php:465 msgid "The columns have been moved successfully." @@ -9142,7 +9143,7 @@ msgstr "" #: libraries/navigation/nodes/NodeColumnContainer.php:27 #: libraries/sql_query_form.lib.php:268 msgid "Columns" -msgstr "اعمدة :" +msgstr "أعمدة" #: libraries/navigation/nodes/NodeColumnContainer.php:36 msgctxt "Create new column" @@ -9151,7 +9152,7 @@ msgstr "" #: libraries/navigation/nodes/NodeDatabase.php:40 msgid "Database operations" -msgstr "عمليات قاعدة البيانات :" +msgstr "عمليات قاعدة البيانات" #: libraries/navigation/nodes/NodeDatabase.php:684 #, fuzzy @@ -17019,11 +17020,11 @@ msgstr "" #: libraries/advisory_rules.txt:441 msgid "MyISAM concurrent inserts" -msgstr "" +msgstr "MyISAM ادخالات متزامنة" #: libraries/advisory_rules.txt:444 msgid "Enable {concurrent_insert} by setting it to 1" -msgstr "" +msgstr "مكّن {concurrent_insert} من خلال تعيينه الى 1" #: libraries/advisory_rules.txt:445 msgid "" @@ -17034,7 +17035,7 @@ msgstr "" #: libraries/advisory_rules.txt:446 msgid "concurrent_insert is set to 0" -msgstr "" +msgstr "تم تعيين concurrent_insert الى 0" #, fuzzy #~| msgid "unknown" diff --git a/po/ca.po b/po/ca.po index 715fb65170..7d8caba11d 100644 --- a/po/ca.po +++ b/po/ca.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.6-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-11-02 14:03+0100\n" -"PO-Revision-Date: 2017-07-17 09:05+0000\n" -"Last-Translator: Xavier Navarro \n" -"Language-Team: Catalan \n" +"PO-Revision-Date: 2017-12-18 12:11+0000\n" +"Last-Translator: Robert Antoni Buj Gelonch \n" +"Language-Team: Catalan " +"\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.16-dev\n" +"X-Generator: Weblate 2.18\n" #: ajax.php:16 ajax.php:33 export.php:192 schema_export.php:64 msgid "Bad type!" @@ -294,7 +294,7 @@ msgstr "Selecciona-ho tot" #: db_operations.php:50 tbl_create.php:23 msgid "The database name is empty!" -msgstr "El nom de la base de dades és buit!" +msgstr "El nom de la base de dades està en blanc!" #: db_operations.php:138 #, php-format @@ -311,8 +311,8 @@ msgstr "S'ha copiat la base de dades %1$s a %2$s." msgid "" "The phpMyAdmin configuration storage has been deactivated. %sFind out why%s." msgstr "" -"S'ha desactivat l'emmagatzemament de la configuració de phpMyAdmin. " -"%sConsulta el motiu%s." +"S'ha desactivat l'emmagatzematge de la configuració de phpMyAdmin. %" +"sConsulteu el motiu%s." #: db_qbe.php:126 msgid "You have to choose at least one column to display!" @@ -550,9 +550,9 @@ msgid "" "file size exceeded the maximum size permitted by your PHP configuration. See " "[doc@faq1-16]FAQ 1.16[/doc]." msgstr "" -"No s'han rebut dades per importar. O bé no s'ha especificat un nom d'arxiu, " -"o el tamany de l'arxiu es més gran que el permès per la configuració del " -"vostre PHP. Veieu [doc@faq1-16]PFC(FAQ) 1.16[/doc]." +"No s'han rebut dades per importar. O bé no s'ha especificat un nom de " +"fitxer, o la mida del fitxer es més gran que la permesa per la configuració " +"del vostre PHP. Veieu [doc@faq1-16]PFC(FAQ) 1.16[/doc]." #: import.php:529 libraries/display_import.lib.php:665 msgid "Could not load import plugins, please check your installation!" @@ -643,7 +643,7 @@ msgstr "Ordenació de la connexió del servidor" #: index.php:242 msgid "Appearance settings" -msgstr "Paràmetres d'aparença" +msgstr "Paràmetres de l'aparença" #: index.php:275 prefs_manage.php:294 msgid "More settings" @@ -693,7 +693,7 @@ msgstr "Extensió PHP:" #: index.php:365 msgid "PHP version:" -msgstr "versió de PHP:" +msgstr "Versió de PHP:" #: index.php:376 msgid "Show PHP information" @@ -713,11 +713,11 @@ msgstr "Documentació" #: index.php:413 msgid "Official Homepage" -msgstr "Pàgina oficial del phpMyAdmin" +msgstr "Pàgina oficial" #: index.php:420 msgid "Contribute" -msgstr "Contribueix" +msgstr "Contribuir" #: index.php:427 msgid "Get support" @@ -790,11 +790,11 @@ msgid "" "once phpMyAdmin has been configured. Otherwise the security of your server " "may be compromised by unauthorized people downloading your configuration." msgstr "" -"El directori [code]config[/code], que s'utilitza al procés de configuració, " -"encara existeix dins del teu directori de phpMyAdmin. És molt recomanable " -"esborrar-lo un cop has acabat de configurar phpMyAdmin. D'altra manera la " -"seguretat del teu servidor pot estar compromesa per la descàrrega de la " -"configuració per part de persones no autoritzades." +"El directori [code]config[/code], que s'utilitza amb l'script de preparació, " +"encara existeix dins del vostre directori de phpMyAdmin. És molt recomanable " +"esborrar-lo un cop s'hagi configurat phpMyAdmin. Altrament la seguretat del " +"vostre servidor pot estar compromesa per la baixada de la configuració per " +"part de persones no autoritzades." #: index.php:562 #, php-format @@ -802,9 +802,9 @@ msgid "" "The phpMyAdmin configuration storage is not completely configured, some " "extended features have been deactivated. %sFind out why%s. " msgstr "" -"La configuració d'emmagatzemament de la configuració de phpMyAdmin no està " -"completa, s'han desactivat algunes característiques avançades. %sConsulta el " -"motiu%s. " +"La configuració de l'emmagatzematge de la configuració de phpMyAdmin no està " +"completament configurada, s'han desactivat algunes característiques " +"avançades. %sConsulteu el motiu%s. " #: index.php:569 msgid "" @@ -829,7 +829,7 @@ msgstr "Confirmar" #: js/messages.php:44 #, php-format msgid "Do you really want to execute \"%s\"?" -msgstr "Realment vols fer \"%s\"?" +msgstr "Realment voleu executar \"%s\"?" #: js/messages.php:46 libraries/mult_submits.lib.php:444 msgid "You are about to DESTROY a complete database!" @@ -888,12 +888,12 @@ msgstr "Aquesta operació pot ser bastant llarga. Procedim igualment?" #: js/messages.php:67 #, php-format msgid "Do you really want to delete user group \"%s\"?" -msgstr "Realment vols esborrar el grup d'usuaris \"%s\"?" +msgstr "Realment voleu esborrar el grup d'usuaris \"%s\"?" #: js/messages.php:69 #, php-format msgid "Do you really want to delete the search \"%s\"?" -msgstr "Realment vols esborrar la cerca \"%s\"?" +msgstr "Realment voleu esborrar la cerca \"%s\"?" #: js/messages.php:71 msgid "You have unsaved changes; are you sure you want to leave this page?" @@ -901,11 +901,11 @@ msgstr "Tens canvis no desats; estàs segur de sortir d'aquesta pàgina?" #: js/messages.php:73 msgid "Do you really want to revoke the selected user(s) ?" -msgstr "Realment vols revocar el(s) usuari(s) seleccionat(s)?" +msgstr "Realment voleu revocar els usuaris seleccionats?" #: js/messages.php:75 msgid "Do you really want to delete this central column?" -msgstr "Realment vols esborrar aquesta columna central?" +msgstr "Realment voleu esborrar aquesta columna central?" #: js/messages.php:77 msgid "Do you really want to delete the selected items?" @@ -925,11 +925,11 @@ msgstr "Realment voleu TRUNCAR les particions seleccionades?" #: js/messages.php:85 msgid "Do you really want to remove partitioning?" -msgstr "Realment vols eliminar el particionat?" +msgstr "Realment voleu eliminar el particionat?" #: js/messages.php:86 msgid "Do you really want to RESET SLAVE?" -msgstr "Realment vols reiniciar l'esclau (SLAVE)?" +msgstr "Realment voleu fer un RESET SLAVE?" #: js/messages.php:88 msgid "" @@ -986,11 +986,11 @@ msgstr "Desa i tanca" #: js/messages.php:112 libraries/config/FormDisplay.tpl.php:426 #: libraries/insert_edit.lib.php:1619 prefs_manage.php:375 prefs_manage.php:386 msgid "Reset" -msgstr "Reinicia" +msgstr "Restableix" #: js/messages.php:113 msgid "Reset all" -msgstr "Reinicia tot" +msgstr "Restableix-ho tot" #: js/messages.php:116 msgid "Missing value in the form!" @@ -1278,7 +1278,7 @@ msgstr "Consultes" #: js/messages.php:213 libraries/server_status.lib.php:140 msgid "Traffic" -msgstr "Tràfic" +msgstr "Trànsit" #: js/messages.php:214 libraries/Menu.php:592 libraries/Util.php:4103 #: libraries/server_status_monitor.lib.php:256 @@ -1368,8 +1368,8 @@ msgid "" "Following settings will be applied globally and reset to default on server " "restart:" msgstr "" -"Les següents configuracions s'aplicaràn globalment i tornaràn als seus " -"valors predeterminats en reiniciar el servidor:" +"Els paràmetres següents s'aplicaràn globalment i tornaràn als seus valors " +"predeterminats en reiniciar el servidor:" #. l10n: %s is FILE or TABLE #: js/messages.php:242 @@ -1738,6 +1738,8 @@ msgid "" "It seems that the connection to server has been lost. Please check your " "network connectivity and server status." msgstr "" +"Sembla que s'ha perdut la connexió al servidor. Comproveu la connectivitat " +"de xarxa i l'estat del servidor." #: js/messages.php:372 #: libraries/controllers/server/ServerDatabasesController.php:194 @@ -2118,11 +2120,11 @@ msgstr "Situant el cursor sobre un punt es mostrarà la seva etiqueta." #: js/messages.php:501 msgid "To zoom in, select a section of the plot with the mouse." -msgstr "Per acostar, selecciona una secció del gràfic amb el ratolí." +msgstr "Per augmentar el zoom, seleccioneu una secció del gràfic amb el ratolí." #: js/messages.php:503 msgid "Click reset zoom button to come back to original state." -msgstr "Feu clic al botó de restaurar ampliació per tornar a l'estat original." +msgstr "Feu clic al botó de restablir el zoom per tornar a l'estat original." #: js/messages.php:505 msgid "Click a data point to view and possibly edit the data row." @@ -2183,7 +2185,7 @@ msgstr "Cercle exterior" #: js/messages.php:531 msgid "Do you want to copy encryption key?" -msgstr "Vols copiar la clau de xifratge?" +msgstr "Voleu copiar la clau de xifratge?" #: js/messages.php:532 msgid "Encryption key" @@ -2235,7 +2237,7 @@ msgid "" "You haven't saved the changes in the layout. They will be lost if you don't " "save them. Do you want to continue?" msgstr "" -"No has desat els canvis en el disseny. Es perdran si no els deses. Vols " +"No heu desat els canvis en el disseny. Es perdran si no els deseu. Voleu " "continuar?" #: js/messages.php:562 @@ -2275,7 +2277,7 @@ msgstr "Entra un nom de pàgina vàlid" #: js/messages.php:571 msgid "Do you want to save the changes to the current page?" -msgstr "Vols desar els canvis a la pàgina actual?" +msgstr "Voleu desar els canvis a la pàgina actual?" #: js/messages.php:572 msgid "Successfully deleted the page" @@ -2312,8 +2314,8 @@ msgid "" "You have edited some data and they have not been saved. Are you sure you " "want to leave this page before saving the data?" msgstr "" -"Has editat algunes dades i no s'han desat. Estàs segur que vols sortir " -"d'aquesta pàgina per desar les dades?" +"Heu editat algunes dades i no s'han desat. Esteu segur que voleu abandonar " +"aquesta pàgina abans de desar les dades?" #: js/messages.php:587 msgid "Drag to reorder." @@ -2375,7 +2377,7 @@ msgid "" "Do you really want to see all of the rows? For a big table this could crash " "the browser." msgstr "" -"De veritat vols veure totes les files? Una taula gran pot fer fallar el " +"Realment voleu veure totes les files? Una taula gran pot fer fallar el " "navegador." #: js/messages.php:610 @@ -2508,7 +2510,7 @@ msgid "" "A fatal JavaScript error has occurred. Would you like to send an error " "report?" msgstr "" -"S'ha produït un error fatal de JavaScript. Vols enviar un informe d'errors?" +"S'ha produït un error fatal de JavaScript. Voleu enviar un informe d'errors?" #: js/messages.php:681 msgid "Change report settings" @@ -2559,7 +2561,7 @@ msgstr "Executar aquesta consulta de nou?" #: js/messages.php:723 msgid "Do you really want to delete this bookmark?" -msgstr "Realment vols esborrar aquesta marca?" +msgstr "Realment voleu esborrar aquesta marcador?" #: js/messages.php:725 msgid "Some error occurred while getting SQL debug info." @@ -3044,9 +3046,6 @@ msgid "Collation" msgstr "Ordenació" #: libraries/Charsets.php:244 -#, fuzzy -#| msgctxt "Collation" -#| msgid "Unknown" msgid "Unknown" msgstr "Desconegut" @@ -3345,14 +3344,14 @@ msgstr "" #: libraries/Config.php:1558 msgid "Font size" -msgstr "Tamany de lletra" +msgstr "Mida de la lletra" #: libraries/Console.php:86 #, php-format msgid "Showing %1$d bookmark (both private and shared)" msgid_plural "Showing %1$d bookmarks (both private and shared)" -msgstr[0] "Mostrant %1$d favorit (privat i compartit)" -msgstr[1] "Mostrant %1$d favorits (privats i compartits)" +msgstr[0] "Es mostra %1$d marcador (privat i compartit)" +msgstr[1] "Es mostren %1$d marcadors (privats i compartits)" #: libraries/Console.php:93 msgid "No bookmarks" @@ -3730,7 +3729,7 @@ msgstr "Pot ser aproximat. Veieu [doc@faq3-11]FAQ 3.11[/doc]." #: libraries/rte/rte_routines.lib.php:1445 libraries/sql_query_form.lib.php:92 #: tbl_row_action.php:141 view_operations.php:75 msgid "Your SQL query has been executed successfully." -msgstr "La vostra comanda SQL ha estat executada amb èxit." +msgstr "La vostra consulta SQL ha estat executada amb èxit." #: libraries/DisplayResults.php:4710 #: libraries/controllers/database/DatabaseStructureController.php:785 @@ -3759,7 +3758,7 @@ msgstr "%d total" #: libraries/DisplayResults.php:4755 libraries/sql.lib.php:1383 #, php-format msgid "Query took %01.4f seconds." -msgstr "La consulta tarda %01.4f segons." +msgstr "La consulta ha trigat %01.4f segons." #: libraries/DisplayResults.php:4857 libraries/DisplayResults.php:4864 #: libraries/mult_submits.inc.php:53 @@ -4246,12 +4245,12 @@ msgstr "No es pot desar la taula recent!" #: libraries/RecentFavoriteTable.php:139 msgid "Could not save favorite table!" -msgstr "No es pot desar la taula favorita!" +msgstr "No s'ha pogut desar la taula preferida!" #: libraries/RecentFavoriteTable.php:209 #: templates/database/structure/favorite_anchor.phtml:12 msgid "Remove from Favorites" -msgstr "Eliminar de favorits" +msgstr "Suprimeix dels preferits" #: libraries/RecentFavoriteTable.php:231 msgid "There are no recent tables." @@ -4259,7 +4258,7 @@ msgstr "No hi ha taules recents." #: libraries/RecentFavoriteTable.php:232 msgid "There are no favorite tables." -msgstr "No hi ha taules favorites." +msgstr "No hi ha taules preferides." #: libraries/RecentFavoriteTable.php:247 msgid "Recent tables" @@ -4271,11 +4270,11 @@ msgstr "Recent" #: libraries/RecentFavoriteTable.php:251 libraries/config/messages.inc.php:539 msgid "Favorite tables" -msgstr "Taules favorites" +msgstr "Taules preferides" #: libraries/RecentFavoriteTable.php:253 msgid "Favorites" -msgstr "Favorites" +msgstr "Preferides" #: libraries/SavedSearches.php:256 msgid "Please provide a name for this bookmarked search." @@ -4679,7 +4678,7 @@ msgid "" "the maximum row size" msgstr "" "Una cadena de longitud variable (%s), la longitud efectiva màxima està " -"subjecta al tamany màxim d'una fila" +"subjecta a la mida màxima d'una fila" #: libraries/TypesMySQL.php:131 msgid "" @@ -5672,9 +5671,9 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns." msgstr "" -"Defineix quin tipus de control d'edició es farà servir per a columnes CHAR i " -"VARCHAR; [kbd]input[/kbd] - permet limitar el tamany de l'entrada, " -"[kbd]textarea[/kbd] - permet varies línies dintre dels camps." +"Defineix quin tipus de control d'edició es farà servir per a les columnes " +"CHAR i VARCHAR; [kbd]input[/kbd] - permet limitar la mida de l'entrada, " +"[kbd]textarea[/kbd] - permet diverses línies dins dels camps." #: libraries/config/messages.inc.php:56 msgid "CHAR columns editing" @@ -5878,7 +5877,7 @@ msgstr "Usar l'instrucció %s" #: libraries/config/messages.inc.php:137 prefs_manage.php:327 msgid "Save as file" -msgstr "Desa com a arxiu" +msgstr "Desa com un fitxer" #: libraries/config/messages.inc.php:138 libraries/config/messages.inc.php:365 msgid "Character set of the file" @@ -6033,7 +6032,7 @@ msgstr "Usa -backquotes- amb noms de taules i columnes" #: libraries/config/messages.inc.php:192 libraries/config/messages.inc.php:397 #: libraries/display_export.lib.php:399 msgid "SQL compatibility mode" -msgstr "Modus de compatibilitat SQL" +msgstr "Mode de compatibilitat SQL" #: libraries/config/messages.inc.php:193 msgid "Creation/Update/Check dates" @@ -6091,7 +6090,7 @@ msgstr "Sintaxi a usar a l'inserció de dades" #: libraries/config/messages.inc.php:217 #: libraries/plugins/export/ExportSql.php:437 msgid "Maximal length of created query" -msgstr "Tamany màxim de la consulta creada" +msgstr "Mida màxima de la consulta creada" #: libraries/config/messages.inc.php:223 msgid "Export type" @@ -6413,7 +6412,7 @@ msgstr "Pestanyes" #: libraries/config/messages.inc.php:335 msgid "Choose how you want tabs to work." -msgstr "Tria cóm vols que treballin les pestanyes." +msgstr "Trieu cóm voleu que treballin les pestanyes." #: libraries/config/messages.inc.php:336 msgid "Display relational schema" @@ -6423,7 +6422,7 @@ msgstr "Mostra l'esquema relacional" #: libraries/plugins/schema/SchemaDia.php:72 #: libraries/plugins/schema/SchemaPdf.php:80 msgid "Paper size" -msgstr "Tamany de paper" +msgstr "Mida del paper" #: libraries/config/messages.inc.php:341 msgid "Text fields" @@ -6548,7 +6547,7 @@ msgstr "Importació parcial: saltar consultes" #: libraries/config/messages.inc.php:399 msgid "Do not use AUTO_INCREMENT for zero values" -msgstr "No feu servir AUTO_INCREMENT per a valors zero" +msgstr "No utilitzis AUTO_INCREMENT per als valors zero" #: libraries/config/messages.inc.php:400 msgid "Read as multibytes" @@ -6632,7 +6631,7 @@ msgstr "Validesa de l'autenticació per galetes" #: libraries/config/messages.inc.php:430 msgid "Double size of textarea for LONGTEXT columns." -msgstr "Doble tamany de textarea per a columnes LONGTEXT." +msgstr "Mida doble de l'àrea de text per a les columnes LONGTEXT." #: libraries/config/messages.inc.php:431 msgid "Bigger textarea for LONGTEXT" @@ -6644,7 +6643,7 @@ msgstr "Màxim nombre de caràcters usats quan es mostra una consulta SQL." #: libraries/config/messages.inc.php:434 msgid "Maximum displayed SQL length" -msgstr "Tamany màxim de SQL mostrat" +msgstr "Mida màxima del SQL mostrat" #: libraries/config/messages.inc.php:435 libraries/config/messages.inc.php:454 #: libraries/config/messages.inc.php:588 @@ -6861,8 +6860,7 @@ msgstr "Mostrar funcions en arbre" #: libraries/config/messages.inc.php:527 msgid "Whether to show functions under database in the navigation tree" -msgstr "" -"Si vols mostrar les funcions sota la base de dades a l'arbre de navegació" +msgstr "Si es mostren les funcions sota la base de dades a l'arbre de navegació" #: libraries/config/messages.inc.php:528 msgid "Show procedures in tree" @@ -7009,10 +7007,10 @@ msgid "" "storage). If disabled, this utilizes JS-routines to display query history " "(lost by window close)." msgstr "" -"Activa si vols tenir un historial de consultes basat en BD (requireix " -"l'infraestructura de taules enllaçades de phpMyAdmin). Si es desactiva, es " -"fan servir rutines JS per mostrar l'historial de consultes (es perd al " -"tancar la finestra)." +"Habiliteu-ho si voleu tenir un historial de consultes basat en BD (requereix " +"l'emmagatzematge de la configuració de phpMyAdmin). Si s'inhabilita, " +"s'utilitzen rutines JS per mostrar l'historial de consultes (es perd amb el " +"tancament de la finestra)." #: libraries/config/messages.inc.php:587 msgid "Permanent query history" @@ -7024,7 +7022,7 @@ msgstr "Quàntes consultes s'han de desar a l'historial." #: libraries/config/messages.inc.php:590 msgid "Query history length" -msgstr "Tamany de l'historial de consultes" +msgstr "Mida de l'historial de consultes" #: libraries/config/messages.inc.php:592 msgid "Select which functions will be used for character set conversion." @@ -7748,7 +7746,7 @@ msgstr "" #: libraries/config/messages.inc.php:870 libraries/sql_query_form.lib.php:355 msgid "Retain query box" -msgstr "Mantenir el quadre de consultes" +msgstr "Mantén el quadre de consultes" #: libraries/config/messages.inc.php:872 msgid "Allow to display database and table statistics (eg. space usage)." @@ -7801,8 +7799,8 @@ msgid "" "Textarea size (columns) in edit mode, this value will be emphasized for SQL " "query textareas (*2)." msgstr "" -"Tamany de textarea (columnes) en mode d'edició, aquest valor s'augmentarà " -"per a textareas de consultes SQL (*2)." +"Mida de l'àrea de text (columnes) en mode d'edició, aquest valor " +"s'augmentarà per a les àrees de text de les consultes SQL (*2)." #: libraries/config/messages.inc.php:900 msgid "Textarea columns" @@ -7813,8 +7811,8 @@ msgid "" "Textarea size (rows) in edit mode, this value will be emphasized for SQL " "query textareas (*2)." msgstr "" -"Tamany de textarea (files) en mode d'edició, aquest valor s'augmentarà per a " -"textareas de consultes SQL (*2)." +"Mida de l'àrea de text (files) en mode d'edició, aquest valor s'augmentarà " +"per a les àrees de text de les consultes SQL (*2)." #: libraries/config/messages.inc.php:905 msgid "Textarea rows" @@ -7990,8 +7988,9 @@ msgid "" "Enable Zero Configuration mode which lets you setup phpMyAdmin configuration " "storage tables automatically." msgstr "" -"Activar el mode de «Configuració Zero» que et permet definir les taules " -"d'emmagatzemament de configuració de phpMyAdmin automàticament." +"Habilita el mode de «Zero Configuration» que us permet preparar " +"automàticament les taules de l'emmagatzematge de la configuració de " +"phpMyAdmin." #: libraries/config/messages.inc.php:989 msgid "Enable Zero Configuration mode" @@ -8162,8 +8161,8 @@ msgid "" "Note: Enabling the database statistics here might cause heavy traffic " "between the web server and the MySQL server." msgstr "" -"Nota: Activant les estadístiques de Base de Dades aqui pot provocar elevat " -"tràfic entre el servidor Web i el de MySQL." +"Nota: L'habilitació aquí de les estadístiques de les bases de dades, pot " +"provocar un trànsit elevat entre el servidor Web i el servidor MySQL." #: libraries/controllers/server/ServerDatabasesController.php:582 #: libraries/controllers/server/ServerDatabasesController.php:588 @@ -8318,7 +8317,7 @@ msgstr "" #: libraries/dbi/DBIMysqli.php:158 msgid "SSL connection enforced by server, automatically enabling it." -msgstr "" +msgstr "Connexió SSL forçada pel servidor, habilitant-la automàticament." #: libraries/display_change_password.lib.php:57 #: libraries/replication_gui.lib.php:854 @@ -8539,7 +8538,7 @@ msgstr "Reanomenar les bases de dades/taules/columnes exportades" #: libraries/display_export.lib.php:809 msgid "Save output to a file" -msgstr "Desa la sortida com a arxiu" +msgstr "Desa la sortida a un fitxer" #: libraries/display_export.lib.php:842 msgid "Skip tables larger than" @@ -8649,7 +8648,7 @@ msgstr "" #: libraries/display_import.lib.php:315 msgid "Skip this number of queries (for SQL) starting from the first one:" msgstr "" -"Saltar aquesta quantitat de consultes (en SQL) contant des de la primera:" +"Omet aquest nombre de consultes (per a SQL) començant a partir de la primera:" #: libraries/display_import.lib.php:345 msgid "Other options:" @@ -8717,20 +8716,20 @@ msgid "" "The increment size for extending the size of an autoextending tablespace " "when it becomes full." msgstr "" -"La quantitat a incrementar per ampliar el tamany d'una taula autoextensible " +"La quantitat a incrementar per ampliar la mida d'una taula autoextensible " "quan estigui a punt d'omplir-se." #: libraries/engines/Innodb.php:47 msgid "Buffer pool size" -msgstr "Tamany de la memòria cau" +msgstr "Mida de la memòria cau" #: libraries/engines/Innodb.php:49 msgid "" "The size of the memory buffer InnoDB uses to cache data and indexes of its " "tables." msgstr "" -"El tamany de memòria cau que InnoDB fa servir per desar les dades i indexs " -"de les seves taules." +"La quantitat de memòria cau que InnoDB fa servir per desar les dades i els " +"índexs de les seves taules." #: libraries/engines/Innodb.php:139 msgid "Buffer Pool" @@ -8798,15 +8797,15 @@ msgstr "Esperes d'escriptura en %" #: libraries/engines/Myisam.php:28 msgid "Data pointer size" -msgstr "Tamany del punter de dades" +msgstr "Mida del punter de dades" #: libraries/engines/Myisam.php:30 msgid "" "The default pointer size in bytes, to be used by CREATE TABLE for MyISAM " "tables when no MAX_ROWS option is specified." msgstr "" -"El tamany per defecte del punter en bytes, usat en CREATE TABLE per a taules " -"MyISAM quan no s'especifica l'opció MAX_ROWS." +"La mida per defecte del punter en bytes, usat en CREATE TABLE per a les " +"taules MyISAM quan no s'especifica l'opció MAX_ROWS." #: libraries/engines/Myisam.php:36 msgid "Automatic recovery mode" @@ -8822,7 +8821,7 @@ msgstr "" #: libraries/engines/Myisam.php:43 msgid "Maximum size for temporary sort files" -msgstr "Tamany màxim per arxius temporals de classificació" +msgstr "Mida màxima per als fitxers temporals de classificació" #: libraries/engines/Myisam.php:45 msgid "" @@ -8830,13 +8829,13 @@ msgid "" "creating a MyISAM index (during REPAIR TABLE, ALTER TABLE, or LOAD DATA " "INFILE)." msgstr "" -"El tamany màxim per arxius temporals de MySQL es permet usar-lo mentre es " -"torna acrear un índex MyISAM (mentre es fa un REPAIR TABLE, ALTER TABLE, o " -"LOAD DATA INFILE)." +"La mida màxima per als fitxers temporals de MySQL que es permet utilitzar " +"mentre es torna a crear un índex MyISAM (mentre es fa un REPAIR TABLE, ALTER " +"TABLE, o LOAD DATA INFILE)." #: libraries/engines/Myisam.php:52 msgid "Maximum size for temporary files on index creation" -msgstr "Màxim tamany per arxius temporals en creació d'índex" +msgstr "Mida màxima per als fitxers temporals amb la creació de l'índex" #: libraries/engines/Myisam.php:54 msgid "" @@ -8863,7 +8862,7 @@ msgstr "" #: libraries/engines/Myisam.php:70 msgid "Sort buffer size" -msgstr "Tamany de l'àrea de classificació" +msgstr "Mida de l'àrea de classificació" #: libraries/engines/Myisam.php:72 msgid "" @@ -8875,20 +8874,20 @@ msgstr "" #: libraries/engines/Pbxt.php:29 msgid "Index cache size" -msgstr "Tamany del cau d'índex" +msgstr "Mida de la memória cau de l'índex" #: libraries/engines/Pbxt.php:31 msgid "" "This is the amount of memory allocated to the index cache. Default value is " "32MB. The memory allocated here is used only for caching index pages." msgstr "" -"Aquest és el tamany de memòria assignada al cau d'índexs. El valor per " -"defecte és 32MB. La memòria assignada aquí només s'utilitza per cau de " -"pàgines d'índex." +"Aquesta és el quantitat de memòria assignada a la memòria cau de l'índex. El " +"valor per defecte és 32 MB. La memòria assignada aquí només s'utilitza per a " +"la memòria cau de les pàgines d'índex." #: libraries/engines/Pbxt.php:38 msgid "Record cache size" -msgstr "Tamany del cau de registre" +msgstr "Mida de la memòria cau del registre" #: libraries/engines/Pbxt.php:40 msgid "" @@ -8903,7 +8902,7 @@ msgstr "" #: libraries/engines/Pbxt.php:48 msgid "Log cache size" -msgstr "Tamany del registre del cau -log-" +msgstr "Mida de la memòria cau del registre" #: libraries/engines/Pbxt.php:50 msgid "" @@ -8922,12 +8921,12 @@ msgid "" "The size of a transaction log before rollover, and a new log is created. The " "default value is 16MB." msgstr "" -"El tamany del registre de transaccions abans d'un ajornament, i un nou " -"registre es crea. El valor per defecte és 16MB." +"La mida del registre de transaccions abans d'un ajornament, i que es crei un " +"registre nou. El valor per defecte és 16MB." #: libraries/engines/Pbxt.php:65 msgid "Transaction buffer size" -msgstr "Tamany de la memòria cau de transaccions" +msgstr "Mida de la memòria cau de les transaccions" #: libraries/engines/Pbxt.php:67 msgid "" @@ -8980,7 +8979,7 @@ msgstr "" #: libraries/engines/Pbxt.php:103 msgid "Log buffer size" -msgstr "Tamany de la memòria cau del registre" +msgstr "Mida de la memòria cau del registre" #: libraries/engines/Pbxt.php:105 msgid "" @@ -8994,15 +8993,15 @@ msgstr "" #: libraries/engines/Pbxt.php:113 msgid "Data file grow size" -msgstr "Tamany de creixement de l'arxiu de dades" +msgstr "Mida del creixement del fitxer de dades" #: libraries/engines/Pbxt.php:114 msgid "The grow size of the handle data (.xtd) files." -msgstr "El tamany de creixement dels arxius del gestor de dades (.xtd) ." +msgstr "La mida del creixement dels fitxers de dades de gestió (.xtd)." #: libraries/engines/Pbxt.php:118 msgid "Row file grow size" -msgstr "Tamany de creixement de l'arxiu de files" +msgstr "Mida del creixement del fitxer de files" #: libraries/engines/Pbxt.php:119 msgid "The grow size of the row pointer (.xtr) files." @@ -9061,7 +9060,7 @@ msgstr "El bolcat s'ha desat amb el nom d'arxiu %s." #: libraries/rte/rte_routines.lib.php:1466 libraries/sql.lib.php:1377 #: tbl_get_field.php:45 msgid "MySQL returned an empty result set (i.e. zero rows)." -msgstr "MySQL ha retornat un conjunt buit (p.e. cap fila)." +msgstr "MySQL ha retornat un conjunt buit (p. ex. cap fila)." #: libraries/import.lib.php:258 libraries/sql.lib.php:1391 msgid "[ROLLBACK occurred.]" @@ -9121,8 +9120,8 @@ msgid "" "Only INSERT, UPDATE, DELETE and REPLACE SQL queries containing transactional " "engine tables can be rolled back." msgstr "" -"Només es poden desfer (-rollback-) consultes SQL INSERT, UPDATE, DELETE i " -"REPLACE que continguin taules de motors transaccionals." +"Només es poden desfer les consultes SQL INSERT, UPDATE, DELETE i REPLACE que " +"continguin taules de motors transaccionals." #: libraries/index.lib.php:28 #, php-format @@ -9284,7 +9283,7 @@ msgstr "Afegir prefix" #: libraries/mult_submits.lib.php:446 msgid "Do you really want to execute the following query?" -msgstr "Realment vols executar la següent consulta?" +msgstr "Realment voleu executar la següent consulta?" #: libraries/navigation/Navigation.php:55 msgid "An error has occurred while loading the navigation display" @@ -9749,7 +9748,7 @@ msgstr "Millorar l'estructura de taula (Normalització):" #: libraries/normalization.lib.php:805 msgid "Select up to what step you want to normalize" -msgstr "Selecciona fins a quin pas vols normalitzar" +msgstr "Seleccioneu fins a quin pas voleu normalitzar" #: libraries/normalization.lib.php:809 msgid "Second step of normalization (1NF+2NF)" @@ -10047,8 +10046,8 @@ msgid "" "You probably did not create a configuration file. You might want to use the " "%1$ssetup script%2$s to create one." msgstr "" -"La raó més probable d'aixó és que no heu creat l'arxiu de configuració. " -"Podreu voler utilitzar %1$ssetup script%2$s per crear-ne un." +"Probablement no heu creat el fitxer de configuració. Potser voleu utilitzar " +"%1$ssetup script%2$s per crear-ne un." #: libraries/plugins/auth/AuthenticationConfig.php:130 msgid "" @@ -10698,11 +10697,11 @@ msgstr "L'arxiu importat no té dades!" #: libraries/plugins/import/ImportSql.php:67 msgid "SQL compatibility mode:" -msgstr "Modus de compatibilitat SQL:" +msgstr "Mode de compatibilitat SQL:" #: libraries/plugins/import/ImportSql.php:79 msgid "Do not use AUTO_INCREMENT for zero values" -msgstr "No feu servir AUTO_INCREMENT per a valors zero" +msgstr "No utilitzis AUTO_INCREMENT per als valors zero" #: libraries/plugins/import/ImportXml.php:43 msgid "XML" @@ -10977,8 +10976,9 @@ msgid "" "prefix like \"https://www.example.com/\". The second option is a title for " "the link." msgstr "" -"Mostra un enllaç; el camp conté el nom de l'arxiu. La primera opció és un " -"prefixe com \"https://domini.com/\". La segona opció és el títol del enllaç." +"Mostra un enllaç; el camp conté el nom de fitxer. La primera opció és un " +"prefixe URL com ara \"https://domini.com/\". La segona opció és el títol per " +"a l'enllaç." #: libraries/plugins/transformations/input/Text_Plain_Iptobinary.php:29 msgid "Converts an Internet network address in (IPv4/IPv6) format to binary" @@ -11112,7 +11112,7 @@ msgstr "Taules persistents usades recentment" #: libraries/relation.lib.php:242 msgid "Persistent favorite tables" -msgstr "Taules persistents favorites" +msgstr "Taules persistents preferides" #: libraries/relation.lib.php:253 msgid "Persistent tables' UI preferences" @@ -11193,8 +11193,8 @@ msgid "" "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin " "configuration storage there." msgstr "" -"%sCrea%s una base de dades de nom 'phpmyadmin' i estableix la configuració " -"d'enmagatzemament de phpMyAdmin aqui." +"%sCrea%s una base de dades anomenada 'phpmyadmin' i hi prepara " +"l'emmagatzematge de la configuració de phpMyAdmin." #: libraries/relation.lib.php:2007 #, php-format @@ -11265,8 +11265,8 @@ msgid "" "Now, add the following lines at the end of [mysqld] section in your my.cnf " "and please restart the MySQL server afterwards." msgstr "" -"Ara, afegeix les següents línies al final de la secció [mysqld] del teu " -"arxiu -my.cnf- i després reinicia el servidor MySQL." +"Ara, afegiu les següents línies al final de la secció [mysqld] del vostre " +"my.cnf i després reinicieu el servidor MySQL." #: libraries/replication_gui.lib.php:114 msgid "" @@ -11318,7 +11318,7 @@ msgstr "Parada total" #: libraries/replication_gui.lib.php:254 msgid "Reset slave" -msgstr "Reinicia l'esclau" +msgstr "Restableix l'esclau" #: libraries/replication_gui.lib.php:257 msgid "Start SQL Thread only" @@ -11347,7 +11347,7 @@ msgid "" "like to configure it?" msgstr "" "Aquest servidor no està configurat com a esclau en un procés de replicació. " -"Vols configurar-lo ?" +"Voleu configurar-lo ?" #: libraries/replication_gui.lib.php:309 msgid "Error management:" @@ -11375,7 +11375,7 @@ msgid "" "like to configure it?" msgstr "" "Aquest servidor no està configurat com a mestre en un procés de replicació. " -"Vols configurar-lo ?" +"Voleu configurar-lo ?" #: libraries/replication_gui.lib.php:402 msgid "Slave configuration" @@ -11518,11 +11518,11 @@ msgstr "Error en detenir la replicació." #: libraries/replication_gui.lib.php:922 msgid "Replication resetting successfully." -msgstr "Replicació reiniciada correctament." +msgstr "Replicació restablerta correctament." #: libraries/replication_gui.lib.php:923 msgid "Error resetting replication." -msgstr "Error en reiniciar la replicació." +msgstr "Error en restablir la replicació." #: libraries/replication_gui.lib.php:926 msgid "Success." @@ -12573,7 +12573,7 @@ msgstr "Has afegit un usuari nou." #: libraries/server_status.lib.php:57 #, php-format msgid "Network traffic since startup: %s" -msgstr "tràfic de xarxa des de l'inici: %s" +msgstr "Trànsit de xarxa des de l'inici: %s" #: libraries/server_status.lib.php:70 #, php-format @@ -12657,10 +12657,9 @@ msgid "" "changing (by reading the documentation) and how to undo the change. Wrong " "tuning can have a very negative effect on performance." msgstr "" -"Abans de canviar qualsevol configuració, assegura't de saber què estàs " -"canviant (mitjançant la lectura de la documentació) i cóm desfer el canvi. " -"Establir ajustaments incorrectes pot tenir un efecte molt negatiu en el " -"rendiment." +"Abans de canviar qualsevol configuració, assegureu-vos que sabeu què esteu " +"canviant (amb la lectura de la documentació) i cóm desfer el canvi. Establir " +"ajustaments incorrectes pot tenir un efecte molt negatiu en el rendiment." #: libraries/server_status_advisor.lib.php:46 msgid "" @@ -12669,8 +12668,8 @@ msgid "" "no clearly measurable improvement." msgstr "" "La millor manera d'ajustar el sistema seria canviar només una configuració " -"al mateix temps, observar o mesurar la teva base de dades, i desfer el canvi " -"si no hi ha una millora clarament mesurable." +"al mateix temps, observar o mesurar la vostra base de dades, i desfer el " +"canvi si no hi ha una millora significativa." #: libraries/server_status_monitor.lib.php:65 msgid "Log statistics" @@ -12691,7 +12690,7 @@ msgstr "" #: libraries/server_status_monitor.lib.php:84 msgid "Choose from which log you want the statistics to be generated from." -msgstr "Tria de quin registre vols que es generin les estadístiques." +msgstr "Trieu de quin registre voleu que es generin les estadístiques." #: libraries/server_status_monitor.lib.php:88 msgid "Results are grouped by query text." @@ -12823,7 +12822,7 @@ msgstr "Començar monitorització" #: libraries/server_status_monitor.lib.php:259 msgid "Instructions/Setup" -msgstr "Instruccions/configuració" +msgstr "Instruccions/preparació" #: libraries/server_status_monitor.lib.php:262 msgid "Done dragging (rearranging) charts" @@ -12863,8 +12862,8 @@ msgid "" "Note: Enabling the auto refresh here might cause heavy traffic between the " "web server and the MySQL server." msgstr "" -"Nota: Activant el refresc automàtic aqui pot provocar elevat tràfic entre el " -"servidor web i el de MySQL." +"Nota: L'habilitació aquí del refresc automàtic, pot provocar un trànsit " +"elevat entre el servidor web i el servidor MySQL." #: libraries/server_status_processes.lib.php:68 msgid "ID" @@ -12915,7 +12914,7 @@ msgstr "#" #: libraries/server_status_variables.lib.php:42 templates/filter.phtml:4 msgid "Containing the word:" -msgstr "Incloent la paraula:" +msgstr "Que continguin la paraula:" #: libraries/server_status_variables.lib.php:50 msgid "Show only alert values" @@ -13147,7 +13146,7 @@ msgstr "" #: libraries/server_status_variables.lib.php:456 msgid "Total size of buffer pool, in pages." -msgstr "Tamany total de la memòria cau, en pàgines." +msgstr "Mida total de la memòria cau, en pàgines." #: libraries/server_status_variables.lib.php:459 msgid "" @@ -13513,9 +13512,9 @@ msgid "" "The number of joins without keys that check for key usage after each row. " "(If this is not 0, you should carefully check the indexes of your tables.)" msgstr "" -"El nombre de joins sense claus que comproven per l'ús de claus després de " -"cada fila. (Si aquiest valor no és 0, s'haurien de comprovar acuradament els " -"indexs de les taules.)" +"El nombre d'unions sense claus que es comproven per a l'ús de claus després " +"de cada fila. (Si aquest valor no és 0, haureu de comprovar acuradament els " +"índexs de les vostres taules.)" #: libraries/server_status_variables.lib.php:692 msgid "" @@ -13781,12 +13780,12 @@ msgstr "Executar consulta/es SQL al servidor %s" #: libraries/sql_query_form.lib.php:156 #, php-format msgid "Run SQL query/queries on database %s" -msgstr "Executa consulta/s SQL a la Base de Dades %s" +msgstr "Executa la consulta o les consultes SQL a la base de dades %s" #: libraries/sql_query_form.lib.php:177 #, php-format msgid "Run SQL query/queries on table %s" -msgstr "Executa consulta/s SQL a la taula %s" +msgstr "Executa la consulta o les consultes SQL a la taula %s" #: libraries/sql_query_form.lib.php:247 setup/frames/index.inc.php:257 #: templates/console/display.phtml:10 @@ -13819,7 +13818,7 @@ msgstr "Mostra aquesta consulta de nou" #: libraries/sql_query_form.lib.php:362 msgid "Rollback when finished" -msgstr "Desfer (-rollback-) al acabar" +msgstr "Desfés quan hagi finalitzat" #: libraries/sql_query_form.lib.php:405 msgid "shared" @@ -14101,32 +14100,32 @@ msgstr "La configuració conté dades incorrectes per a alguns camps." #: prefs_manage.php:145 msgid "Do you want to import remaining settings?" -msgstr "Vols importar la resta de paràmetres?" +msgstr "Voleu importar la resta de paràmetres?" #: prefs_manage.php:239 prefs_manage.php:268 msgid "Saved on: @DATE@" -msgstr "Desat en: @DATE@" +msgstr "Desat el: @DATE@" #: prefs_manage.php:254 msgid "Import from file" -msgstr "Importar des de arxiu" +msgstr "Importa del fitxer" #: prefs_manage.php:262 msgid "Import from browser's storage" -msgstr "Importar des de l'emmagatzemament del navegador" +msgstr "Importa de l'emmagatzematge del navegador" #: prefs_manage.php:265 msgid "Settings will be imported from your browser's local storage." msgstr "" -"Els paràmetres s'importaran des del emmagatzemament local del teu navegador." +"Els paràmetres s'importaran de l'emmagatzematge local del vostre navegador." #: prefs_manage.php:271 msgid "You have no saved settings!" -msgstr "No has desat els paràmetres!" +msgstr "No heu desat els paràmetres!" #: prefs_manage.php:276 prefs_manage.php:361 msgid "This feature is not supported by your web browser" -msgstr "Aquesta característica no està suportada pel teu navegador" +msgstr "Aquesta característica no és compatible amb el vostre navegador" #: prefs_manage.php:282 msgid "Merge with current configuration" @@ -14138,20 +14137,21 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" -"Pots establir més paràmetres modificant l'arxiu config.inc.php, ex. by usant " -"%sSetup script%s." +"Podeu establir més paràmetres amb la modificació del fitxer config.inc.php, " +"p. ex. mitjançant %sSetup script%s." #: prefs_manage.php:332 msgid "Save as PHP file" -msgstr "Desa com a arxiu PHP" +msgstr "Desa com un fitxer PHP" #: prefs_manage.php:337 msgid "Save to browser's storage" -msgstr "Desar a l'emmagatzemament del navegador" +msgstr "Desa a l'emmagatzematge del navegador" #: prefs_manage.php:344 msgid "Settings will be saved in your browser's local storage." -msgstr "Els paràmetres es desaran al emmagatzemament local del teu navegador." +msgstr "" +"Els paràmetres es desaran a l'emmagatzematge local del vostre navegador." #: prefs_manage.php:352 msgid "Existing settings will be overwritten!" @@ -14175,8 +14175,8 @@ msgid "" "Username and hostname didn't change. If you only want to change the " "password, 'Change password' tab should be used." msgstr "" -"No es poden canviar ni el nom d'usuari ni el del servidor. Si només vols " -"canviar la contrasenya, has de fer servir la pestanya 'Canviar contrasenya'." +"No es poden canviar ni el nom d'usuari ni el del servidor. Si només voleu " +"canviar la contrasenya, heu de fer servir la pestanya 'Canviar contrasenya'." #: server_status.php:36 msgid "Not enough privilege to view server status." @@ -14886,7 +14886,7 @@ msgstr "Mostra/Amaga la llista de taules" #: templates/database/designer/side_menu.phtml:35 #: templates/database/designer/side_menu.phtml:36 msgid "View in fullscreen" -msgstr "Veure a pantalla completa" +msgstr "Mostra a pantalla completa" #: templates/database/designer/side_menu.phtml:34 msgid "Exit fullscreen" @@ -15132,8 +15132,8 @@ msgid "" "Your browser has phpMyAdmin configuration for this domain. Would you like to " "import it for current session?" msgstr "" -"El teu navegador té la configuració de phpMyAdmin per a aquest domini. Vols " -"importar-ho per a la sessió actual?" +"El vostre navegador té la configuració de phpMyAdmin per a aquest domini. " +"Voleu importar-ho per a la sessió actual?" #: templates/prefs_autoload.phtml:14 msgid "Delete settings " @@ -15201,7 +15201,7 @@ msgstr "Tria el registre binari per veure" #: templates/server/databases/create.phtml:7 #: templates/server/databases/create.phtml:27 msgid "Create database" -msgstr "Crear base de dades" +msgstr "Creació de base de dades" #: templates/server/databases/table_row.phtml:15 msgid "Jump to database" @@ -15525,7 +15525,7 @@ msgstr "Cóm utilitzar" #: templates/table/search/zoom_result_form.phtml:23 msgid "Reset zoom" -msgstr "Reinicia l'ampliació" +msgstr "Restableix el zoom" #: templates/table/secondary_tabs.phtml:14 msgid "Relation view" @@ -15570,7 +15570,7 @@ msgstr "Particions" #: templates/table/structure/display_partitions.phtml:10 msgid "No partitioning defined!" -msgstr "No s'ha definit particionat!" +msgstr "No s'ha definit cap partició!" #: templates/table/structure/display_partitions.phtml:13 msgid "Partitioned by:" @@ -15603,7 +15603,7 @@ msgstr "Editar vista" #: templates/table/structure/display_table_stats.phtml:13 msgid "Space usage" -msgstr "Utilització d'espai" +msgstr "Utilització de l'espai" #: templates/table/structure/display_table_stats.phtml:36 msgid "Effective" @@ -15648,7 +15648,7 @@ msgstr "particionat" #: templates/table/structure/row_stats_table.phtml:53 msgid "Row length" -msgstr "Tamany de fila" +msgstr "Mida de la fila" #: templates/table/structure/row_stats_table.phtml:65 msgid "Row size" @@ -16167,7 +16167,7 @@ msgstr "" #: libraries/advisory_rules.txt:188 msgid "Query cache max size" -msgstr "Tamany màxim del cau de consultes" +msgstr "Mida màxima de la memòria cau de consultes" #: libraries/advisory_rules.txt:191 msgid "" @@ -16192,7 +16192,7 @@ msgstr "La mida actual de la memòria cau de consultes: %s" #: libraries/advisory_rules.txt:195 msgid "Query cache min result size" -msgstr "Tamany minim de resultats del cau de consultes" +msgstr "Mida mínima de la memòria cau dels resultats de les consultes" #: libraries/advisory_rules.txt:198 msgid "" @@ -16491,7 +16491,7 @@ msgstr "" #: libraries/advisory_rules.txt:278 msgid "MyISAM key buffer size" -msgstr "Tamany de l'àrea de claus MyISAM" +msgstr "Mida de l'àrea de claus MyISAM" #: libraries/advisory_rules.txt:281 msgid "Key buffer is not initialized. No MyISAM indexes will be cached." @@ -16611,8 +16611,8 @@ msgid "" "Consider increasing {open_files_limit}, and check the error log when " "restarting after changing {open_files_limit}." msgstr "" -"Pensa en augmentar {open_files_limit}, i comprovar el registre d'errors en " -"reiniciar després de canviar aquesta variable." +"Considereu augmentar {open_files_limit}, i comprovar el registre d'errors " +"quan reinicieu després de canviar {open_files_limit}." #: libraries/advisory_rules.txt:321 #, php-format @@ -16873,15 +16873,15 @@ msgstr "{have_innodb} està establert a 'value'" #: libraries/advisory_rules.txt:418 msgid "InnoDB log size" -msgstr "Tamany del registre d'InnoDB" +msgstr "Mida del registre d'InnoDB" #: libraries/advisory_rules.txt:421 msgid "" "The InnoDB log file size is not an appropriate size, in relation to the " "InnoDB buffer pool." msgstr "" -"El tamany del registre d'InnoDB no és acurat, en relació a la reserva de " -"búfers InnoDB." +"La mida del registre d'InnoDB no és una mida apropiada, en relació a la " +"reserva de búfers InnoDB." #: libraries/advisory_rules.txt:422 #, php-format @@ -16956,7 +16956,7 @@ msgstr "La mida absoluta del registre InnoDB és de %s MiB" #: libraries/advisory_rules.txt:432 msgid "InnoDB buffer pool size" -msgstr "Tamany del búfer d'InnoDB" +msgstr "Mida del búfer d'InnoDB" #: libraries/advisory_rules.txt:435 msgid "Your InnoDB buffer pool is fairly small." diff --git a/po/cs.po b/po/cs.po index ea67265392..80f99d86a2 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.6-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-11-02 14:03+0100\n" -"PO-Revision-Date: 2017-10-19 08:45+0000\n" +"PO-Revision-Date: 2017-12-08 22:45+0000\n" "Last-Translator: David Kindl \n" "Language-Team: Czech \n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 2.17\n" +"X-Generator: Weblate 2.18-dev\n" #: ajax.php:16 ajax.php:33 export.php:192 schema_export.php:64 msgid "Bad type!" @@ -1526,11 +1526,9 @@ msgid "Table" msgstr "Tabulka" #: js/messages.php:300 libraries/display_export.lib.php:926 -#, fuzzy -#| msgid "Column" msgctxt "Alias" msgid "Column" -msgstr "Pole" +msgstr "Sloupec" #. l10n: A collection of available filters #: js/messages.php:303 @@ -10547,6 +10545,8 @@ msgstr "MIME" msgid "" "Update data when duplicate keys found on import (add ON DUPLICATE KEY UPDATE)" msgstr "" +"Aktualizovat data při nalezení duplicitních klíčů při importu (přidat ON " +"DUPLICATE KEY UPDATE)" #: libraries/plugins/import/ImportCsv.php:61 #: libraries/plugins/import/ImportOds.php:63 @@ -10857,7 +10857,7 @@ msgstr "" #: libraries/plugins/transformations/abs/ImageUploadTransformationsPlugin.php:87 msgid "Image preview here" -msgstr "" +msgstr "Náhled obrázku zde" #: libraries/plugins/transformations/abs/InlineTransformationsPlugin.php:35 msgid "" diff --git a/po/hu.po b/po/hu.po index 1ce97df0a8..cf39992450 100644 --- a/po/hu.po +++ b/po/hu.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.6-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-11-02 14:03+0100\n" -"PO-Revision-Date: 2017-11-29 00:03+0000\n" +"PO-Revision-Date: 2017-11-30 23:46+0000\n" "Last-Translator: Dr. Nagy Elemér Károly \n" "Language-Team: Hungarian " "\n" @@ -3128,22 +3128,16 @@ msgid "Czech-Slovak" msgstr "Csehszlovák" #: libraries/Charsets.php:341 libraries/Charsets.php:492 -#, fuzzy -#| msgid "Ukrainian" msgctxt "Collation" msgid "Ukrainian" msgstr "Ukrán" #: libraries/Charsets.php:344 libraries/Charsets.php:488 -#, fuzzy -#| msgid "Turkish" msgctxt "Collation" msgid "Turkish" msgstr "Török" #: libraries/Charsets.php:347 libraries/Charsets.php:480 -#, fuzzy -#| msgid "Swedish" msgctxt "Collation" msgid "Swedish" msgstr "Svéd" @@ -3159,8 +3153,6 @@ msgid "Unknown" msgstr "Ismeretlen" #: libraries/Charsets.php:369 -#, fuzzy -#| msgid "Bulgarian" msgctxt "Collation" msgid "Bulgarian" msgstr "Bolgár" @@ -3171,43 +3163,31 @@ msgid "Chinese" msgstr "Kínai" #: libraries/Charsets.php:379 -#, fuzzy -#| msgid "Croatian" msgctxt "Collation" msgid "Croatian" msgstr "Horvát" #: libraries/Charsets.php:383 -#, fuzzy -#| msgid "Czech" msgctxt "Collation" msgid "Czech" msgstr "Cseh" #: libraries/Charsets.php:387 -#, fuzzy -#| msgid "Danish" msgctxt "Collation" msgid "Danish" msgstr "Dán" #: libraries/Charsets.php:391 -#, fuzzy -#| msgid "English" msgctxt "Collation" msgid "English" msgstr "Angol" #: libraries/Charsets.php:395 -#, fuzzy -#| msgid "Esperanto" msgctxt "Collation" msgid "Esperanto" msgstr "Eszperantó" #: libraries/Charsets.php:399 -#, fuzzy -#| msgid "Estonian" msgctxt "Collation" msgid "Estonian" msgstr "Észt" @@ -3223,15 +3203,11 @@ msgid "German (phone book order)" msgstr "Német (telefonkönyv sorrend)" #: libraries/Charsets.php:414 -#, fuzzy -#| msgid "Hungarian" msgctxt "Collation" msgid "Hungarian" msgstr "Magyar" #: libraries/Charsets.php:418 -#, fuzzy -#| msgid "Icelandic" msgctxt "Collation" msgid "Icelandic" msgstr "Izlandi" @@ -3242,64 +3218,46 @@ msgid "Classical Latin" msgstr "Klasszikus latin" #: libraries/Charsets.php:429 -#, fuzzy -#| msgid "Latvian" msgctxt "Collation" msgid "Latvian" msgstr "Lett" #: libraries/Charsets.php:433 -#, fuzzy -#| msgid "Lithuanian" msgctxt "Collation" msgid "Lithuanian" msgstr "Litván" #: libraries/Charsets.php:441 -#, fuzzy -#| msgid "Burmese" msgctxt "Collation" msgid "Burmese" msgstr "Burmai" #: libraries/Charsets.php:444 -#, fuzzy -#| msgid "Persian" msgctxt "Collation" msgid "Persian" msgstr "Perzsa" #: libraries/Charsets.php:448 -#, fuzzy -#| msgid "Polish" msgctxt "Collation" msgid "Polish" msgstr "Lengyel" #: libraries/Charsets.php:455 -#, fuzzy -#| msgid "Romanian" msgctxt "Collation" msgid "Romanian" msgstr "Román" #: libraries/Charsets.php:459 -#, fuzzy -#| msgid "Sinhalese" msgctxt "Collation" msgid "Sinhalese" msgstr "Szingaléz" #: libraries/Charsets.php:463 -#, fuzzy -#| msgid "Slovak" msgctxt "Collation" msgid "Slovak" msgstr "Szlovák" #: libraries/Charsets.php:467 -#, fuzzy -#| msgid "Slovenian" msgctxt "Collation" msgid "Slovenian" msgstr "Szlovén" @@ -3320,15 +3278,11 @@ msgid "Vietnamese" msgstr "Vietnámi" #: libraries/Charsets.php:563 -#, fuzzy -#| msgid "case-insensitive" msgctxt "Collation variant" msgid "case-insensitive" msgstr "a kis- és nagybetű nem különbözik" #: libraries/Charsets.php:566 -#, fuzzy -#| msgid "case-sensitive" msgctxt "Collation variant" msgid "case-sensitive" msgstr "a kis- és nagybetű különbözik" diff --git a/po/nl.po b/po/nl.po index 6642ff8409..aeea777411 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.6-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-11-02 14:03+0100\n" -"PO-Revision-Date: 2017-11-29 00:03+0000\n" -"Last-Translator: Han Velthuis \n" +"PO-Revision-Date: 2017-12-01 03:24+0000\n" +"Last-Translator: dingo thirteen \n" "Language-Team: Dutch " "\n" "Language: nl\n" @@ -4274,7 +4274,7 @@ msgstr "Recente tabellen" #: libraries/RecentFavoriteTable.php:249 msgid "Recent" -msgstr "Recent" +msgstr "Recentelijk" #: libraries/RecentFavoriteTable.php:251 libraries/config/messages.inc.php:539 msgid "Favorite tables" diff --git a/po/pl.po b/po/pl.po index 1fbd2c0a54..c085defbcf 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.6-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-11-02 14:03+0100\n" -"PO-Revision-Date: 2017-11-27 07:59+0000\n" +"PO-Revision-Date: 2017-12-02 20:48+0000\n" "Last-Translator: Kozioł Marcin \n" "Language-Team: Polish " "\n" @@ -1830,7 +1830,8 @@ msgstr "Eksport" #: js/messages.php:403 msgid "No routine is exportable. Required privileges may be lacking." msgstr "" -"Nie można wyeksportować żadnej procedury. Może brakować wymaganych uprawnień." +"Nie można eksportować żadnej procedury. Wymagane uprawnienia mogą być " +"niewystarczające." #: js/messages.php:406 libraries/rte/rte_routines.lib.php:747 msgid "ENUM/SET editor" @@ -1941,15 +1942,15 @@ msgstr "Zobacz więcej" #: js/messages.php:436 msgid "Are you sure?" -msgstr "Czy jesteś pewien?" +msgstr "Jesteś pewny?" #: js/messages.php:438 msgid "" "This action may change some of the columns definition.
Are you sure you " "want to continue?" msgstr "" -"To działanie może zmienić część definicji kolumn.
Czy jesteś pewien, że " -"chcesz kontynuować?" +"Ta akcja może zmienić niektóre definicje kolumn.
Czy na pewno chcesz " +"kontynuować?" #: js/messages.php:441 msgid "Continue" @@ -2034,7 +2035,7 @@ msgstr "Zostaną wykonane następujące działania:" #: js/messages.php:470 #, php-format msgid "DROP columns %s from the table %s" -msgstr "USUŃ kolumny %s z tabeli %s" +msgstr "DROP kolumny %s z tabeli %s" #: js/messages.php:471 msgid "Create the following table" @@ -2042,7 +2043,7 @@ msgstr "Utwórz tabelę" #: js/messages.php:474 msgid "Third step of normalization (3NF)" -msgstr "Trzeci krok normalizacji (3NF)" +msgstr "Trzeci krok normalizacji (3KN)" #: js/messages.php:475 msgid "Confirm transitive dependencies" @@ -2076,11 +2077,11 @@ msgstr "Pokaż kryteria wyszukiwania" #: js/messages.php:485 msgid "Range search" -msgstr "Wyszukiwanie zakresu" +msgstr "Zakres wyszukiwania" #: js/messages.php:486 msgid "Column maximum:" -msgstr "Maksymalna kolumna:" +msgstr "Maksimum kolumny:" #: js/messages.php:487 msgid "Column minimum:" @@ -5013,8 +5014,7 @@ msgstr "Użyj tej wartości" msgid "" "The configuration storage is not ready for the central list of columns " "feature." -msgstr "" -"Konfiguracja magazynu nie jest gotowa na centralną listę funkcji kolumn." +msgstr "Pamięć konfiguracji nie jest gotowa na centralną listę funkcji kolumn." #: libraries/central_columns.lib.php:282 #, php-format @@ -10187,7 +10187,7 @@ msgstr "Kolumny dołączyć:" #: libraries/plugins/export/ExportCsv.php:72 #: libraries/plugins/import/AbstractImportCsv.php:71 msgid "Columns escaped with:" -msgstr "Kolumny uciekają z:" +msgstr "Kolumny uciekły z:" #: libraries/plugins/export/ExportCsv.php:77 #: libraries/plugins/import/AbstractImportCsv.php:78 @@ -10563,7 +10563,7 @@ msgstr "Metadane dla Bazy danych %s" #: libraries/plugins/export/ExportSql.php:1415 #: libraries/plugins/schema/pdf/PdfRelationSchema.php:603 msgid "Creation:" -msgstr "Utworzono:" +msgstr "Utworzenie:" #: libraries/plugins/export/ExportSql.php:1428 #: libraries/plugins/schema/pdf/PdfRelationSchema.php:610 @@ -15150,7 +15150,7 @@ msgstr "Rozmiar" #: templates/database/structure/table_header.phtml:105 #: templates/table/structure/row_stats_table.phtml:79 msgid "Creation" -msgstr "Utworzono" +msgstr "Utworzenie" #: templates/database/structure/table_header.phtml:116 #: templates/table/structure/row_stats_table.phtml:86 diff --git a/po/pt_BR.po b/po/pt_BR.po index 9cf80aa348..67ce9f7df0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.6-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-11-02 14:03+0100\n" -"PO-Revision-Date: 2017-11-25 02:49+0000\n" -"Last-Translator: Mauricio Bastos \n" +"PO-Revision-Date: 2017-12-19 00:41+0000\n" +"Last-Translator: Bruno Fontes \n" "Language-Team: Portuguese (Brazil) " "\n" "Language: pt_BR\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.18-dev\n" +"X-Generator: Weblate 2.18\n" #: ajax.php:16 ajax.php:33 export.php:192 schema_export.php:64 msgid "Bad type!" @@ -14500,7 +14500,7 @@ msgstr "É uma chave estrangeira." #: templates/columns_definitions/column_name.phtml:43 #, fuzzy msgid "Pick from Central Columns" -msgstr "Escolher a partir das colunas centrais" +msgstr "Escolher a partir das Colunas Centrais" #: templates/columns_definitions/column_virtuality.phtml:46 #: templates/table/structure/display_partitions.phtml:28 @@ -14630,10 +14630,10 @@ msgid "" "quote (\"'\") amongst those values, precede it with a backslash (for example " "'\\\\xyz' or 'a\\'b')." msgstr "" -"Digite os valores para as opções de transformação usando este formato: 'a', " -"100, b,'c'…
Se por acaso precisar inserir uma contrabarra (\"\\\") ou " -"aspas simples (\"'\") entre esses valores, faça-o precedendo-as com uma " -"contrabarra (por exemplo '\\\\xyz' ou 'a\\'b')." +"Por favor, digite os valores para as opções de transformação usando este " +"formato: 'a', 100, b,'c'…
Se por acaso precisar inserir uma barra " +"invertida (\"\\\") ou aspas simples (\"'\") entre esses valores, faça-o " +"precedendo-as com uma barra invertida (por exemplo '\\\\xyz' ou 'a\\'b')." #: templates/columns_definitions/table_fields_definitions.phtml:107 #: transformation_overview.php:43 diff --git a/po/sr@latin.po b/po/sr@latin.po index d39e661364..3d72baa04d 100644 --- a/po/sr@latin.po +++ b/po/sr@latin.po @@ -4,17 +4,17 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.6-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-11-02 14:03+0100\n" -"PO-Revision-Date: 2017-10-09 08:47+0000\n" -"Last-Translator: Suad Pacariz \n" -"Language-Team: Serbian (latin) \n" +"PO-Revision-Date: 2017-12-02 16:49+0000\n" +"Last-Translator: Aleksej Jovanović \n" +"Language-Team: Serbian (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" -"X-Generator: Weblate 2.17-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 2.18-dev\n" #: ajax.php:16 ajax.php:33 export.php:192 schema_export.php:64 msgid "Bad type!" @@ -334,22 +334,19 @@ msgid "Access denied!" msgstr "Pristup odbijen!" #: db_tracking.php:53 db_tracking.php:78 -#, fuzzy -#| msgid "Replication status" msgid "Tracking data deleted successfully." -msgstr "Status replikacije" +msgstr "Podaci o praćenju su uspešno izbrisani." #: db_tracking.php:62 #, php-format msgid "" "Version %1$s was created for selected tables, tracking is active for them." msgstr "" +"Verzija %1$s je kreirana za izabrane tabele, praćenje je aktivirano za njih." #: db_tracking.php:93 -#, fuzzy -#| msgid "No databases selected." msgid "No tables selected." -msgstr "Nije izabrana ni jedna baza." +msgstr "Nije izabrana ni jedna tabela." #: db_tracking.php:150 msgid "Database Log" @@ -360,24 +357,28 @@ msgid "" "An error has been detected and an error report has been automatically " "submitted based on your settings." msgstr "" +"Otkrivena je greška i izveštaj o grešci je automatski podnet na osnovu vaših " +"podešavanja." #: error_report.php:72 msgid "Thank you for submitting this report." -msgstr "" +msgstr "Hvala vam što ste poslali ovaj izveštaj." #: error_report.php:76 msgid "" "An error has been detected and an error report has been generated but failed " "to be sent." msgstr "" +"Otkrivena je greška i generisan je izveštaj o grešci, ali nije se uspeo da " +"se pošalje." #: error_report.php:81 msgid "If you experience any problems please submit a bug report manually." -msgstr "" +msgstr "Ako imate bilo kakvih problema, ručno podnesite izveštaj o greškama." #: error_report.php:85 msgid "You may want to refresh the page." -msgstr "" +msgstr "Možda ćete želeti da osvežite stranicu." #: export.php:275 msgid "Bad parameters!" @@ -395,22 +396,17 @@ msgstr "Iskoristi OpenStreetMaps kao osnovni sloj" #. l10n: Spatial Reference System Identifier #: gis_data_editor.php:169 -#, fuzzy -#| msgid "SRID" msgid "SRID:" -msgstr "SRID" +msgstr "SRID:" #: gis_data_editor.php:195 -#, fuzzy, php-format -#| msgid "Geometry" +#, php-format msgid "Geometry %d:" -msgstr "Geometrija" +msgstr "Geometrija %d:" #: gis_data_editor.php:217 -#, fuzzy -#| msgid "Point" msgid "Point:" -msgstr "Tačka" +msgstr "Tačka:" #: gis_data_editor.php:218 gis_data_editor.php:245 gis_data_editor.php:301 #: gis_data_editor.php:374 js/messages.php:519 @@ -434,22 +430,18 @@ msgid "Add a point" msgstr "Dodaj tačku" #: gis_data_editor.php:273 -#, fuzzy, php-format -#| msgid "Linestring" +#, php-format msgid "Linestring %d:" -msgstr "Linija teksta" +msgstr "Linija teksta %d:" #: gis_data_editor.php:276 gis_data_editor.php:353 -#, fuzzy -#| msgid "Outer Ring" msgid "Outer ring:" -msgstr "Spoljni prsten" +msgstr "Spoljni prsten:" #: gis_data_editor.php:278 gis_data_editor.php:355 -#, fuzzy, php-format -#| msgid "Inner Ring" +#, php-format msgid "Inner ring %d:" -msgstr "Unutrašnji prsten" +msgstr "Unutrašnji prsten %d:" #: gis_data_editor.php:315 msgid "Add a linestring" @@ -460,10 +452,9 @@ msgid "Add an inner ring" msgstr "Dodaj unutrašnji prsten" #: gis_data_editor.php:337 -#, fuzzy, php-format -#| msgid "Polygon" +#, php-format msgid "Polygon %d:" -msgstr "Poligon" +msgstr "Poligon %d:" #: gis_data_editor.php:401 msgid "Add a polygon" @@ -518,16 +509,12 @@ msgid "Output" msgstr "Izlaz" #: gis_data_editor.php:419 -#, fuzzy -#| msgid "" -#| "Choose \"GeomFromText\" from the \"Function\" column and paste the string " -#| "below into the \"Value\" field" msgid "" "Choose \"GeomFromText\" from the \"Function\" column and paste the string " "below into the \"Value\" field." msgstr "" -"Izaberi \"GeomFromText\" iz \"Funkcija\" kolone i nalepi ispod teksta u " -"\"Vrednost\" polju" +"Izaberi \"GeomFromText\" iz \"Funkcija\" kolone i nalepi ispod teksta u \"" +"Vrednost\" polju." #: import.php:65 #, fuzzy @@ -537,19 +524,14 @@ msgstr "Pristup odbijen!" #: import.php:69 js/messages.php:615 msgid "Failed" -msgstr "" +msgstr "Greška" #: import.php:73 -#, fuzzy -#| msgid "complete inserts" msgid "Incomplete params" -msgstr "Kompletan INSERT" +msgstr "Nepotpun parametar" #: import.php:197 -#, fuzzy, php-format -#| msgid "" -#| "You probably tried to upload too large file. Please refer to " -#| "%sdocumentation%s for ways to workaround this limit." +#, php-format msgid "" "You probably tried to upload a file that is too large. Please refer to " "%sdocumentation%s for a workaround for this limit." @@ -580,10 +562,9 @@ msgid "Could not load import plugins, please check your installation!" msgstr "Ne mogu da učitam dodatke za uvoz, molim proverite svoju instalaciju!" #: import.php:571 libraries/sql.lib.php:788 libraries/sql.lib.php:1567 -#, fuzzy, php-format -#| msgid "Bookmark %s created" +#, php-format msgid "Bookmark %s has been created." -msgstr "Napravljen marker %s" +msgstr "Napravljen marker %s." #: import.php:581 #, fuzzy, php-format @@ -621,7 +602,7 @@ msgstr "\"DROP DATABASE\" komanda je onemogućena." #: import_status.php:105 msgid "Could not load the progress of the import." -msgstr "" +msgstr "Nije moguće učitati napredak uvoza." #: import_status.php:114 js/messages.php:459 js/messages.php:623 #: libraries/Util.php:689 libraries/export.lib.php:518 @@ -634,12 +615,12 @@ msgid "" "You were logged out from one server, to logout completely from phpMyAdmin, " "you need to logout from all servers." msgstr "" +"Bili ste odjavljeni sa jednog servera, da biste se potpuno odjavili iz " +"phpMyAdmin-a, morate odjaviti sa svih servera." #: index.php:160 libraries/Footer.php:69 -#, fuzzy -#| msgid "phpMyAdmin homepage" msgid "phpMyAdmin Demo Server" -msgstr "phpMyAdmin početna stranica" +msgstr "phpMyAdmin Demo Server" #: index.php:164 #, php-format @@ -648,10 +629,11 @@ msgid "" "change root, debian-sys-maint and pma users. More information is available " "at %s." msgstr "" +"Koristite demo server. Ovde možete uraditi bilo šta, ali molim vas nemojte " +"menjati root, debian-sys-maint i pma korisnike. Više informacija je dostupno " +"na %s." #: index.php:174 -#, fuzzy -#| msgid "General Settings" msgid "General settings" msgstr "Opšta podešavanja" @@ -666,10 +648,8 @@ msgid "Server connection collation" msgstr "Način poređenja kod veze na server" #: index.php:242 -#, fuzzy -#| msgid "Change settings" msgid "Appearance settings" -msgstr "Izmeni podešavanja" +msgstr "Postavke izgleda" #: index.php:275 prefs_manage.php:294 msgid "More settings" @@ -684,68 +664,50 @@ msgid "Server:" msgstr "Server:" #: index.php:304 -#, fuzzy -#| msgid "Server port" msgid "Server type:" -msgstr "Port na serveru" +msgstr "Tip servera:" #: index.php:308 libraries/plugins/export/ExportLatex.php:220 #: libraries/plugins/export/ExportSql.php:701 #: libraries/plugins/export/ExportXml.php:242 -#, fuzzy -#| msgid "Server version" msgid "Server version:" -msgstr "Verzija servera" +msgstr "Verzija servera:" #: index.php:314 -#, fuzzy -#| msgid "Protocol version" msgid "Protocol version:" -msgstr "Verzija protokola" +msgstr "Verzija protokola:" #: index.php:318 -#, fuzzy -#| msgid "User" msgid "User:" -msgstr "Korisnik" +msgstr "Korisnik:" #: index.php:323 -#, fuzzy -#| msgid "Server charset" msgid "Server charset:" -msgstr "Server skup znakova" +msgstr "Server skup znakova:" #: index.php:336 msgid "Web server" -msgstr "" +msgstr "Veb server" #: index.php:347 -#, fuzzy -#| msgid "Database client version" msgid "Database client version:" -msgstr "Verzija klijenta baze" +msgstr "Verzija klijenta baze:" #: index.php:351 -#, fuzzy -#| msgid "PHP extension" msgid "PHP extension:" -msgstr "PHP proširenje" +msgstr "PHP ekstenzija:" #: index.php:365 -#, fuzzy -#| msgid "PHP Version" msgid "PHP version:" -msgstr "verzija PHP-a" +msgstr "Verzija PHP-a:" #: index.php:376 msgid "Show PHP information" msgstr "Prikaži informacije o PHP-u" #: index.php:395 -#, fuzzy -#| msgid "Version information" msgid "Version information:" -msgstr "Informacije o verziji" +msgstr "Informacije o verziji:" #: index.php:404 libraries/Sanitize.php:189 libraries/Util.php:336 #: libraries/Util.php:403 libraries/config/FormDisplay.tpl.php:165 @@ -765,7 +727,7 @@ msgstr "Doprinesi" #: index.php:427 msgid "Get support" -msgstr "" +msgstr "Dobijte podršku" #: index.php:434 msgid "List of changes" @@ -773,7 +735,7 @@ msgstr "Lista izmena" #: index.php:441 templates/server/plugins/section.phtml:12 msgid "License" -msgstr "" +msgstr "Licensa" #: index.php:461 msgid "" @@ -790,6 +752,9 @@ msgid "" "The curl extension was not found and allow_url_fopen is disabled. Due to " "this some features such as error reporting or version check are disabled." msgstr "" +"Dodatak curl nije pronađen i allow_url_fopen je onemogućen. Zbog toga, neke " +"mogućnosti kao što su izvještaji o greškama ili provera verzije su " +"onemogućeni." #: index.php:491 msgid "" diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 35d85d4eb5..cdd52b471f 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -407,8 +407,15 @@ if [ $do_tag -eq 1 ] ; then echo "* Tagging release as $tagname" git tag -s -a -m "Released $version" $tagname $branch echo " Dont forget to push tags using: git push --tags" + echo "* Cleanup of $branch" + # Remove composer.lock, but we need to create fresh worktree for that + git worktree add --force $workdir $branch + cd $workdir git rm --force composer.lock git commit -s -m "Removing composer.lock" + cd ../.. + rm -rf $workdir + git worktree prune fi # Mark as stable release diff --git a/test/classes/AdvisorTest.php b/test/classes/AdvisorTest.php index caed353d2e..af5a7d16c4 100644 --- a/test/classes/AdvisorTest.php +++ b/test/classes/AdvisorTest.php @@ -171,7 +171,7 @@ class AdvisorTest extends PMATestCase 'name' => 'Variable', 'issue' => 'issue', 'recommendation' => 'Recommend status_var' + 'filter=status_var&lang=en&token=token">status_var' ), null, ), diff --git a/test/classes/DbSearchTest.php b/test/classes/DbSearchTest.php index 0cca012cb4..44758733a0 100644 --- a/test/classes/DbSearchTest.php +++ b/test/classes/DbSearchTest.php @@ -167,13 +167,13 @@ class DbSearchTest extends PMATestCase . 'href="sql.php?db=pma&table' . '=table1&goto=db_sql.php&pos=0&is_js_confirmed=0&' . 'server=0&lang=en&' - . 'collation_connection=utf-8" ' + . 'collation_connection=utf-8&token=token" ' . 'data-browse-sql="column1" data-table-name="table1" ' . '>Browse' . 'Delete' diff --git a/test/classes/DisplayResultsTest.php b/test/classes/DisplayResultsTest.php index 1704423b4a..ce6b6a7bd4 100644 --- a/test/classes/DisplayResultsTest.php +++ b/test/classes/DisplayResultsTest.php @@ -372,6 +372,7 @@ class DisplayResultsTest extends PMATestCase array('`new`.`id`' => '= 1'), '[%_PMA_CHECKBOX_DIR_%]', 'klass', + ' Edit', '`customer`.`id` = 1', '%60customer%60.%60id%60+%3D+1', - '' - . '' - . ' Edit' - . '' + ' +Edit Edit +' ) ); } @@ -496,16 +490,9 @@ class DisplayResultsTest extends PMATestCase '`customer`.`id` = 1', '%60customer%60.%60id%60+%3D+1', 'klass', - '' - . ' Copy' - . '' + ' +Copy Copy +' ) ); } @@ -560,18 +547,9 @@ class DisplayResultsTest extends PMATestCase . 'alt="Delete" class="icon ic_b_drop" /> Delete', 'DELETE FROM `Data`.`customer` WHERE `customer`.`id` = 1', 'klass', - '' - . 'Delete ' - . 'Delete' - . '
DELETE FROM `Data`.`customer` WHERE ' - . '`customer`.`id` = 1
' + ' +Delete Delete +
DELETE FROM `Data`.`customer` WHERE `customer`.`id` = 1
' ) ); } @@ -651,40 +629,14 @@ class DisplayResultsTest extends PMATestCase ' Delete', 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1', - ' ' - . '' - . ' Edit' - . '' - . 'Copy Copy' - . '' - . 'Delete ' - . 'Delete' - . '
DELETE FROM `data`.`new` WHERE `new`.`id` = 1' - . '
' + ' +Edit Edit + +Copy Copy + +Delete Delete +
DELETE FROM `data`.`new` WHERE `new`.`id` = 1
' + ), array( PMA\libraries\DisplayResults::POSITION_RIGHT, @@ -723,38 +675,13 @@ class DisplayResultsTest extends PMATestCase ' Delete', 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1', - '' - . 'Delete Delete' - . '
DELETE FROM `data`.`new` WHERE `new`.' - . '`id` = 1
' - . 'Copy Copy' - . '' - . '' - . 'Edit Edit' - . ' ' + ' +Delete Delete +
DELETE FROM `data`.`new` WHERE `new`.`id` = 1
+Copy Copy + +Edit Edit + ' ), array( PMA\libraries\DisplayResults::POSITION_NONE, @@ -962,7 +889,7 @@ class DisplayResultsTest extends PMATestCase 'routine_name', 'db_routines.php?item_name=circumference&db=data' . '&item_type=FUNCTION&server=0&lang=en' - . '&collation_connection=utf-8' + . '&collation_connection=utf-8&token=token' ), array( 'information_schema', @@ -976,7 +903,7 @@ class DisplayResultsTest extends PMATestCase 'routine_name', 'db_routines.php?item_name=area&db=data' . '&item_type=PROCEDURE&server=0&lang=en' - . '&collation_connection=utf-8' + . '&collation_connection=utf-8&token=token' ), array( 'information_schema', @@ -990,7 +917,7 @@ class DisplayResultsTest extends PMATestCase 'index.php?sql_query=SELECT+%60CHARACTER_SET_NAME%60+FROM+%60info' . 'rmation_schema%60.%60CHARACTER_SETS%60&db=information_schema' . '&test_name=value&server=0&lang=en' - . '&collation_connection=utf-8' + . '&collation_connection=utf-8&token=token' ) ); } @@ -1319,7 +1246,7 @@ class DisplayResultsTest extends PMATestCase $url_params, null, '1001' ), array( @@ -1334,7 +1261,7 @@ class DisplayResultsTest extends PMATestCase $url_params, null, '0x123456' ), array( @@ -1349,7 +1276,7 @@ class DisplayResultsTest extends PMATestCase $url_params, null, '[BLOB - 4 B]' ), array( @@ -1472,7 +1399,7 @@ class DisplayResultsTest extends PMATestCase 'binary', '[BLOB - 4 B]' ), diff --git a/test/classes/FooterTest.php b/test/classes/FooterTest.php index 43efe51fde..57db70f663 100644 --- a/test/classes/FooterTest.php +++ b/test/classes/FooterTest.php @@ -157,7 +157,7 @@ class FooterTest extends PMATestCase $this->assertEquals( '', $this->_callPrivateFunction( '_getSelfLink', @@ -182,7 +182,7 @@ class FooterTest extends PMATestCase $this->assertEquals( '', diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php index 590bccd0f7..07d98e4296 100644 --- a/test/classes/ThemeTest.php +++ b/test/classes/ThemeTest.php @@ -292,7 +292,7 @@ class ThemeTest extends PMATestCase $this->object->getPrintPreview(), '

(0.0.0.0)

No preview available.[ take it ]' . '

' ); diff --git a/test/classes/URLTest.php b/test/classes/URLTest.php index d11477e75e..e53af360b4 100644 --- a/test/classes/URLTest.php +++ b/test/classes/URLTest.php @@ -45,6 +45,7 @@ class URLTest extends PHPUnit_Framework_TestCase $expected = 'server=x' . htmlentities($separator) . 'lang=en' . htmlentities($separator) . 'collation_connection=x' + . htmlentities($separator) . 'token=token' ; $expected = '?db=db' @@ -68,6 +69,7 @@ class URLTest extends PHPUnit_Framework_TestCase $expected = 'server=x' . htmlentities($separator) . 'lang=en' . htmlentities($separator) . 'collation_connection=x' + . htmlentities($separator) . 'token=token' ; $expected = '?db=db' @@ -92,6 +94,7 @@ class URLTest extends PHPUnit_Framework_TestCase $expected = 'server=x' . $separator . 'lang=en' . $separator . 'collation_connection=x' + . $separator . 'token=token' ; $expected = '#ABC#db=db' . $separator . 'table=table' . $separator @@ -119,6 +122,7 @@ class URLTest extends PHPUnit_Framework_TestCase $expected = '?server=x' . htmlentities($separator) . 'lang=en' . htmlentities($separator) . 'collation_connection=x' + . htmlentities($separator) . 'token=token' ; $this->assertEquals($expected, URL::getCommon()); } diff --git a/test/classes/config/PageSettingsTest.php b/test/classes/config/PageSettingsTest.php index 9f6f67eb07..28f1ba51f5 100644 --- a/test/classes/config/PageSettingsTest.php +++ b/test/classes/config/PageSettingsTest.php @@ -57,7 +57,7 @@ class PageSettingsTest extends PMATestCase '
' . '
' . '
', $html ); diff --git a/test/classes/navigation/NavigationTest.php b/test/classes/navigation/NavigationTest.php index 1bc71f912f..4c34b72fb7 100644 --- a/test/classes/navigation/NavigationTest.php +++ b/test/classes/navigation/NavigationTest.php @@ -156,7 +156,7 @@ class NavigationTest extends PMATestCase $this->assertContains( '', $html ); diff --git a/test/classes/navigation/NodeDatabaseChildTest.php b/test/classes/navigation/NodeDatabaseChildTest.php index 90daff01d1..8011f55e9c 100644 --- a/test/classes/navigation/NodeDatabaseChildTest.php +++ b/test/classes/navigation/NodeDatabaseChildTest.php @@ -83,7 +83,7 @@ class NodeDatabaseChildTest extends PMATestCase $this->assertContains( '', + . '&dbName=parent&lang=en&token=token" class="hideNavItem ajax">', $html ); } diff --git a/test/classes/plugin/auth/AuthenticationConfigTest.php b/test/classes/plugin/auth/AuthenticationConfigTest.php index 9679f4c92d..6235c4f634 100644 --- a/test/classes/plugin/auth/AuthenticationConfigTest.php +++ b/test/classes/plugin/auth/AuthenticationConfigTest.php @@ -138,7 +138,7 @@ class AuthenticationConfigTest extends PMATestCase $this->assertContains( 'Retry to connect', $html ); diff --git a/test/classes/plugin/auth/AuthenticationCookieTest.php b/test/classes/plugin/auth/AuthenticationCookieTest.php index 224a9e98a6..3340d17560 100644 --- a/test/classes/plugin/auth/AuthenticationCookieTest.php +++ b/test/classes/plugin/auth/AuthenticationCookieTest.php @@ -372,7 +372,7 @@ class AuthenticationCookieTest extends PMATestCase $_COOKIE['pmaAuth-2'] = ''; - $this->mockResponse('Location: /phpmyadmin/index.php?server=2&lang=en&collation_connection=utf-8'); + $this->mockResponse('Location: /phpmyadmin/index.php?server=2&lang=en&collation_connection=utf-8&token=token'); $this->object->logOut(); } diff --git a/test/libraries/PMA_Form_Processing_test.php b/test/libraries/PMA_Form_Processing_test.php index 09f044efbf..bef39ffd86 100644 --- a/test/libraries/PMA_Form_Processing_test.php +++ b/test/libraries/PMA_Form_Processing_test.php @@ -39,7 +39,7 @@ class PMA_Form_Processing_Test extends PMATestCase { $this->mockResponse( array('HTTP/1.1 303 See Other'), - array('Location: index.php?lang=en') + array('Location: index.php?lang=en&token=token') ); // case 1 diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php index d68adf98ed..541d2aa6c5 100644 --- a/test/libraries/PMA_insert_edit_test.php +++ b/test/libraries/PMA_insert_edit_test.php @@ -293,7 +293,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $this->assertEquals( ' : ' + . 'DataEditView=1&goto=sql.php&lang=en&token=token">' . 'Function', $result ); @@ -303,7 +303,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'Function', $result ); @@ -313,7 +313,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $this->assertEquals( ' : ' + . 'DataEditView=1&goto=sql.php&lang=en&token=token">' . 'Type', $result ); @@ -323,7 +323,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'Type', $result ); @@ -746,7 +746,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $this->assertContains( '', + . '&data=abc&server=1&lang=en&token=token">', $result ); @@ -1977,7 +1977,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase { $GLOBALS['cfg']['ServerDefault'] = 1; $this->assertEquals( - 'tbl_change.php?lang=en', + 'tbl_change.php?lang=en&token=token', PMA_getErrorUrl(array()) ); @@ -2278,7 +2278,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'b<', + . '+%60f%60%3D1&lang=en&token=token" title="a>">b<', $result ); @@ -2288,7 +2288,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase $this->assertEquals( 'a>', + . '+%60f%60%3D1&lang=en&token=token" title="b<">a>', $result ); } diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php index b1776c84e8..ba3c9544d2 100644 --- a/test/libraries/PMA_server_privileges_test.php +++ b/test/libraries/PMA_server_privileges_test.php @@ -2427,13 +2427,13 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase $this->assertContains( '-', + . 'collation_connection&token=token">-', $actual ); $this->assertContains( '"', + . 'collation_connection&token=token">"', $actual ); $this->assertContains('Show all', $actual); diff --git a/test/libraries/PMA_user_preferences_test.php b/test/libraries/PMA_user_preferences_test.php index 535fabaebf..48cd98bc60 100644 --- a/test/libraries/PMA_user_preferences_test.php +++ b/test/libraries/PMA_user_preferences_test.php @@ -368,7 +368,7 @@ class PMA_User_Preferences_Test extends PMATestCase { $GLOBALS['lang'] = ''; - $this->mockResponse('Location: /phpmyadmin/file.html?a=b&saved=1&server=0#h+ash'); + $this->mockResponse('Location: /phpmyadmin/file.html?a=b&saved=1&server=0&token=token#h+ash'); $GLOBALS['PMA_Config']->set('PmaAbsoluteUri', ''); $GLOBALS['PMA_Config']->set('PMA_IS_IIS', false); diff --git a/test/libraries/common/PMA_formatNumberByteDown_test.php b/test/libraries/common/PMA_formatNumberByteDown_test.php index 81e00f0d0a..0db54ffcb2 100644 --- a/test/libraries/common/PMA_formatNumberByteDown_test.php +++ b/test/libraries/common/PMA_formatNumberByteDown_test.php @@ -10,6 +10,7 @@ /* * Include to test. */ +use PhpMyAdmin\MoTranslator\Loader; /** @@ -71,6 +72,7 @@ class PMA_FormatNumberByteDown_Test extends PHPUnit_Framework_TestCase array(-0.003, 6, 0, '-3,000 µ'), array(100.98, 0, 2, '100.98'), array(21010101, 0, 2, '21,010,101.00'), + array(1100000000, 5, 0, '1,100 M'), array(20000, 2, 2, '20 k'), array(20011, 2, 2, '20.01 k'), array(123456789, 6, 0, '123,457 k'), @@ -118,17 +120,41 @@ class PMA_FormatNumberByteDown_Test extends PHPUnit_Framework_TestCase // Test with various precisions $old_precision = ini_get('precision'); - ini_set('precision', 20); - $this->assertFormatNumber($a, $b, $c, $d); - ini_set('precision', 14); - $this->assertFormatNumber($a, $b, $c, $d); - ini_set('precision', 10); - $this->assertFormatNumber($a, $b, $c, $d); - ini_set('precision', 5); - $this->assertFormatNumber($a, $b, $c, $d); - ini_set('precision', -1); - $this->assertFormatNumber($a, $b, $c, $d); - ini_set('precision', $old_precision); + try { + ini_set('precision', 20); + $this->assertFormatNumber($a, $b, $c, $d); + ini_set('precision', 14); + $this->assertFormatNumber($a, $b, $c, $d); + ini_set('precision', 10); + $this->assertFormatNumber($a, $b, $c, $d); + ini_set('precision', 5); + $this->assertFormatNumber($a, $b, $c, $d); + ini_set('precision', -1); + $this->assertFormatNumber($a, $b, $c, $d); + } finally { + ini_set('precision', $old_precision); + } + + // Test with different translations + $translator = Loader::getInstance()->getTranslator(); + + try { + // German + $translator->setTranslation(',', '.'); + $translator->setTranslation('.', ','); + $expected = str_replace([',', 'X'], ['.', ','], str_replace('.', 'X', $d)); + $this->assertFormatNumber($a, $b, $c, $expected); + + // Czech + $translator->setTranslation(',', ' '); + $translator->setTranslation('.', ','); + $expected = str_replace([',', 'X'], [' ', ','], str_replace('.', 'X', $d)); + $this->assertFormatNumber($a, $b, $c, $expected); + } finally { + // Restore + $translator->setTranslation(',', ','); + $translator->setTranslation('.', '.'); + } } /** diff --git a/test/libraries/common/PMA_getDbLink_test.php b/test/libraries/common/PMA_getDbLink_test.php index d123eadd50..9c56febd81 100644 --- a/test/libraries/common/PMA_getDbLink_test.php +++ b/test/libraries/common/PMA_getDbLink_test.php @@ -58,7 +58,7 @@ class PMA_GetDbLink_Test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['DefaultTabDatabase'], 'database' ) . '?db=' . $database - . '&server=99&lang=en" ' + . '&server=99&lang=en&token=token" ' . 'title="Jump to database "' . htmlspecialchars($database) . '".">' . htmlspecialchars($database) . '', @@ -80,7 +80,7 @@ class PMA_GetDbLink_Test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['DefaultTabDatabase'], 'database' ) . '?db=' . $database - . '&server=99&lang=en" title="Jump to database "' + . '&server=99&lang=en&token=token" title="Jump to database "' . htmlspecialchars($database) . '".">' . htmlspecialchars($database) . '', PMA\libraries\Util::getDbLink($database) @@ -103,7 +103,7 @@ class PMA_GetDbLink_Test extends PHPUnit_Framework_TestCase ) . '?db=' . htmlspecialchars(urlencode($database)) - . '&server=99&lang=en" title="Jump to database "' + . '&server=99&lang=en&token=token" title="Jump to database "' . htmlspecialchars($database) . '".">' . htmlspecialchars($database) . '', PMA\libraries\Util::getDbLink($database)