Merge branch 'master' into enh_1

This commit is contained in:
Lakshay arora 2018-08-06 17:39:48 +05:30 committed by GitHub
commit 75af21cff6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
171 changed files with 5815 additions and 12247 deletions

View File

@ -8,6 +8,8 @@ phpMyAdmin - ChangeLog
- issue #12373 Add Metro theme
- issue #14155 Add move columns preview SQL button
- issue #14296 Enable strict mode in PHP files
- issue #13627 Increase field width for editing varchar fields
- issue #12603 Show warning for users with the default values for controluser and controlpass
4.8.3 (not yet released)
- issue #14314 Error when naming a database '0'
@ -19,6 +21,10 @@ phpMyAdmin - ChangeLog
- issue #14171 2FA configuration fails if PHP doesn't have GD support
- issue #14390 Can't unhide tables
- issue #14382 "Visualize GIS data" icon missing
- issue #14435 Event scheduler status toggle doesn't work
- issue #14365 View not working on multiple servers
- issue #14207 Partition actions in table structure do not work
- issue #14375 Fixes ERR_BLOCKED_BY_XSS_AUDITOR on export table
4.8.2 (2018-06-21)
- issue #14370 WHERE 0 causes Fatal error

View File

@ -55,7 +55,8 @@
"twig/extensions": "~1.5.1",
"symfony/expression-language": "^3.2",
"symfony/polyfill-mbstring": "^1.3",
"symfony/polyfill-ctype": "^1.8"
"symfony/polyfill-ctype": "^1.8",
"williamdes/mariadb-mysql-kbs": "^1.2"
},
"conflict": {
"phpseclib/phpseclib": "2.0.8",

View File

@ -463,20 +463,22 @@ Yes. This procedure was tested with phpMyAdmin 2.6.1, PHP 4.3.9 in
.. _faq1_34:
1.34 Can I access directly to database or table pages?
------------------------------------------------------
1.34 Can I directly access a database or table pages?
-----------------------------------------------------
Yes. Out of the box, you can use :term:`URL` like
Yes. Out of the box, you can use a :term:`URL` like
``http://server/phpMyAdmin/index.php?server=X&db=database&table=table&target=script``.
For ``server`` you use the server number
which refers to the order of the server paragraph in
:file:`config.inc.php`. Table and script parts are optional. If you want
``http://server/phpMyAdmin/database[/table][/script]`` :term:`URL`, you need to do some configuration. Following
lines apply only for `Apache <https://httpd.apache.org>`_ web server.
First make sure, that you have enabled some features within global
For ``server`` you can use the server number
which refers to the numeric host index (from ``$i``) in
:file:`config.inc.php`. The table and script parts are optional.
If you want a URL like
``http://server/phpMyAdmin/database[/table][/script]``, you need to do some additional configuration. The following
lines apply only for the `Apache <https://httpd.apache.org>`_ web server.
First, make sure that you have enabled some features within the Apache global
configuration. You need ``Options SymLinksIfOwnerMatch`` and ``AllowOverride
FileInfo`` enabled for directory where phpMyAdmin is installed and you
need mod\_rewrite to be enabled. Then you just need to create
need mod\_rewrite to be enabled. Then you just need to create the
following :term:`.htaccess` file in root folder of phpMyAdmin installation (don't
forget to change directory name inside of it):
@ -489,6 +491,8 @@ forget to change directory name inside of it):
RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)$ index.php?db=$1&table=$2 [R]
RewriteRule ^([a-zA-Z0-9_]+)$ index.php?db=$1 [R]
.. seealso:: :ref:`faq4_8`
.. _faq1_35:
1.35 Can I use HTTP authentication with Apache CGI?
@ -1169,19 +1173,21 @@ name is defined in the config file.
4.8 Which parameters can I use in the URL that starts phpMyAdmin?
-----------------------------------------------------------------
When starting phpMyAdmin, you can use the ``db``, ``pma_username``,
``pma_password`` and ``server`` parameters. This last one can contain
When accessing phpMyAdmin, you can use the ``db``, ``pma_username``,
``pma_password`` and ``server`` :term:`URL` parameters. The "server" parameter can contain
either the numeric host index (from ``$i`` of the configuration file)
or one of the host names present in the configuration file. Using
``pma_username`` and ``pma_password`` has been tested along with the
usage of 'cookie' ``auth_type``.
``pma_username`` and ``pma_password`` has been tested with the
'cookie' ``auth_type``.
For example direct login URL can be constructed as
For example, a direct login URL can be constructed as
``https://example.com/phpmyadmin/?pma_username=user&pma_password=password``.
.. seealso:: :ref:`faq1_34`
.. warning::
Passing password and username in URL is insecure and should not be used in
Passing a password and username in URL is potentially insecure and should not be used in
production environments.
.. _faqbrowsers:

View File

@ -552,6 +552,20 @@ if ($GLOBALS['cfg']['LoginCookieStore'] != 0
);
}
/**
* Warning if using the default MySQL controluser account
*/
if ($server != 0
&& isset($GLOBALS['cfg']['Server']['controluser']) && $GLOBALS['cfg']['Server']['controluser'] == 'pma'
&& isset($GLOBALS['cfg']['Server']['controlpass']) && $GLOBALS['cfg']['Server']['controlpass'] == 'pmapass'
) {
trigger_error(
__('Your server is running with default values for the controluser and password (controlpass) and is open to intrusion; you really should fix this security weakness by changing the password for controluser \'pma\'.'),
E_USER_WARNING
);
}
/**
* Check if user does not have defined blowfish secret and it is being used.
*/

View File

@ -4045,8 +4045,8 @@ var toggleButton = function ($obj) {
addClass = 'on';
}
var params = { 'ajax_request': true };
$.post(url, params, function (data) {
var parts = url.split('?');
$.post(parts[0], parts[1] + '&ajax_request=true', function (data) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxRemoveMessage($msg);
$container
@ -4559,7 +4559,8 @@ function PMA_createViewDialog ($this) {
var $msg = PMA_ajaxShowMessage();
var syntaxHighlighter = null;
var sep = PMA_commonParams.get('arg_separator');
$.get($this.attr('href') + sep + 'ajax_request=1' + sep + 'ajax_dialog=1', function (data) {
params = $this.getPostData();
$.get($this.attr('href') + sep + 'ajax_request=1' + sep + 'ajax_dialog=1' + sep + params, function (data) {
if (typeof data !== 'undefined' && data.success === true) {
PMA_ajaxRemoveMessage($msg);
var buttonOptions = {};

View File

@ -424,10 +424,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
var $link = $(this);
function submitPartitionAction (url) {
var params = {
'ajax_request' : true,
'ajax_page_request' : true
};
var params = 'ajax_request=true&ajax_page_request=true&' + $link.getPostData();
PMA_ajaxShowMessage();
AJAX.source = $link;
$.post(url, params, AJAX.responseHandler);

View File

@ -377,7 +377,7 @@ class Bookmark
$query .= ")";
}
$query .= " AND " . Util::backquote($id_field)
. " = " . $dbi->escapeString($id) . " LIMIT 1";
. " = " . $dbi->escapeString((string) $id) . " LIMIT 1";
$result = $dbi->fetchSingleRow($query, 'ASSOC', DatabaseInterface::CONNECT_CONTROL);
if (! empty($result)) {

View File

@ -1078,6 +1078,33 @@ class CentralColumns
return -1;
}
/**
* build dropdown select html to select column in selected table,
* include only columns which are not already in central list
*
* @param string $db current database to which selected table belongs
* @param string $selected_tbl selected table
*
* @return string html to select column
*/
public function getHtmlForColumnDropdown($db, $selected_tbl)
{
$existing_cols = $this->getFromTable($db, $selected_tbl);
$this->dbi->selectDb($db);
$columns = (array) $this->dbi->getColumnNames(
$db, $selected_tbl
);
$selectColHtml = "";
foreach ($columns as $column) {
if (!in_array($column, $existing_cols)) {
$selectColHtml .= '<option value="' . htmlspecialchars($column) . '">'
. htmlspecialchars($column)
. '</option>';
}
}
return $selectColHtml;
}
/**
* build html for adding a new user defined column to central list
*

View File

@ -163,21 +163,6 @@ class TableRelationController extends TableController
);
}
// display secondary level tabs if necessary
$engine = $this->dbi->getTable($this->db, $this->table)->getStorageEngine();
$this->response->addHTML(
$this->template->render('table/secondary_tabs', [
'url_params' => [
'db' => $GLOBALS['db'],
'table' => $GLOBALS['table'],
],
'is_foreign_key_supported' => Util::isForeignKeySupported($engine),
'cfg_relation' => $this->relation->getRelationsParam(),
])
);
$this->response->addHTML('<div id="structure_content">');
/**
* Dialog
*/
@ -202,8 +187,11 @@ class TableRelationController extends TableController
}
// common form
$engine = $this->dbi->getTable($this->db, $this->table)->getStorageEngine();
$foreignKeySupported = Util::isForeignKeySupported($this->tbl_storage_engine);
$this->response->addHTML(
$this->template->render('table/relation/common_form', [
'is_foreign_key_supported' => Util::isForeignKeySupported($engine),
'db' => $this->db,
'table' => $this->table,
'cfg_relation' => $this->cfgRelation,
@ -218,13 +206,10 @@ class TableRelationController extends TableController
'url_params' => $GLOBALS['url_params'],
'databases' => $GLOBALS['dblist']->databases,
'dbi' => $this->dbi,
'foreignKeySupported' => $foreignKeySupported,
'displayIndexesHtml' => $foreignKeySupported ? Index::getHtmlForDisplayIndexes() : null,
])
);
if (Util::isForeignKeySupported($this->tbl_storage_engine)) {
$this->response->addHTML(Index::getHtmlForDisplayIndexes());
}
$this->response->addHTML('</div>');
}
/**

View File

@ -288,20 +288,6 @@ class TableStructureController extends TableController
}
}
// display secondary level tabs if necessary
$engine = $this->table_obj->getStorageEngine();
$this->response->addHTML(
$this->template->render('table/secondary_tabs', [
'url_params' => [
'db' => $this->db,
'table' => $this->table,
],
'is_foreign_key_supported' => Util::isForeignKeySupported($engine),
'cfg_relation' => $this->relation->getRelationsParam(),
])
);
$this->response->addHTML('<div id="structure_content">');
/**
* Modifications have been submitted -> updates the table
*/
@ -397,8 +383,6 @@ class TableStructureController extends TableController
$columns_with_index
)
);
$this->response->addHTML('</div>');
}
/**
@ -693,7 +677,7 @@ class TableStructureController extends TableController
} else {
$p = $stmt->partitions[$i];
$type = $p->type;
$expr = trim($p->expr, '()');
$expr = trim((string) $p->expr, '()');
if ($expr == 'MAXVALUE') {
$type .= ' MAXVALUE';
$expr = '';
@ -703,9 +687,9 @@ class TableStructureController extends TableController
'value_type' => $type,
'value' => $expr,
'engine' => $p->options->has('ENGINE', true),
'comment' => trim($p->options->has('COMMENT', true), "'"),
'data_directory' => trim($p->options->has('DATA DIRECTORY', true), "'"),
'index_directory' => trim($p->options->has('INDEX_DIRECTORY', true), "'"),
'comment' => trim((string) $p->options->has('COMMENT', true), "'"),
'data_directory' => trim((string) $p->options->has('DATA DIRECTORY', true), "'"),
'index_directory' => trim((string) $p->options->has('INDEX_DIRECTORY', true), "'"),
'max_rows' => $p->options->has('MAX_ROWS', true),
'min_rows' => $p->options->has('MIN_ROWS', true),
'tablespace' => $p->options->has('TABLESPACE', true),
@ -1368,7 +1352,16 @@ class TableStructureController extends TableController
}
}
$engine = $this->table_obj->getStorageEngine();
$foreignKeySupported = Util::isForeignKeySupported($engine);
return $this->template->render('table/structure/display_structure', [
'url_params' => [
'db' => $this->db,
'table' => $this->table,
],
'is_foreign_key_supported' => Util::isForeignKeySupported($engine),
'displayIndexesHtml' => $foreignKeySupported ? Index::getHtmlForDisplayIndexes() : null,
'cfg_relation' => $this->relation->getRelationsParam(),
'hide_structure_actions' => $hideStructureActions,
'db' => $this->db,
'table' => $this->table,
@ -1399,6 +1392,7 @@ class TableStructureController extends TableController
'text_dir' => $GLOBALS['text_dir'],
'is_active' => Tracker::isActive(),
'have_partitioning' => Partition::havePartitioning(),
'partitions' => Partition::getPartitions($this->db, $this->table),
'partition_names' => Partition::getPartitionNames($this->db, $this->table),
'attributes' => $attributes,
'displayed_fields' => $displayed_fields,
@ -1488,7 +1482,14 @@ class TableStructureController extends TableController
$avg_size = $avg_unit = '';
}
$engine = $this->dbi->getTable($this->db, $this->table)->getStorageEngine();
return $this->template->render('table/structure/display_table_stats', [
'url_params' => [
'db' => $GLOBALS['db'],
'table' => $GLOBALS['table'],
],
'is_foreign_key_supported' => Util::isForeignKeySupported($engine),
'cfg_relation' => $this->relation->getRelationsParam(),
'showtable' => $this->_showtable,
'table_info_num_rows' => $this->_table_info_num_rows,
'tbl_is_view' => $this->_tbl_is_view,

View File

@ -303,20 +303,19 @@ class Designer
/**
* Returns HTML for Designer page
*
* @param string $db database in use
* @param string $getDb database in url
* @param array $scriptTables array on foreign key support for each table
* @param array $scriptContr initialization data array
* @param array $scriptDisplayField display fields of each table
* @param int $displayPage page number of the selected page
* @param boolean $hasQuery whether this is visual query builder
* @param string $selectedPage name of the selected page
* @param array $paramsArray array with class name for various buttons on side menu
* on side menu
* @param array $tabPos table positions
* @param array $tabColumn table column info
* @param array $tablesAllKeys all indices
* @param array $tablesPkOrUniqueKeys unique or primary indices
* @param string $db database in use
* @param string $getDb database in url
* @param array $scriptTables array on foreign key support for each table
* @param array $scriptContr initialization data array
* @param array $scriptDisplayField display fields of each table
* @param int $displayPage page number of the selected page
* @param boolean $hasQuery whether this is visual query builder
* @param string $selectedPage name of the selected page
* @param array $paramsArray array with class name for various buttons on side menu
* @param array|null $tabPos table positions
* @param array $tabColumn table column info
* @param array $tablesAllKeys all indices
* @param array $tablesPkOrUniqueKeys unique or primary indices
*
* @return string html
*/
@ -330,7 +329,7 @@ class Designer
$hasQuery,
$selectedPage,
array $paramsArray,
array $tabPos,
?array $tabPos,
array $tabColumn,
array $tablesAllKeys,
array $tablesPkOrUniqueKeys

View File

@ -282,9 +282,9 @@ class Common
*
* @param int $pg pdf page id
*
* @return array of table positions
* @return array|null of table positions
*/
public function getTablePositions($pg)
public function getTablePositions($pg): ?array
{
$cfgRelation = $this->relation->getRelationsParam();
if (! $cfgRelation['pdfwork']) {

View File

@ -535,10 +535,10 @@ class Export
foreach ($_POST as $name => $value) {
if (is_array($value)) {
foreach ($value as $val) {
$refreshButton .= '<input type="hidden" name="' . $name . '[]" value="' . $val . '">';
$refreshButton .= '<input type="hidden" name="' . urlencode((string) $name) . '[]" value="' . urlencode((string) $val) . '">';
}
} else {
$refreshButton .= '<input type="hidden" name="' . $name . '" value="' . $value . '">';
$refreshButton .= '<input type="hidden" name="' . urlencode((string) $name) . '" value="' . urlencode((string) $value) . '">';
}
}
$refreshButton .= '</form>';

View File

@ -986,8 +986,8 @@ class InsertEdit
* @todo clarify the meaning of the "textfield" class and explain
* why character columns have the "char" class instead
*/
$the_class = 'char';
$textAreaRows = $GLOBALS['cfg']['CharTextareaRows'];
$the_class = 'char charField';
$textAreaRows = max($GLOBALS['cfg']['CharTextareaRows'], 7);
$textareaCols = $GLOBALS['cfg']['CharTextareaCols'];
$extracted_columnspec = Util::extractColumnSpec(
$column['Type']
@ -1950,7 +1950,7 @@ class InsertEdit
}
$html_output .= '<th>' . __('Null') . '</th>'
. '<th>' . __('Value') . '</th>'
. '<th class="fillPage">' . __('Value') . '</th>'
. '</tr>'
. '</thead>'
. ' <tfoot>'

View File

@ -370,6 +370,8 @@ class Plugins
$ret .= \PhpMyAdmin\Util::showMySQLDocu(
$doc[1],
false,
null,
null,
$doc[2]
);
} elseif (count($doc) == 1) {

View File

@ -492,7 +492,7 @@ class Privileges
$name_for_dfn,
$name_for_current
) {
return $this->template->render('privileges/column_privileges', [
return $this->template->render('server/privileges/column_privileges', [
'columns' => $columns,
'row' => $row,
'name_for_select' => $name_for_select,
@ -573,7 +573,7 @@ class Privileges
}
$GLOBALS['dbi']->freeResult($result);
return $this->template->render('privileges/choose_user_group', [
return $this->template->render('server/privileges/choose_user_group', [
'all_user_groups' => $allUserGroups,
'user_group' => $userGroup,
'params' => ['username' => $username]
@ -845,7 +845,7 @@ class Privileges
],
];
return $this->template->render('privileges/require_options', [
return $this->template->render('server/privileges/require_options', [
'require_options' => $require_options
]);
}
@ -897,7 +897,7 @@ class Privileges
]
];
$html_output = $this->template->render('privileges/resource_limits', [
$html_output = $this->template->render('server/privileges/resource_limits', [
'limits' => $limits
]);
@ -953,7 +953,7 @@ class Privileges
$privs
);
return $this->template->render('privileges/edit_routine_privileges', [
return $this->template->render('server/privileges/edit_routine_privileges', [
'username' => $username,
'hostname' => $hostname,
'database' => $db,
@ -1455,7 +1455,7 @@ class Privileges
array $privTableNames,
array $row
) {
return $this->template->render('privileges/global_priv_table', [
return $this->template->render('server/privileges/global_priv_table', [
'priv_table' => $privTable,
'priv_table_names' => $privTableNames,
'row' => $row,
@ -3581,7 +3581,7 @@ class Privileges
$data['routines'] = $routines;
}
return $this->template->render('privileges/privileges_summary', $data);
return $this->template->render('server/privileges/privileges_summary', $data);
}
/**
@ -3812,7 +3812,7 @@ class Privileges
{
$html_output = $this->getAddUserHtmlFieldset();
$html_output .= $this->template->render('privileges/delete_user_fieldset');
$html_output .= $this->template->render('server/privileges/delete_user_fieldset');
return $html_output;
}
@ -3851,7 +3851,7 @@ class Privileges
uksort($array_initials, "strnatcasecmp");
return $this->template->render('privileges/initials_row', [
return $this->template->render('server/privileges/initials_row', [
'array_initials' => $array_initials,
'initial' => isset($_REQUEST['initial']) ? $_REQUEST['initial'] : null,
]);
@ -4572,7 +4572,7 @@ class Privileges
= $table;
}
return $this->template->render('privileges/add_user_fieldset', [
return $this->template->render('server/privileges/add_user_fieldset', [
'url_params' => $url_params,
'rel_params' => $rel_params
]);
@ -4842,6 +4842,8 @@ class Privileges
. Util::showMySQLDocu(
'privileges-provided',
false,
null,
null,
'priv_reload'
),
Message::NOTICE

View File

@ -46,6 +46,8 @@ class Queries
$retval .= Util::showMySQLDocu(
'server-status-variables',
false,
null,
null,
'statvar_Questions'
);
$retval .= '<br />';

View File

@ -244,11 +244,7 @@ class Variables
// Fields containing % are calculated,
// they can not be described in MySQL documentation
if (mb_strpos($name, '%') === false) {
$retval .= Util::showMySQLDocu(
'server-status-variables',
false,
'statvar_' . $name
);
$retval .= Util::linkToVarDocumentation($name, $GLOBALS['dbi']->isMariaDB());
}
$retval .= '</th>';

View File

@ -12,9 +12,7 @@ namespace PhpMyAdmin;
use PhpMyAdmin\Twig\CharsetsExtension;
use PhpMyAdmin\Twig\CoreExtension;
use PhpMyAdmin\Twig\I18nExtension;
use PhpMyAdmin\Twig\IndexExtension;
use PhpMyAdmin\Twig\MessageExtension;
use PhpMyAdmin\Twig\PartitionExtension;
use PhpMyAdmin\Twig\PluginsExtension;
use PhpMyAdmin\Twig\RelationExtension;
use PhpMyAdmin\Twig\SanitizeExtension;
@ -70,9 +68,7 @@ class Template
$twig->addExtension(new CharsetsExtension());
$twig->addExtension(new CoreExtension());
$twig->addExtension(new I18nExtension());
$twig->addExtension(new IndexExtension());
$twig->addExtension(new MessageExtension());
$twig->addExtension(new PartitionExtension());
$twig->addExtension(new PluginsExtension());
$twig->addExtension(new RelationExtension());
$twig->addExtension(new SanitizeExtension());

View File

@ -28,16 +28,16 @@ class CharsetsExtension extends AbstractExtension
{
return [
new TwigFunction(
'Charsets_getCollationDescr',
'get_collation_descr',
'PhpMyAdmin\Charsets::getCollationDescr'
),
new TwigFunction(
'Charsets_getCharsetDropdownBox',
'get_charset_dropdown_box',
'PhpMyAdmin\Charsets::getCharsetDropdownBox',
['is_safe' => ['html']]
),
new TwigFunction(
'Charsets_getCollationDropdownBox',
'get_collation_dropdown_box',
'PhpMyAdmin\Charsets::getCollationDropdownBox',
['is_safe' => ['html']]
),

View File

@ -10,7 +10,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Twig;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
use Twig\TwigFilter;
/**
* Class CoreExtension
@ -20,15 +20,15 @@ use Twig\TwigFunction;
class CoreExtension extends AbstractExtension
{
/**
* Returns a list of functions to add to the existing list.
* Returns a list of filters to add to the existing list.
*
* @return TwigFunction[]
* @return TwigFilter[]
*/
public function getFunctions()
public function getFilters()
{
return [
new TwigFunction(
'Core_mimeDefaultFunction',
new TwigFilter(
'mime_default_function',
'PhpMyAdmin\Core::mimeDefaultFunction',
['is_safe' => ['html']]
),

View File

@ -1,37 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* hold PhpMyAdmin\Twig\IndexExtension class
*
* @package PhpMyAdmin\Twig
*/
declare(strict_types=1);
namespace PhpMyAdmin\Twig;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
/**
* Class IndexExtension
*
* @package PhpMyAdmin\Twig
*/
class IndexExtension extends AbstractExtension
{
/**
* Returns a list of functions to add to the existing list.
*
* @return TwigFunction[]
*/
public function getFunctions()
{
return [
new TwigFunction(
'Index_getHtmlForDisplayIndexes',
'PhpMyAdmin\Index::getHtmlForDisplayIndexes',
['is_safe' => ['html']]
),
];
}
}

View File

@ -11,7 +11,7 @@ namespace PhpMyAdmin\Twig;
use PhpMyAdmin\Message;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
use Twig\TwigFilter;
/**
* Class MessageExtension
@ -21,22 +21,22 @@ use Twig\TwigFunction;
class MessageExtension extends AbstractExtension
{
/**
* Returns a list of functions to add to the existing list.
* Returns a list of filters to add to the existing list.
*
* @return TwigFunction[]
* @return TwigFilter[]
*/
public function getFunctions()
public function getFilters()
{
return [
new TwigFunction(
'Message_notice',
new TwigFilter(
'notice',
function ($string) {
return Message::notice($string)->getDisplay();
},
['is_safe' => ['html']]
),
new TwigFunction(
'Message_error',
new TwigFilter(
'error',
function ($string) {
return Message::error($string)->getDisplay();
},

View File

@ -1,37 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* hold PhpMyAdmin\Twig\PartitionExtension class
*
* @package PhpMyAdmin\Twig
*/
declare(strict_types=1);
namespace PhpMyAdmin\Twig;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
/**
* Class PartitionExtension
*
* @package PhpMyAdmin\Twig
*/
class PartitionExtension extends AbstractExtension
{
/**
* Returns a list of functions to add to the existing list.
*
* @return TwigFunction[]
*/
public function getFunctions()
{
return [
new TwigFunction(
'Partition_getPartitions',
'PhpMyAdmin\Partition::getPartitions',
['is_safe' => ['html']]
),
];
}
}

View File

@ -28,22 +28,22 @@ class PluginsExtension extends AbstractExtension
{
return [
new TwigFunction(
'Plugins_checkboxCheck',
'checkbox_check',
'PhpMyAdmin\Plugins::checkboxCheck',
['is_safe' => ['html']]
),
new TwigFunction(
'Plugins_getChoice',
'get_choice',
'PhpMyAdmin\Plugins::getChoice',
['is_safe' => ['html']]
),
new TwigFunction(
'Plugins_getDefault',
'get_default_plugin',
'PhpMyAdmin\Plugins::getDefault',
['is_safe' => ['html']]
),
new TwigFunction(
'Plugins_getOptions',
'get_options',
'PhpMyAdmin\Plugins::getOptions',
['is_safe' => ['html']]
),

View File

@ -30,25 +30,25 @@ class RelationExtension extends AbstractExtension
$relation = new Relation();
return [
new TwigFunction(
'Relation_foreignDropdown',
'foreign_dropdown',
[$relation, 'foreignDropdown'],
['is_safe' => ['html']]
),
new TwigFunction(
'Relation_getDisplayField',
'get_display_field',
[$relation, 'getDisplayField'],
['is_safe' => ['html']]
),
new TwigFunction(
'Relation_getForeignData',
'get_foreign_data',
[$relation, 'getForeignData']
),
new TwigFunction(
'Relation_getTables',
'get_tables',
[$relation, 'getTables']
),
new TwigFunction(
'Relation_searchColumnInForeigners',
'search_column_in_foreigners',
[$relation, 'searchColumnInForeigners']
),
];

View File

@ -10,7 +10,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Twig;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
use Twig\TwigFilter;
/**
* Class SanitizeExtension
@ -20,25 +20,25 @@ use Twig\TwigFunction;
class SanitizeExtension extends AbstractExtension
{
/**
* Returns a list of functions to add to the existing list.
* Returns a list of filters to add to the existing list.
*
* @return TwigFunction[]
* @return TwigFilter[]
*/
public function getFunctions()
public function getFilters()
{
return [
new TwigFunction(
'Sanitize_escapeJsString',
new TwigFilter(
'escape_js_string',
'PhpMyAdmin\Sanitize::escapeJsString',
['is_safe' => ['html']]
),
new TwigFunction(
'Sanitize_jsFormat',
new TwigFilter(
'js_format',
'PhpMyAdmin\Sanitize::jsFormat',
['is_safe' => ['html']]
),
new TwigFunction(
'Sanitize_sanitize',
new TwigFilter(
'sanitize',
'PhpMyAdmin\Sanitize::sanitize',
['is_safe' => ['html']]
),

View File

@ -31,7 +31,7 @@ class ServerPrivilegesExtension extends AbstractExtension
$serverPrivileges = new Privileges(new Template());
return [
new TwigFunction(
'ServerPrivileges_formatPrivilege',
'format_privilege',
[$serverPrivileges, 'formatPrivilege'],
['is_safe' => ['html']]
),

View File

@ -28,7 +28,7 @@ class StorageEngineExtension extends AbstractExtension
{
return [
new TwigFunction(
'StorageEngine_getHtmlSelect',
'get_html_select',
'PhpMyAdmin\StorageEngine::getHtmlSelect',
['is_safe' => ['html']]
),

View File

@ -28,7 +28,7 @@ class TableExtension extends AbstractExtension
{
return [
new TwigFunction(
'Table_get',
'table_get',
'PhpMyAdmin\Table::get'
),
];

View File

@ -28,7 +28,7 @@ class TrackerExtension extends AbstractExtension
{
return [
new TwigFunction(
'Tracker_getVersion',
'get_tracker_version',
'PhpMyAdmin\Tracker::getVersion'
),
];

View File

@ -30,11 +30,11 @@ class TransformationsExtension extends AbstractExtension
$transformations = new Transformations();
return [
new TwigFunction(
'Transformations_getDescription',
'get_description',
[$transformations, 'getDescription']
),
new TwigFunction(
'Transformations_getName',
'get_name',
[$transformations, 'getName']
),
];

View File

@ -11,6 +11,7 @@ namespace PhpMyAdmin\Twig;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
use Twig\TwigFilter;
/**
* Class UrlExtension
@ -28,27 +29,38 @@ class UrlExtension extends AbstractExtension
{
return [
new TwigFunction(
'Url_getHiddenInputs',
'get_hidden_inputs',
'PhpMyAdmin\Url::getHiddenInputs',
['is_safe' => ['html']]
),
new TwigFunction(
'Url_getHiddenFields',
'get_hidden_fields',
'PhpMyAdmin\Url::getHiddenFields',
['is_safe' => ['html']]
),
new TwigFunction(
'Url_getCommon',
'get_common',
'PhpMyAdmin\Url::getCommon',
['is_safe' => ['html']]
),
new TwigFunction(
'Url_getCommonRaw',
'get_common_raw',
'PhpMyAdmin\Url::getCommonRaw',
['is_safe' => ['html']]
),
new TwigFunction(
'Url_link',
];
}
/**
* Returns a list of filters to add to the existing list.
*
* @return TwigFilter[]
*/
public function getFilters()
{
return [
new TwigFilter(
'link',
'PhpMyAdmin\Core::linkURL'
),
];

View File

@ -11,6 +11,7 @@ namespace PhpMyAdmin\Twig;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
use Twig\TwigFilter;
/**
* Class UtilExtension
@ -28,164 +29,170 @@ class UtilExtension extends AbstractExtension
{
return [
new TwigFunction(
'Util_backquote',
'backquote',
'PhpMyAdmin\Util::backquote'
),
new TwigFunction(
'Util_getBrowseUploadFileBlock',
'get_browse_upload_file_block',
'PhpMyAdmin\Util::getBrowseUploadFileBlock',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_convertBitDefaultValue',
'PhpMyAdmin\Util::convertBitDefaultValue'
),
new TwigFunction(
'Util_escapeMysqlWildcards',
'PhpMyAdmin\Util::escapeMysqlWildcards'
),
new TwigFunction(
'Util_extractColumnSpec',
'extract_column_spec',
'PhpMyAdmin\Util::extractColumnSpec'
),
new TwigFunction(
'Util_formatByteDown',
'format_byte_down',
'PhpMyAdmin\Util::formatByteDown'
),
new TwigFunction(
'Util_formatNumber',
'format_number',
'PhpMyAdmin\Util::formatNumber'
),
new TwigFunction(
'Util_formatSql',
'format_sql',
'PhpMyAdmin\Util::formatSql',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getButtonOrImage',
'get_button_or_image',
'PhpMyAdmin\Util::getButtonOrImage',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getClassForType',
'get_class_for_type',
'PhpMyAdmin\Util::getClassForType',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getDivForSliderEffect',
'get_div_for_slider_effect',
'PhpMyAdmin\Util::getDivForSliderEffect',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getDocuLink',
'get_docu_link',
'PhpMyAdmin\Util::getDocuLink',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getListNavigator',
'get_list_navigator',
'PhpMyAdmin\Util::getListNavigator',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_showDocu',
'show_docu',
'PhpMyAdmin\Util::showDocu',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getDropdown',
'get_dropdown',
'PhpMyAdmin\Util::getDropdown',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getFKCheckbox',
'get_fk_checkbox',
'PhpMyAdmin\Util::getFKCheckbox',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getGISDatatypes',
'get_gis_datatypes',
'PhpMyAdmin\Util::getGISDatatypes'
),
new TwigFunction(
'Util_getGISFunctions',
'get_gis_functions',
'PhpMyAdmin\Util::getGISFunctions'
),
new TwigFunction(
'Util_getHtmlTab',
'get_html_tab',
'PhpMyAdmin\Util::getHtmlTab',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getIcon',
'get_icon',
'PhpMyAdmin\Util::getIcon',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getImage',
'get_image',
'PhpMyAdmin\Util::getImage',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getRadioFields',
'get_radio_fields',
'PhpMyAdmin\Util::getRadioFields',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getSelectUploadFileBlock',
'get_select_upload_file_block',
'PhpMyAdmin\Util::getSelectUploadFileBlock',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getScriptNameForOption',
'get_script_name_for_option',
'PhpMyAdmin\Util::getScriptNameForOption',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getStartAndNumberOfRowsPanel',
'get_start_and_number_of_rows_panel',
'PhpMyAdmin\Util::getStartAndNumberOfRowsPanel',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_getSupportedDatatypes',
'get_supported_datatypes',
'PhpMyAdmin\Util::getSupportedDatatypes',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_isForeignKeySupported',
'is_foreign_key_supported',
'PhpMyAdmin\Util::isForeignKeySupported'
),
new TwigFunction(
'Util_linkOrButton',
'link_or_button',
'PhpMyAdmin\Util::linkOrButton',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_localisedDate',
'localised_date',
'PhpMyAdmin\Util::localisedDate'
),
new TwigFunction(
'Util_showHint',
'show_hint',
'PhpMyAdmin\Util::showHint',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_showDocu',
'PhpMyAdmin\Util::showDocu',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_showIcons',
'show_icons',
'PhpMyAdmin\Util::showIcons'
),
new TwigFunction(
'Util_showMySQLDocu',
'show_mysql_docu',
'PhpMyAdmin\Util::showMySQLDocu',
['is_safe' => ['html']]
),
new TwigFunction(
'Util_sortableTableHeader',
'sortable_table_header',
'PhpMyAdmin\Util::sortableTableHeader',
['is_safe' => ['html']]
),
];
}
/**
* Returns a list of filters to add to the existing list.
*
* @return TwigFilter[]
*/
public function getFilters()
{
return [
new TwigFilter(
'convert_bit_default_value',
'PhpMyAdmin\Util::convertBitDefaultValue'
),
new TwigFilter(
'escape_mysql_wildcards',
'PhpMyAdmin\Util::convertBitDefaultValue'
),
];
}
}

View File

@ -23,6 +23,8 @@ use PhpMyAdmin\SqlParser\Token;
use PhpMyAdmin\SqlParser\Utils\Error as ParserError;
use PhpMyAdmin\Template;
use PhpMyAdmin\Url;
use Williamdes\MariaDBMySQLKBS\Search as KBSearch;
use Williamdes\MariaDBMySQLKBS\KBException;
/**
* Misc functions used all over the scripts.
@ -356,13 +358,46 @@ class Util
return Core::linkURL($url);
}
/**
* Get a link to variable documentation
*
* @param string $name The variable name
* @param boolean $useMariaDB Use only MariaDB documentation
* @param string $text (optional) The text for the link
* @return string link or empty string
*/
public static function linkToVarDocumentation(
string $name,
bool $useMariaDB = false,
string $text = null
): string {
$html = '';
try {
$type = KBSearch::MYSQL;
if ($useMariaDB) {
$type = KBSearch::MARIADB;
}
$docLink = KBSearch::getByName($name, $type);
$html = Util::showMySQLDocu(
$name,
false,
$docLink,
$text
);
} catch (KBException $e) {
unset($e);// phpstan workaround
}
return $html;
}
/**
* Displays a link to the official MySQL documentation
*
* @param string $link contains name of page/anchor that is being linked
* @param bool $big_icon whether to use big icon (like in left frame)
* @param string $anchor anchor to page part
* @param bool $just_open whether only the opening <a> tag should be returned
* @param string $link contains name of page/anchor that is being linked
* @param bool $bigIcon whether to use big icon (like in left frame)
* @param string|null $url href attribute
* @param string|null $text text of link
* @param string $anchor anchor to page part
*
* @return string the html link
*
@ -370,20 +405,29 @@ class Util
*/
public static function showMySQLDocu(
$link,
$big_icon = false,
$anchor = '',
$just_open = false
) {
$url = self::getMySQLDocuURL($link, $anchor);
$open_link = '<a href="' . $url . '" target="mysql_doc">';
if ($just_open) {
return $open_link;
} elseif ($big_icon) {
return $open_link
. self::getImage('b_sqlhelp', __('Documentation')) . '</a>';
bool $bigIcon = false,
$url = null,
$text = null,
$anchor = ''
): string {
if ($url === null) {
$url = self::getMySQLDocuURL($link, $anchor);
}
$openLink = '<a href="' . htmlspecialchars($url) . '" target="mysql_doc">';
$closeLink = '</a>';
$html = '';
if ($bigIcon) {
$html = $openLink .
self::getImage('b_sqlhelp', __('Documentation'))
. $closeLink;
} elseif ($text !== null) {
$html = $openLink . $text . $closeLink;
} else {
$html = self::showDocLink($url, 'mysql_doc');
}
return self::showDocLink($url, 'mysql_doc');
return $html;
} // end of the 'showMySQLDocu()' function
/**

View File

@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2018-05-28 21:06-0300\n"
"PO-Revision-Date: 2018-04-16 15:34+0000\n"
"Last-Translator: Orkhan Guliyev <orkhan@our.az>\n"
"PO-Revision-Date: 2018-07-29 07:34+0000\n"
"Last-Translator: Yusif Məmmədov <yusifmv@gmail.com>\n"
"Language-Team: Azerbaijani <https://hosted.weblate.org/projects/phpmyadmin/"
"master/az/>\n"
"Language: az\n"
@ -13,11 +13,11 @@ 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 3.0-dev\n"
"X-Generator: Weblate 3.1.1\n"
#: ajax.php:22 ajax.php:51 export.php:206 libraries/classes/Export.php:1150
msgid "Bad type!"
msgstr "Pis tip!"
msgstr "Qeyri-münasib dəyişən"
#: changelog.php:41 license.php:36
#, php-format
@ -25,7 +25,7 @@ msgid ""
"The %s file is not available on this system, please visit %s for more "
"information."
msgstr ""
"%s faylı sistemdə yoxdur. Bütün lazımi informasiyanı %s saytından tapa "
"%s faylı sistemdə yoxdur. Bütün lazımi informasiyanı %s ünvanından tapa "
"bilərsiniz."
#: db_central_columns.php:130
@ -39,11 +39,11 @@ msgstr "Sıralamaq üçün klikləyin."
#: db_central_columns.php:178
#, php-format
msgid "Showing rows %1$s - %2$s."
msgstr "%1$s - %2$s sətir göstərilir."
msgstr "%1$s - %2$s sətirləri göstərilir."
#: db_datadict.php:64 libraries/classes/Operations.php:62
msgid "Database comment"
msgstr "Verilənlər bazasına şərh"
msgstr "Verilənlər bazası şərhi"
#: db_datadict.php:111
#: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php:605
@ -147,7 +147,7 @@ msgstr "Null"
#: templates/database/central_columns/table_header.twig:21
#: templates/table/structure/table_structure_header.twig:10
msgid "Default"
msgstr "Susmaya görə"
msgstr "İlkin vəziyyət"
#: db_datadict.php:125 libraries/classes/Plugins/Export/ExportHtmlword.php:402
#: libraries/classes/Plugins/Export/ExportLatex.php:533
@ -333,7 +333,7 @@ msgstr ""
#: db_qbe.php:134
msgid "You have to choose at least one column to display!"
msgstr "Göstərilməsi üçün ən az bir sütun seçməlisiniz!"
msgstr "Göstərmək üçün ən az bir sütun seçməlisiniz!"
#: db_qbe.php:152
#, php-format
@ -764,6 +764,9 @@ msgid ""
"multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
"split strings correctly and it may result in unexpected results."
msgstr ""
"mbstring PHP əlavəsi tapılmadı və belə görünür ki, siz çoxbaytlı simvol "
"dəstindən istifadə edirsiniz. mbstring əlavəsi olmadan phpMyAdmin stringləri "
"düzgün şəkildə parçalaya bilməz və bu gözlənilməz nəticələr verə bilər."
#: index.php:505
msgid ""
@ -781,12 +784,19 @@ msgid ""
"than cookie validity configured in phpMyAdmin, because of this, your login "
"might expire sooner than configured in phpMyAdmin."
msgstr ""
"Sizin PHP parametriniz [a@https://secure.php.net/manual/en/"
"session.configuration.php#ini.session.gc-maxlifetime@_blank] phpMyAdmində "
"qurulmuş çərəz (Cookie) etibarlılıq müddətindən daha azdır. Buna görə də "
"sizin girişin phpMyAdmində tənzimlənmiş vaxtdan tez bitə bilər."
#: index.php:539
msgid ""
"Login cookie store is lower than cookie validity configured in phpMyAdmin, "
"because of this, your login will expire sooner than configured in phpMyAdmin."
msgstr ""
"Giriş çərəz anbarı phpMyAdmində quraşdırılmış çərəz etibarlılıq müddətindən "
"azdır, buna görə də, sizin girişiniz phpMyAdmində quraşdırılmış müddətdən "
"tez bağlanacaq."
#: index.php:554
msgid "The configuration file now needs a secret passphrase (blowfish_secret)."

View File

@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2018-05-28 21:06-0300\n"
"PO-Revision-Date: 2018-05-23 22:34+0000\n"
"PO-Revision-Date: 2018-07-23 11:06+0000\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: Czech <https://hosted.weblate.org/projects/phpmyadmin/master/"
"cs/>\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 3.0-dev\n"
"X-Generator: Weblate 3.1-dev\n"
#: ajax.php:22 ajax.php:51 export.php:206 libraries/classes/Export.php:1150
msgid "Bad type!"
@ -1762,6 +1762,8 @@ msgid ""
"It seems that the connection to server has been lost. Please check your "
"network connectivity and server status."
msgstr ""
"Připojení k serveru bylo ztraceno. Prosím, zkontrolujte Vaše síťové "
"připojení a stav serveru."
#: js/messages.php:372
#: libraries/classes/Controllers/Server/ServerDatabasesController.php:187
@ -2684,12 +2686,12 @@ msgstr "Silné"
#: js/messages.php:751
msgid "Timed out waiting for security key activation."
msgstr ""
msgstr "Vypršel čas pro aktivaci bezpečnostního klíče."
#: js/messages.php:752
#, php-format
msgid "Failed security key activation (%s)."
msgstr ""
msgstr "Selhala aktivace bezpečnostního klíče (%s)."
#: js/messages.php:781
msgctxt "Previous month"
@ -3429,7 +3431,7 @@ msgstr "Islandština"
#: libraries/classes/Charsets.php:493
msgctxt "Collation"
msgid "Classical Latin"
msgstr ""
msgstr "Latina (klasická)"
#: libraries/classes/Charsets.php:497
#, fuzzy
@ -3492,7 +3494,7 @@ msgstr "Španělština"
#: libraries/classes/Charsets.php:545 libraries/classes/Charsets.php:595
msgctxt "Collation"
msgid "Spanish (traditional)"
msgstr ""
msgstr "Španělština (tradiční)"
#: libraries/classes/Charsets.php:564
#, fuzzy
@ -7140,7 +7142,7 @@ msgstr "Server neodpovídá."
#: libraries/classes/DatabaseInterface.php:2209
msgid "Logout and try as another user."
msgstr ""
msgstr "Odhlásit se a zkusit přihlásit se jako jiný uživatel."
#: libraries/classes/DatabaseInterface.php:2215
msgid "Please check privileges of directory containing database."
@ -7187,7 +7189,7 @@ msgstr "Heslo:"
#: libraries/classes/Display/ChangePassword.php:82
msgid "Enter:"
msgstr ""
msgstr "Vložit:"
#: libraries/classes/Display/ChangePassword.php:89
#: libraries/classes/ReplicationGui.php:893
@ -7236,7 +7238,7 @@ msgstr ""
#: libraries/classes/Display/Export.php:573
msgid "Defined aliases"
msgstr ""
msgstr "Definované aliasy"
#: libraries/classes/Display/Export.php:629
#: templates/display/export/options_output.twig:7
@ -8186,7 +8188,7 @@ msgstr "Pohled"
#: libraries/classes/Menu.php:298 libraries/classes/Menu.php:317
#, php-format
msgid "“%s”"
msgstr ""
msgstr "„%s“"
#: libraries/classes/Menu.php:352
#: libraries/classes/Navigation/Nodes/NodeTable.php:302
@ -9247,6 +9249,8 @@ msgstr "Nepodařilo se přihlášení k MySQL serveru"
#: libraries/classes/Plugins/AuthenticationPlugin.php:350
msgid "You have enabled two factor authentication, please confirm your login."
msgstr ""
"Aktivovali jste dvoustupňové ověřování. Potvrďte, prosím, své přihlašovací "
"údaje."
#: libraries/classes/Plugins/Export/ExportCodegen.php:104
#: templates/display/import/import.twig:168
@ -9765,7 +9769,7 @@ msgstr "Tabulka:"
#: libraries/classes/Plugins/Export/Helpers/Pdf.php:168
msgid "Purpose:"
msgstr ""
msgstr "Účel:"
#: libraries/classes/Plugins/Export/Helpers/Pdf.php:549
msgid "MIME"

View File

@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2018-05-28 21:06-0300\n"
"PO-Revision-Date: 2018-01-08 13:02+0000\n"
"Last-Translator: Guillermo Lengemann <omerta@unefa-glug.org.ve>\n"
"PO-Revision-Date: 2018-07-23 11:06+0000\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: Spanish <https://hosted.weblate.org/projects/phpmyadmin/"
"master/es/>\n"
"Language: es\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.19-dev\n"
"X-Generator: Weblate 3.1-dev\n"
#: ajax.php:22 ajax.php:51 export.php:206 libraries/classes/Export.php:1150
msgid "Bad type!"
@ -9250,6 +9250,8 @@ msgstr "El servidor MySQL no autorizó su acceso"
#: libraries/classes/Plugins/AuthenticationPlugin.php:350
msgid "You have enabled two factor authentication, please confirm your login."
msgstr ""
"Ha habilitado la autenticación de dos factores, confirme su inicio de sesión "
"por favor."
#: libraries/classes/Plugins/Export/ExportCodegen.php:104
#: templates/display/import/import.twig:168

View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2018-05-07 03:27-0300\n"
"PO-Revision-Date: 2018-07-10 23:23+0000\n"
"PO-Revision-Date: 2018-07-26 11:48+0000\n"
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
"Language-Team: Hebrew <https://hosted.weblate.org/projects/phpmyadmin/master/"
"he/>\n"
@ -16917,7 +16917,7 @@ msgid ""
msgstr ""
"הגדרת {concurrent_insert} ל־1 מקטינה את המחלוקת בין הקוראים והכותבים לטבלה "
"מסוימת. ניתן גם לעיין ב<a href=\"https://dev.mysql.com/doc/refman/5.5/en/"
"concurrent-inserts.html\">תיעוד שלMySQL</a>"
"concurrent-inserts.html\">תיעוד של MySQL</a>"
#: libraries/advisory_rules.txt:446
msgid "concurrent_insert is set to 0"

View File

@ -4,17 +4,17 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2018-05-28 21:06-0300\n"
"PO-Revision-Date: 2018-03-23 05:43+0000\n"
"Last-Translator: Marino <mrabach@gmail.com>\n"
"PO-Revision-Date: 2018-07-23 11:06+0000\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: Croatian <https://hosted.weblate.org/projects/phpmyadmin/"
"master/hr/>\n"
"Language: hr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 2.20-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 3.1-dev\n"
#: ajax.php:22 ajax.php:51 export.php:206 libraries/classes/Export.php:1150
msgid "Bad type!"
@ -26,12 +26,12 @@ msgid ""
"The %s file is not available on this system, please visit %s for more "
"information."
msgstr ""
"Datoteka %s nije dostupna na na ovom sistemu, molimo posjetite www."
"phpmyadmin.net%s za više informacija."
"Datoteka %s nije dostupna na ovom sistemu, molimo posjetite %s za više "
"informacija."
#: db_central_columns.php:130
msgid "The central list of columns for the current database is empty."
msgstr ""
msgstr "Središnji popis stupaca za trenutnu bazu podataka je prazan"
#: db_central_columns.php:159
#, fuzzy
@ -315,6 +315,8 @@ msgstr "Naziv baze podataka je prazan!"
#: db_operations.php:71
msgid "Cannot copy database to the same name. Change the name and try again."
msgstr ""
"Nije moguće kopirati bazu podataka jednakog naziva. Promijenite naziv i "
"pokušajte ponovo."
#: db_operations.php:158
#, fuzzy, php-format
@ -323,10 +325,9 @@ msgid "Database %1$s has been renamed to %2$s."
msgstr "Baza podataka %1$s preimenovana je u %2$s"
#: db_operations.php:170
#, fuzzy, php-format
#| msgid "Database %s has been copied to %s."
#, php-format
msgid "Database %1$s has been copied to %2$s."
msgstr "Baza podataka %s kopirana je u %s"
msgstr "Baza podataka %1$s je kopirana u %2$s"
#: db_operations.php:299
#, fuzzy, php-format
@ -340,10 +341,8 @@ msgstr ""
"razloge, kliknite %sovdje%s."
#: db_qbe.php:134
#, fuzzy
#| msgid "You have to choose at least one column to display"
msgid "You have to choose at least one column to display!"
msgstr "Morate odabrati najmanje jedan stupac za prikazivanje"
msgstr "Morate odabrati najmanje jedan stupac za prikazivanje!"
#: db_qbe.php:152
#, php-format

146
po/lt.po
View File

@ -3,9 +3,9 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2018-05-28 21:06-0300\n"
"PO-Revision-Date: 2018-02-01 13:38+0000\n"
"Last-Translator: Edgaras Janušauskas <edgaras.janusauskas@gmail.com>\n"
"POT-Creation-Date: 2018-02-12 16:30+0100\n"
"PO-Revision-Date: 2018-07-23 11:06+0000\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: Lithuanian <https://hosted.weblate.org/projects/phpmyadmin/"
"master/lt/>\n"
"Language: lt\n"
@ -15,7 +15,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n % 10 == 1 && (n % 100 < 11 || n % 100 > "
"19)) ? 0 : ((n % 10 >= 2 && n % 10 <= 9 && (n % 100 < 11 || n % 100 > 19)) ? "
"1 : 2);\n"
"X-Generator: Weblate 2.19-dev\n"
"X-Generator: Weblate 3.1-dev\n"
#: ajax.php:22 ajax.php:51 export.php:206 libraries/classes/Export.php:1150
msgid "Bad type!"
@ -584,13 +584,12 @@ msgid "Bookmark %s has been created."
msgstr "Žymė %s sukurta."
#: import.php:600
#, fuzzy, php-format
#, php-format
msgid "Import has been successfully finished, %d query executed."
msgid_plural "Import has been successfully finished, %d queries executed."
msgstr[0] "Importavimas sėkmingai baigtas, įvykdyta %d užklausa."
msgstr[1] "Importavimas sėkmingai baigtas, įvykdyta %d užklausos."
msgstr[2] "Importavimas sėkmingai baigtas, įvykdyta %d užklausų."
msgstr[3] ""
msgstr[0] "Importavimas sėkmingai baigtas, užklausa %d įvykdyta."
msgstr[1] "Importavimas sėkmingai baigtas, užklausos %d įvykdytos."
msgstr[2] "Importavimas sėkmingai baigtas, iš viso įvykdyta %d užklausų."
#: import.php:631
#, php-format
@ -616,7 +615,7 @@ msgstr "„DROP DATABASE“ komandos įvykdyti negalima."
#: import_status.php:108
msgid "Could not load the progress of the import."
msgstr ""
msgstr "Nepavyko įkelti importo ."
#: import_status.php:117 js/messages.php:461 js/messages.php:627
#: libraries/classes/Export.php:530
@ -630,13 +629,13 @@ msgid ""
"You were logged out from one server, to logout completely from phpMyAdmin, "
"you need to logout from all servers."
msgstr ""
"Jūs atsijungėte iš vieno serverio, kad visiškai išeitumėte iš phpMyAdmin, "
"turite atsijungti iš visų serverių."
#: index.php:184 libraries/classes/Footer.php:83
#: libraries/classes/Plugins/Auth/AuthenticationCookie.php:116
#, fuzzy
#| msgid "phpMyAdmin homepage"
msgid "phpMyAdmin Demo Server"
msgstr "phpMyAdmin tinklalapis"
msgstr "phpMyAdmin Demonstracinis Serveris"
#: index.php:188 libraries/classes/Plugins/Auth/AuthenticationCookie.php:119
#, php-format
@ -645,6 +644,9 @@ msgid ""
"change root, debian-sys-maint and pma users. More information is available "
"at %s."
msgstr ""
"Jūs naudojate demonstracinį serverį. Čia galite daryti ką norite, bet "
"nepakeiskite admistratoriaus root, debian-sys-maint ir pma vartotojų. "
"Daugiau informacijos galima rasti čia adresu %s."
#: index.php:198
msgid "General settings"
@ -678,16 +680,12 @@ msgid "Server:"
msgstr "Darbinė stotis:"
#: index.php:326
#, fuzzy
#| msgid "Server port"
msgid "Server type:"
msgstr "Serverio jungtis"
msgstr "Serverio tipas :"
#: index.php:330
#, fuzzy
#| msgid "Insecure connection"
msgid "Server connection:"
msgstr "Nesaugus susijungimas"
msgstr "Serverio prisijungimas :"
#: index.php:334 libraries/classes/Plugins/Export/ExportLatex.php:225
#: libraries/classes/Plugins/Export/ExportSql.php:706
@ -704,10 +702,8 @@ msgid "Protocol version:"
msgstr "Protokolo versija"
#: index.php:344
#, fuzzy
#| msgid "User"
msgid "User:"
msgstr "Naudotojas"
msgstr "Vartotojas :"
#: index.php:349
#, fuzzy
@ -773,7 +769,7 @@ msgstr "Pakeitimų sąrašas"
#: index.php:470 templates/server/plugins/section.twig:13
msgid "License"
msgstr ""
msgstr "Licencija"
#: index.php:490
msgid ""
@ -1138,8 +1134,6 @@ msgstr "SQL užklausa"
#. l10n: Default label for the y-Axis of Charts
#: js/messages.php:141
#, fuzzy
#| msgid "Y Values"
msgid "Y values"
msgstr "Y Reikšmės"
@ -1623,22 +1617,16 @@ msgid "Chart"
msgstr "Diagrama"
#: js/messages.php:298 libraries/classes/Display/Export.php:581
#, fuzzy
#| msgid "Database"
msgctxt "Alias"
msgid "Database"
msgstr "Duomenų bazė"
#: js/messages.php:299 libraries/classes/Display/Export.php:593
#, fuzzy
#| msgid "Table"
msgctxt "Alias"
msgid "Table"
msgstr "Lentelė"
#: js/messages.php:300 libraries/classes/Display/Export.php:604
#, fuzzy
#| msgid "Column"
msgctxt "Alias"
msgid "Column"
msgstr "Stulpelis"
@ -2578,8 +2566,6 @@ msgid "Original length"
msgstr "Pirminė padėtis"
#: js/messages.php:617
#, fuzzy
#| msgid "Cancel"
msgid "cancel"
msgstr "Atšaukti"
@ -3034,9 +3020,6 @@ msgstr "Šeštadienis"
#. l10n: Short week day name
#: js/messages.php:852
#, fuzzy
#| msgctxt "Short week day name"
#| msgid "Sun"
msgid "Sun"
msgstr "Sek"
@ -3119,8 +3102,6 @@ msgstr ""
#. l10n: Year suffix for calendar, "none" is empty.
#: js/messages.php:897
#, fuzzy
#| msgid "None"
msgctxt "Year suffix"
msgid "none"
msgstr "Ne"
@ -3381,11 +3362,11 @@ msgstr "Negalėjo išsaugoti paskiausios lentelės"
#: libraries/classes/CentralColumns.php:628
msgid "YES"
msgstr ""
msgstr "Taip"
#: libraries/classes/CentralColumns.php:628
msgid "NO"
msgstr ""
msgstr "Ne"
#: libraries/classes/CentralColumns.php:776
#, fuzzy
@ -3456,14 +3437,10 @@ msgid "Charset"
msgstr "Koduotė"
#: libraries/classes/Charsets.php:312
#, fuzzy
#| msgid "unknown"
msgid "Unknown"
msgstr "nežinoma"
#: libraries/classes/Charsets.php:326
#, fuzzy
#| msgid "Binary"
msgctxt "Collation"
msgid "Binary"
msgstr "Dvejetainis"
@ -3490,8 +3467,6 @@ msgid "Central European"
msgstr "Centrinės Europos"
#: libraries/classes/Charsets.php:360
#, fuzzy
#| msgid "Russian"
msgctxt "Collation"
msgid "Russian"
msgstr "Rusų"
@ -3504,8 +3479,6 @@ msgid "Simplified Chinese"
msgstr "Supaprastinta kinų"
#: libraries/classes/Charsets.php:372 libraries/classes/Charsets.php:490
#, fuzzy
#| msgid "Japanese"
msgctxt "Collation"
msgid "Japanese"
msgstr "Japonų"
@ -3518,8 +3491,6 @@ msgid "Baltic"
msgstr "Baltų"
#: libraries/classes/Charsets.php:382
#, fuzzy
#| msgid "Armenian"
msgctxt "Collation"
msgid "Armenian"
msgstr "Armėnų"
@ -3539,22 +3510,16 @@ msgid "Cyrillic"
msgstr "Kirylica"
#: libraries/classes/Charsets.php:391
#, fuzzy
#| msgid "Arabic"
msgctxt "Collation"
msgid "Arabic"
msgstr "Arabų"
#: libraries/classes/Charsets.php:394 libraries/classes/Charsets.php:505
#, fuzzy
#| msgid "Korean"
msgctxt "Collation"
msgid "Korean"
msgstr "Korėjiečių"
#: libraries/classes/Charsets.php:397
#, fuzzy
#| msgid "Hebrew"
msgctxt "Collation"
msgid "Hebrew"
msgstr "Žydų"
@ -3567,8 +3532,6 @@ msgid "Georgian"
msgstr "Gruzinų"
#: libraries/classes/Charsets.php:403
#, fuzzy
#| msgid "Greek"
msgctxt "Collation"
msgid "Greek"
msgstr "Graikų"
@ -3581,43 +3544,31 @@ msgid "Czech-Slovak"
msgstr "Čekų-slovakų"
#: libraries/classes/Charsets.php:409 libraries/classes/Charsets.php:560
#, fuzzy
#| msgid "Ukrainian"
msgctxt "Collation"
msgid "Ukrainian"
msgstr "Ukrainiečių"
#: libraries/classes/Charsets.php:412 libraries/classes/Charsets.php:556
#, fuzzy
#| msgid "Turkish"
msgctxt "Collation"
msgid "Turkish"
msgstr "Turkų"
#: libraries/classes/Charsets.php:415 libraries/classes/Charsets.php:548
#, fuzzy
#| msgid "Swedish"
msgctxt "Collation"
msgid "Swedish"
msgstr "Švedų"
#: libraries/classes/Charsets.php:418 libraries/classes/Charsets.php:552
#, fuzzy
#| msgid "Thai"
msgctxt "Collation"
msgid "Thai"
msgstr "Tailando"
#: libraries/classes/Charsets.php:421
#, fuzzy
#| msgid "unknown"
msgctxt "Collation"
msgid "Unknown"
msgstr "nežinoma"
#: libraries/classes/Charsets.php:437
#, fuzzy
#| msgid "Bulgarian"
msgctxt "Collation"
msgid "Bulgarian"
msgstr "Bulgarų"
@ -3635,36 +3586,26 @@ msgid "Croatian"
msgstr "Kroatų"
#: libraries/classes/Charsets.php:451
#, fuzzy
#| msgid "Czech"
msgctxt "Collation"
msgid "Czech"
msgstr "Čekų"
#: libraries/classes/Charsets.php:455
#, fuzzy
#| msgid "Danish"
msgctxt "Collation"
msgid "Danish"
msgstr "Danų"
#: libraries/classes/Charsets.php:459
#, fuzzy
#| msgid "English"
msgctxt "Collation"
msgid "English"
msgstr "Anglų"
#: libraries/classes/Charsets.php:463
#, fuzzy
#| msgid "Esperanto"
msgctxt "Collation"
msgid "Esperanto"
msgstr "Esperanto"
#: libraries/classes/Charsets.php:467
#, fuzzy
#| msgid "Estonian"
msgctxt "Collation"
msgid "Estonian"
msgstr "Estų"
@ -3682,8 +3623,6 @@ msgid "German (phone book order)"
msgstr ""
#: libraries/classes/Charsets.php:482
#, fuzzy
#| msgid "Hungarian"
msgctxt "Collation"
msgid "Hungarian"
msgstr "Vengrų"
@ -3701,15 +3640,11 @@ msgid "Classical Latin"
msgstr ""
#: libraries/classes/Charsets.php:497
#, fuzzy
#| msgid "Latvian"
msgctxt "Collation"
msgid "Latvian"
msgstr "Latvių"
#: libraries/classes/Charsets.php:501
#, fuzzy
#| msgid "Lithuanian"
msgctxt "Collation"
msgid "Lithuanian"
msgstr "Lietuvių"
@ -3720,22 +3655,16 @@ msgid "Burmese"
msgstr ""
#: libraries/classes/Charsets.php:512
#, fuzzy
#| msgid "Persian"
msgctxt "Collation"
msgid "Persian"
msgstr "Persų"
#: libraries/classes/Charsets.php:516
#, fuzzy
#| msgid "Polish"
msgctxt "Collation"
msgid "Polish"
msgstr "Lenkų"
#: libraries/classes/Charsets.php:523
#, fuzzy
#| msgid "Romanian"
msgctxt "Collation"
msgid "Romanian"
msgstr "Rumunų"
@ -3746,15 +3675,11 @@ msgid "Sinhalese"
msgstr ""
#: libraries/classes/Charsets.php:531
#, fuzzy
#| msgid "Slovak"
msgctxt "Collation"
msgid "Slovak"
msgstr "Slovakų"
#: libraries/classes/Charsets.php:535
#, fuzzy
#| msgid "Slovenian"
msgctxt "Collation"
msgid "Slovenian"
msgstr "Slovėnų"
@ -3814,8 +3739,6 @@ msgid "multi-level"
msgstr "daugiakalbis"
#: libraries/classes/Charsets.php:647
#, fuzzy
#| msgid "Binary"
msgctxt "Collation variant"
msgid "binary"
msgstr "Dvejetainis"
@ -11201,8 +11124,6 @@ msgid "not OK"
msgstr "Negerai"
#: libraries/classes/Relation.php:111
#, fuzzy
#| msgid "OK"
msgctxt "Correctly working"
msgid "OK"
msgstr "Gerai"
@ -12093,8 +12014,6 @@ msgid "Trigger name"
msgstr ""
#: libraries/classes/Rte/Triggers.php:408
#, fuzzy
#| msgid "Time"
msgctxt "Trigger action time"
msgid "Time"
msgstr "Laikas"
@ -12527,8 +12446,6 @@ msgid "Global privileges"
msgstr "Globalios teisės"
#: libraries/classes/Server/Privileges.php:1165
#, fuzzy
#| msgid "global"
msgid "Global"
msgstr "globalus"
@ -14724,8 +14641,6 @@ msgstr "be PHP kodo"
#: libraries/classes/Util.php:1100
#: templates/database/multi_table_query/form.twig:161
#, fuzzy
#| msgid "Submit Query"
msgid "Submit query"
msgstr "Vykdyti užklausą"
@ -15493,8 +15408,6 @@ msgid "Author"
msgstr ""
#: templates/server/plugins/section.twig:23
#, fuzzy
#| msgid "Disabled"
msgid "disabled"
msgstr "Išjungta"
@ -15736,8 +15649,6 @@ msgid ""
msgstr "Trūksta phpMyAdmin nustatymų saugyklos lentelių"
#: templates/table/secondary_tabs.twig:9
#, fuzzy
#| msgid "Relation view"
msgid "Relation view"
msgstr "Peržiūrėti sąryšius"
@ -16065,8 +15976,6 @@ msgid "+ Add column"
msgstr "Pridėti stulpelį"
#: templates/database/multi_table_query/form.twig:160
#, fuzzy
#| msgid "Update Query"
msgid "Update query"
msgstr "Atnaujinti užklausą"
@ -16086,8 +15995,6 @@ msgid "Server variables and settings"
msgstr "Serverio kintamieji ir nustatymai"
#: templates/server/sub_page_header.twig:2
#, fuzzy
#| msgid "Storage Engines"
msgid "Storage engines"
msgstr "Saugojimo varikliai"
@ -16238,8 +16145,6 @@ msgstr "Tęstį įterpimą su %s eilučių"
#: templates/table/tracking/structure_snapshot_columns.twig:5
#: templates/table/tracking/report_table.twig:4
#, fuzzy
#| msgid "#"
msgctxt "Number"
msgid "#"
msgstr "#"
@ -16452,14 +16357,10 @@ msgid "During current session"
msgstr "Praleisti šią klaidą"
#: templates/console/display.twig:64
#, fuzzy
#| msgid "Ascending"
msgid "ascending"
msgstr "Didėjimo tvarka"
#: templates/console/display.twig:64
#, fuzzy
#| msgid "Descending"
msgid "descending"
msgstr "Mažėjimo tvarka"
@ -17052,8 +16953,6 @@ msgid "Bar"
msgstr "Histograma"
#: templates/table/chart/tbl_chart.twig:19
#, fuzzy
#| msgid "Column"
msgctxt "Chart type"
msgid "Column"
msgstr "Stulpelis"
@ -18058,9 +17957,8 @@ msgid "The current query cache hit rate of %s%% is below 20%%"
msgstr "Rūšiavimo buferio dydis"
#: libraries/advisory_rules.txt:167
#, fuzzy
msgid "Query Cache usage"
msgstr "Užklausų saugykla"
msgstr "Užklausų pagreitinimo (kešo) naudojamumas"
#: libraries/advisory_rules.txt:170
#, php-format

View File

@ -6,8 +6,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2018-05-28 21:06-0300\n"
"PO-Revision-Date: 2016-05-24 05:48+0000\n"
"Last-Translator: GIMMY <thozhalay@gmail.com>\n"
"PO-Revision-Date: 2018-07-23 11:06+0000\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: Malayalam <https://hosted.weblate.org/projects/phpmyadmin/"
"master/ml/>\n"
"Language: ml\n"
@ -15,7 +15,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.7-dev\n"
"X-Generator: Weblate 3.1-dev\n"
#: ajax.php:22 ajax.php:51 export.php:206 libraries/classes/Export.php:1150
msgid "Bad type!"
@ -27,10 +27,11 @@ msgid ""
"The %s file is not available on this system, please visit %s for more "
"information."
msgstr ""
"%s ഫയൽ ഈ സിസ്റ്റത്തിൽ ലഭ്യമല്ല, അധികമറിയുന്നതിന് ദയവായി %s -ലേക്ക് പോവുക."
#: db_central_columns.php:130
msgid "The central list of columns for the current database is empty."
msgstr ""
msgstr "നിലവിലുള്ള ഡാറ്റാബേസിലെ കോളങ്ങളുടെ കേന്ദ്ര പട്ടിക ശൂന്യമാണ്."
#: db_central_columns.php:159
msgid "Click to sort."
@ -39,7 +40,7 @@ msgstr ""
#: db_central_columns.php:178
#, php-format
msgid "Showing rows %1$s - %2$s."
msgstr ""
msgstr "പ്രദർശിപ്പിച്ചിരിക്കുന്ന റോ-കൾ %1$s - %2$s."
#: db_datadict.php:64 libraries/classes/Operations.php:62
msgid "Database comment"
@ -184,7 +185,7 @@ msgstr "അഭിപ്രായങ്ങൾ"
#: templates/table/structure/display_structure.twig:61
#: templates/columns_definitions/column_indexes.twig:4
msgid "Primary"
msgstr ""
msgstr "പ്രാഥമികം"
#: db_datadict.php:169 js/messages.php:383
#: libraries/classes/Config/FormDisplayTemplate.php:283

View File

@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2018-05-28 21:06-0300\n"
"PO-Revision-Date: 2017-08-22 09:47+0000\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"PO-Revision-Date: 2018-07-27 08:19+0000\n"
"Last-Translator: ROYAL Randhawa <imroyalrandhawa@gmail.com>\n"
"Language-Team: Punjabi <https://hosted.weblate.org/projects/phpmyadmin/"
"master/pa/>\n"
"Language: pa\n"
@ -17,7 +17,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.17-dev\n"
"X-Generator: Weblate 3.1-dev\n"
#: ajax.php:22 ajax.php:51 export.php:206 libraries/classes/Export.php:1150
msgid "Bad type!"
@ -312,6 +312,8 @@ msgstr "ਡਾਟਾਬੇਸ ਨਾਂ ਖਾਲੀ ਹੈ!"
#: db_operations.php:71
msgid "Cannot copy database to the same name. Change the name and try again."
msgstr ""
"ਇੱਕੋ ਨਾਮ ਦੇ ਡੇਟਾਬੇਸ ਨੂੰ ਕਾਪੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ, ਨਾਮ ਬਦਲੋ ਅਤੇ ਮੁੜ ਕੋਸ਼ਿਸ਼ ਕਰੋ "
"।"
#: db_operations.php:158
#, php-format
@ -425,9 +427,8 @@ msgstr "X"
#: gis_data_editor.php:224 gis_data_editor.php:252 gis_data_editor.php:308
#: gis_data_editor.php:383 js/messages.php:522
#, fuzzy
msgid "Y"
msgstr "Y"
msgstr ""
#: gis_data_editor.php:246 gis_data_editor.php:302 gis_data_editor.php:375
#: js/messages.php:524
@ -603,32 +604,37 @@ msgid ""
"However on last run no data has been parsed, this usually means phpMyAdmin "
"won't be able to finish this import unless you increase php time limits."
msgstr ""
"ਹਾਲਾਂਕਿ ਆਖਰੀ ਦੌਰੇ ਤੇ ਕੋਈ ਡਾਟਾ ਪਾਰਸ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਹੈ, ਇਸ ਦਾ ਆਮ ਤੌਰ ਤੇ ਮਤਲਬ ਹੈ "
"ਕਿ [ਪੀਐਚਪੀ ਮਾਈ ਐਡਮਿਨ] ਇਸ ਆਯਾਤ ਨੂੰ ਪੂਰਾ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੇਗਾ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ "
"[ਪੀਐਚਪੀ] ਸਮਾਂ ਸੀਮਾਵਾਂ ਵਧਾਉਂਦੇ ਨਹੀਂ ਹੋ ।"
#: import.php:709 sql.php:161
msgid "\"DROP DATABASE\" statements are disabled."
msgstr ""
msgstr "\"ਡ੍ਰੌਪ ਡੈਟਾਬੈਏਸ\" ਬਿਆਨ ਅਸਮਰਥਿਤ ਹਨ ।"
#: import_status.php:108
msgid "Could not load the progress of the import."
msgstr ""
msgstr "ਆਯਾਤ ਦੀ ਪ੍ਰਗਤੀ ਲੋਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ।"
#: import_status.php:117 js/messages.php:461 js/messages.php:627
#: libraries/classes/Export.php:530
#: libraries/classes/Plugins/Schema/ExportRelationSchema.php:307
#: libraries/classes/UserPassword.php:263 libraries/classes/Util.php:667
msgid "Back"
msgstr ""
msgstr "ਪਿੱਛੇ"
#: index.php:140
msgid ""
"You were logged out from one server, to logout completely from phpMyAdmin, "
"you need to logout from all servers."
msgstr ""
"ਤੁਸੀਂ ਇਕ ਸਰਵਰ ਤੋਂ ਲਾਗਆਉਟ ਹੋਏ ਹੋ, ਸੰਪੂਰਨ ਰੂਪ ਤੋਂ ਲਾਗਆਉਟ ਹੋਣ ਲਈ ਤੁਹਾਨੂੰ ਸਾਰੇ "
"ਸਰਵਰਾਂ ਤੋਂ ਲਾਗਆਉਟ ਹੋਣਾ ਪਵੇਗਾ ।"
#: index.php:184 libraries/classes/Footer.php:83
#: libraries/classes/Plugins/Auth/AuthenticationCookie.php:116
msgid "phpMyAdmin Demo Server"
msgstr ""
msgstr "[ਪੀਐਚਪੀ ਮਾਈ ਐਡਮਿਨ] ਡੈਮੋ ਸਰਵਰ"
#: index.php:188 libraries/classes/Plugins/Auth/AuthenticationCookie.php:119
#, php-format
@ -640,64 +646,64 @@ msgstr ""
#: index.php:198
msgid "General settings"
msgstr ""
msgstr "ਜਨਰਲ ਸੈਟਿੰਗਜ਼"
#: index.php:227 js/messages.php:652
#: libraries/classes/Display/ChangePassword.php:61
#: libraries/classes/Display/ChangePassword.php:64
#: libraries/classes/UserPassword.php:257
msgid "Change password"
msgstr ""
msgstr "ਪਾਸਵਰਡ ਬਦਲੋ"
#: index.php:244 libraries/classes/Config/Descriptions.php:1488
msgid "Server connection collation"
msgstr ""
msgstr "ਸਰਵਰ ਤੋਂ ਰਾਬਤਾ ਦੀ ਸੋਧ"
#: index.php:267
msgid "Appearance settings"
msgstr ""
msgstr "ਦਿੱਖ ਸੈਟਿੰਗਜ਼"
#: index.php:297 prefs_manage.php:278
msgid "More settings"
msgstr ""
msgstr "ਹੋਰ ਸੈਟਿੰਗਜ਼"
#: index.php:319
msgid "Database server"
msgstr ""
msgstr "ਡਾਟਾਬੇਸ ਸਰਵਰ"
#: index.php:322 libraries/classes/Plugins/Auth/AuthenticationCookie.php:166
msgid "Server:"
msgstr ""
msgstr "ਸਰਵਰ:"
#: index.php:326
msgid "Server type:"
msgstr ""
msgstr "ਸਰਵਰ ਦੀ ਕਿਸਮ:"
#: index.php:330
msgid "Server connection:"
msgstr ""
msgstr "ਸਰਵਰ ਰਾਬਤਾ:"
#: index.php:334 libraries/classes/Plugins/Export/ExportLatex.php:225
#: libraries/classes/Plugins/Export/ExportSql.php:706
#: libraries/classes/Plugins/Export/ExportXml.php:248
msgid "Server version:"
msgstr ""
msgstr "ਸਰਵਰ ਪ੍ਰਤੀਰੂਪ:"
#: index.php:340
msgid "Protocol version:"
msgstr ""
msgstr "ਪ੍ਰੋਟੋਕੋਲ ਪ੍ਰਤੀਰੂਪ:"
#: index.php:344
msgid "User:"
msgstr ""
msgstr "ਉਪਭੋਗੀ:"
#: index.php:349
msgid "Server charset:"
msgstr ""
msgstr "ਸਰਵਰ ਚਾਰਸੈੱਟ:"
#: index.php:365
msgid "Web server"
msgstr ""
msgstr "ਵੈੱਬ ਸਰਵਰ"
#: index.php:376
msgid "Database client version:"

View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2018-05-28 21:06-0300\n"
"PO-Revision-Date: 2018-02-27 21:31+0000\n"
"PO-Revision-Date: 2018-07-23 11:06+0000\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/phpmyadmin/master/"
"pl/>\n"
@ -14,7 +14,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 2.20-dev\n"
"X-Generator: Weblate 3.1-dev\n"
#: ajax.php:22 ajax.php:51 export.php:206 libraries/classes/Export.php:1150
msgid "Bad type!"
@ -3279,8 +3279,6 @@ msgid "Central European"
msgstr "Środkowoeuropejski"
#: libraries/classes/Charsets.php:360
#, fuzzy
#| msgid "Russian"
msgctxt "Collation"
msgid "Russian"
msgstr "Rosyjski"
@ -3303,8 +3301,6 @@ msgid "Baltic"
msgstr "Bałtycki"
#: libraries/classes/Charsets.php:382
#, fuzzy
#| msgid "Armenian"
msgctxt "Collation"
msgid "Armenian"
msgstr "Ormiański"
@ -3322,8 +3318,6 @@ msgid "Cyrillic"
msgstr "Cyrylica"
#: libraries/classes/Charsets.php:391
#, fuzzy
#| msgid "Arabic"
msgctxt "Collation"
msgid "Arabic"
msgstr "Arabski"
@ -3356,29 +3350,21 @@ msgid "Czech-Slovak"
msgstr "Czesko-słowacki"
#: libraries/classes/Charsets.php:409 libraries/classes/Charsets.php:560
#, fuzzy
#| msgid "Ukrainian"
msgctxt "Collation"
msgid "Ukrainian"
msgstr "Ukraiński"
#: libraries/classes/Charsets.php:412 libraries/classes/Charsets.php:556
#, fuzzy
#| msgid "Turkish"
msgctxt "Collation"
msgid "Turkish"
msgstr "Turecki"
#: libraries/classes/Charsets.php:415 libraries/classes/Charsets.php:548
#, fuzzy
#| msgid "Swedish"
msgctxt "Collation"
msgid "Swedish"
msgstr "Szwedzki"
#: libraries/classes/Charsets.php:418 libraries/classes/Charsets.php:552
#, fuzzy
#| msgid "Thai"
msgctxt "Collation"
msgid "Thai"
msgstr "Tajski"
@ -3389,8 +3375,6 @@ msgid "Unknown"
msgstr "Nieznany"
#: libraries/classes/Charsets.php:437
#, fuzzy
#| msgid "Bulgarian"
msgctxt "Collation"
msgid "Bulgarian"
msgstr "Bułgarski"
@ -3408,15 +3392,11 @@ msgid "Croatian"
msgstr "Chorwacki"
#: libraries/classes/Charsets.php:451
#, fuzzy
#| msgid "Czech"
msgctxt "Collation"
msgid "Czech"
msgstr "Czeski"
#: libraries/classes/Charsets.php:455
#, fuzzy
#| msgid "Danish"
msgctxt "Collation"
msgid "Danish"
msgstr "Duński"
@ -3447,8 +3427,6 @@ msgid "German (phone book order)"
msgstr "Język niemiecki (kolejność w telefonicznej książce adresowej)"
#: libraries/classes/Charsets.php:482
#, fuzzy
#| msgid "Hungarian"
msgctxt "Collation"
msgid "Hungarian"
msgstr "Węgierski"
@ -3491,8 +3469,6 @@ msgid "Polish"
msgstr "Polski"
#: libraries/classes/Charsets.php:523
#, fuzzy
#| msgid "Romanian"
msgctxt "Collation"
msgid "Romanian"
msgstr "Rumuński"
@ -3503,15 +3479,11 @@ msgid "Sinhalese"
msgstr "Cejloński"
#: libraries/classes/Charsets.php:531
#, fuzzy
#| msgid "Slovak"
msgctxt "Collation"
msgid "Slovak"
msgstr "Słowacki"
#: libraries/classes/Charsets.php:535
#, fuzzy
#| msgid "Slovenian"
msgctxt "Collation"
msgid "Slovenian"
msgstr "Słoweński"
@ -3557,8 +3529,6 @@ msgid "multi-level"
msgstr "wielopoziomowy"
#: libraries/classes/Charsets.php:647
#, fuzzy
#| msgid "Binary"
msgctxt "Collation variant"
msgid "binary"
msgstr "Binarne"
@ -7235,7 +7205,7 @@ msgstr "Serwer nie odpowiada."
#: libraries/classes/DatabaseInterface.php:2209
msgid "Logout and try as another user."
msgstr ""
msgstr "Wyloguj się i spróbuj jako inny użytkownik."
#: libraries/classes/DatabaseInterface.php:2215
msgid "Please check privileges of directory containing database."
@ -10381,7 +10351,7 @@ msgstr "Zarejestruj się na uwierzytelnianiu"
#: libraries/classes/Plugins/TwoFactor/Simple.php:66
msgid "For testing purposes only!"
msgstr ""
msgstr "Tylko do celów testowych!"
#: libraries/classes/Plugins/TwoFactorPlugin.php:74
#, fuzzy, php-format
@ -15215,8 +15185,6 @@ msgid "+ Add column"
msgstr "Dodaj kolumnę"
#: templates/database/multi_table_query/form.twig:160
#, fuzzy
#| msgid "Update Query"
msgid "Update query"
msgstr "Zaktualizuj zapytanie"
@ -15234,8 +15202,6 @@ msgid "Server variables and settings"
msgstr "Zmienne i ustawienia serwera"
#: templates/server/sub_page_header.twig:2
#, fuzzy
#| msgid "Storage Engines"
msgid "Storage engines"
msgstr "Mechanizmy składowania"
@ -15371,8 +15337,6 @@ msgstr "Kontynuuj wstawianie %s wierszy"
#: templates/table/tracking/structure_snapshot_columns.twig:5
#: templates/table/tracking/report_table.twig:4
#, fuzzy
#| msgid "#"
msgctxt "Number"
msgid "#"
msgstr "#"
@ -16209,7 +16173,7 @@ msgstr "Brakuje tabel przechowujących konfigurację phpMyAdmin"
#: templates/prefs_twofactor.twig:33
msgid "You have enabled two factor authentication."
msgstr ""
msgstr "Aktywowałeś podwójną weryfikację."
#: templates/table/browse_foreigners/column_element.twig:4
msgid "Use this value"

View File

@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2018-05-28 21:06-0300\n"
"PO-Revision-Date: 2018-03-18 15:40+0000\n"
"Last-Translator: Nuno Marques <nunosil@gmail.com>\n"
"PO-Revision-Date: 2018-07-23 10:52+0000\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: Portuguese <https://hosted.weblate.org/projects/phpmyadmin/"
"master/pt/>\n"
"Language: pt\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.20-dev\n"
"X-Generator: Weblate 3.1-dev\n"
#: ajax.php:22 ajax.php:51 export.php:206 libraries/classes/Export.php:1150
msgid "Bad type!"
@ -3679,10 +3679,8 @@ msgstr ""
"CodeMirror seja ativado."
#: libraries/classes/Config/Descriptions.php:129
#, fuzzy
#| msgid "Enable SQL Validator"
msgid "Enable linter"
msgstr "Activar SQL Validator"
msgstr "Activar Validador de SQL"
#: libraries/classes/Config/Descriptions.php:132
msgid ""
@ -3806,10 +3804,8 @@ msgid "Whether the table structure actions should be hidden."
msgstr "Se as acções da estrutura da tabela devem ser escondidas."
#: libraries/classes/Config/Descriptions.php:191
#, fuzzy
#| msgid "Table comments"
msgid "Show column comments"
msgstr "Comentários da tabela"
msgstr "Mostrar comentários da coluna"
#: libraries/classes/Config/Descriptions.php:193
msgid "Whether column comments should be shown in table structure view"
@ -3840,54 +3836,41 @@ msgid ""
"Values for options list for default transformations. These will be "
"overwritten if transformation is filled in at table structure page."
msgstr ""
"Valores para a lista de opções de transformações padrão. Estas serão "
"substituídas se a transformação for preenchida na pagina da estrutura da "
"tabela."
#: libraries/classes/Config/Descriptions.php:201
#, fuzzy
#| msgid "Transformation options"
msgid "Default transformations for Substring"
msgstr "Opções de tranformação"
msgstr "Transformações para Substrings padrão"
#: libraries/classes/Config/Descriptions.php:205
#, fuzzy
#| msgid "Default sorting order"
msgid "Default transformations for Bool2Text"
msgstr "Ordenação padrão"
msgstr "Transformações para Bool2Text padrão"
#: libraries/classes/Config/Descriptions.php:209
#, fuzzy
#| msgid "Default sorting order"
msgid "Default transformations for External"
msgstr "Ordenação padrão"
msgstr "Transformações para External padrão"
#: libraries/classes/Config/Descriptions.php:213
#, fuzzy
#| msgid "Transformation options"
msgid "Default transformations for PreApPend"
msgstr "Opções de tranformação"
msgstr "Transformações para PreApPend padrão"
#: libraries/classes/Config/Descriptions.php:217
#, fuzzy
#| msgid "Default sorting order"
msgid "Default transformations for DateFormat"
msgstr "Ordenação padrão"
msgstr "Transformações para DateFormat padrão"
#: libraries/classes/Config/Descriptions.php:221
#, fuzzy
#| msgid "Transformation options"
msgid "Default transformations for Inline"
msgstr "Opções de tranformação"
msgstr "Transformações para Inline padrão"
#: libraries/classes/Config/Descriptions.php:225
#, fuzzy
#| msgid "Transformation options"
msgid "Default transformations for TextImageLink"
msgstr "Opções de tranformação"
msgstr "Transformações para TextImageLink padrão"
#: libraries/classes/Config/Descriptions.php:229
#, fuzzy
#| msgid "Transformation options"
msgid "Default transformations for TextLink"
msgstr "Opções de tranformação"
msgstr "Transformações para TextLink padrão"
#: libraries/classes/Config/Descriptions.php:234
msgid "Show server listing as a list instead of a drop down."
@ -3924,10 +3907,9 @@ msgstr "Tempo máximo de execução"
#: libraries/classes/Config/Descriptions.php:253
#: templates/display/export/options_output.twig:17
#, fuzzy, php-format
#| msgid "Statements"
#, php-format
msgid "Use %s statement"
msgstr "Itens"
msgstr "Use a instrução %s"
#: libraries/classes/Config/Descriptions.php:256 prefs_manage.php:311
msgid "Save as file"
@ -4070,8 +4052,6 @@ msgstr "Tipo MIME"
#: libraries/classes/Config/Descriptions.php:316
#: libraries/classes/Config/Descriptions.php:340
#: libraries/classes/Config/Descriptions.php:405
#, fuzzy
#| msgid "Relations"
msgid "Relationships"
msgstr "Relações"
@ -4092,10 +4072,8 @@ msgid "Overwrite existing file(s)"
msgstr "Substituir o(s) ficheiro(s) existente(s)"
#: libraries/classes/Config/Descriptions.php:348
#, fuzzy
#| msgid "horizontal (rotated headers)"
msgid "Export as separate files"
msgstr "horizontal (cabeçalhos rodados)"
msgstr "Exportar como ficheiros separados"
#: libraries/classes/Config/Descriptions.php:354
msgid "Remember file name template"
@ -7061,7 +7039,7 @@ msgstr "Único"
#: libraries/classes/Controllers/Table/TableStructureController.php:1240
#: templates/columns_definitions/column_indexes.twig:20
msgid "Spatial"
msgstr ""
msgstr "Espacial"
#: libraries/classes/Controllers/Table/TableStructureController.php:1236
#: libraries/classes/Controllers/Table/TableStructureController.php:1241
@ -9683,10 +9661,8 @@ msgstr "Data de Criação"
#: libraries/classes/Plugins/Export/ExportLatex.php:226
#: libraries/classes/Plugins/Export/ExportSql.php:708
#: libraries/classes/Plugins/Export/ExportXml.php:249
#, fuzzy
#| msgid "PHP Version"
msgid "PHP Version:"
msgstr "versão do PHP"
msgstr "versão do PHP:"
#: libraries/classes/Plugins/Export/ExportLatex.php:256
#: libraries/classes/Plugins/Export/ExportSql.php:897
@ -10506,8 +10482,6 @@ msgid "not OK"
msgstr "não está OK"
#: libraries/classes/Relation.php:111
#, fuzzy
#| msgid "OK"
msgctxt "Correctly working"
msgid "OK"
msgstr "OK"
@ -11103,8 +11077,6 @@ msgid "Start"
msgstr "Estado"
#: libraries/classes/Rte/Events.php:538
#, fuzzy
#| msgid "End"
msgctxt "End of recurring event"
msgid "End"
msgstr "Fim"
@ -11354,8 +11326,6 @@ msgid "Trigger name"
msgstr "Nome do Utilizador"
#: libraries/classes/Rte/Triggers.php:408
#, fuzzy
#| msgid "Time"
msgctxt "Trigger action time"
msgid "Time"
msgstr "Tempo"
@ -11777,8 +11747,6 @@ msgid "Global privileges"
msgstr "Privilégios Globais"
#: libraries/classes/Server/Privileges.php:1165
#, fuzzy
#| msgid "global"
msgid "Global"
msgstr "global"
@ -14722,8 +14690,6 @@ msgid "Input transformation"
msgstr "Transformação do navegador"
#: transformation_overview.php:58
#, fuzzy
#| msgid "Description"
msgctxt "for MIME transformation"
msgid "Description"
msgstr "Descrição"
@ -14782,8 +14748,6 @@ msgid "Author"
msgstr "Autor"
#: templates/server/plugins/section.twig:23
#, fuzzy
#| msgid "Disabled"
msgid "disabled"
msgstr "Desactidado"
@ -15086,8 +15050,6 @@ msgid "Inside column:"
msgstr "Dentro da coluna:"
#: templates/columns_definitions/column_default.twig:3
#, fuzzy
#| msgid "None"
msgctxt "for default"
msgid "None"
msgstr "Nenhum"
@ -15341,8 +15303,6 @@ msgid "+ Add column"
msgstr "Adiciona novo campo"
#: templates/database/multi_table_query/form.twig:160
#, fuzzy
#| msgid "Update Query"
msgid "Update query"
msgstr "Atualizar consulta"
@ -15517,8 +15477,6 @@ msgstr ""
#: templates/table/tracking/structure_snapshot_columns.twig:47
#: templates/table/structure/table_structure_row.twig:34
#, fuzzy
#| msgid "None"
msgctxt "None for default"
msgid "None"
msgstr "Nenhum"
@ -15708,14 +15666,10 @@ msgid "During current session"
msgstr "Durante a sessão atual"
#: templates/console/display.twig:64
#, fuzzy
#| msgid "Ascending"
msgid "ascending"
msgstr "Ascendente"
#: templates/console/display.twig:64
#, fuzzy
#| msgid "Descending"
msgid "descending"
msgstr "Descendente"
@ -16310,8 +16264,6 @@ msgid "Bar"
msgstr "Mar"
#: templates/table/chart/tbl_chart.twig:19
#, fuzzy
#| msgid "Column"
msgctxt "Chart type"
msgid "Column"
msgstr "Coluna"
@ -16904,8 +16856,6 @@ msgstr ""
#: templates/privileges/column_privileges.twig:21
#: templates/privileges/column_privileges.twig:22
#, fuzzy
#| msgid "None"
msgctxt "None privileges"
msgid "None"
msgstr "Nenhum"
@ -17280,9 +17230,8 @@ msgid "The current query cache hit rate of %s%% is below 20%%"
msgstr ""
#: libraries/advisory_rules.txt:167
#, fuzzy
msgid "Query Cache usage"
msgstr "Tipo de Query"
msgstr "Utilização da cache de comandos"
#: libraries/advisory_rules.txt:170
#, php-format

9931
po/ro.po

File diff suppressed because it is too large Load Diff

View File

@ -4,17 +4,17 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2018-05-28 21:06-0300\n"
"PO-Revision-Date: 2018-04-16 18:41+0000\n"
"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
"PO-Revision-Date: 2018-07-27 08:20+0000\n"
"Last-Translator: Wolterhon <hotmottot.1@gmail.com>\n"
"Language-Team: Russian <https://hosted.weblate.org/projects/phpmyadmin/"
"master/ru/>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 3.0-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 3.1-dev\n"
#: ajax.php:22 ajax.php:51 export.php:206 libraries/classes/Export.php:1150
msgid "Bad type!"
@ -4786,7 +4786,7 @@ msgstr "Отображать логотип в панели навигации."
#: libraries/classes/Config/Descriptions.php:784
msgid "Display logo"
msgstr "Выводить логотип"
msgstr "Показывать логотип"
#: libraries/classes/Config/Descriptions.php:786
msgid "URL where logo in the navigation panel will point to."
@ -4794,7 +4794,7 @@ msgstr "URL, на который будет ссылаться логотип в
#: libraries/classes/Config/Descriptions.php:788
msgid "Logo link URL"
msgstr "URL ссылка логотипа"
msgstr "Ссылка логотипа"
#: libraries/classes/Config/Descriptions.php:791
msgid ""
@ -15357,7 +15357,7 @@ msgstr "Сделать закладку общедоступной"
#: templates/console/display.twig:140
msgid "Set default"
msgstr "Установить изначальное значение"
msgstr "Сбросить настройки"
#: templates/console/display.twig:162
msgid ""

View File

@ -7,22 +7,20 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 5.0.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2018-05-28 21:06-0300\n"
"PO-Revision-Date: 2015-10-15 11:03+0200\n"
"PO-Revision-Date: 2018-07-23 11:06+0000\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: Uighur <https://hosted.weblate.org/projects/phpmyadmin/master/"
"Language-Team: Uyghur <https://hosted.weblate.org/projects/phpmyadmin/master/"
"ug/>\n"
"Language: ug\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 2.5-dev\n"
"X-Generator: Weblate 3.1-dev\n"
#: ajax.php:22 ajax.php:51 export.php:206 libraries/classes/Export.php:1150
#, fuzzy
#| msgid "Bar type"
msgid "Bad type!"
msgstr "چىقىرىش"
msgstr "بوزۇق تىپ!"
#: changelog.php:41 license.php:36
#, php-format
@ -345,10 +343,8 @@ msgstr ""
"%sبۇ يەرنى كۆرۈڭ%s."
#: db_qbe.php:134
#, fuzzy
#| msgid "You have to choose at least one column to display"
msgid "You have to choose at least one column to display!"
msgstr "بۇنى بىجىرىش ئۈچۈن مەزمۇن تاللانغان بولۇشى كېرەك"
msgstr "ئەڭ ئاز بىرقۇرنى كۆرسىتىشكە تاللىشىڭىز كېرەك!"
#: db_qbe.php:152
#, php-format
@ -360,7 +356,7 @@ msgstr ""
#: libraries/classes/Plugins/Auth/AuthenticationHttp.php:86
#: libraries/classes/Plugins/AuthenticationPlugin.php:186
msgid "Access denied!"
msgstr "رەت قىلىندى"
msgstr "زىيارەت رەت قىلىندى!"
#: db_tracking.php:59 db_tracking.php:84
#, fuzzy
@ -3805,7 +3801,7 @@ msgstr ""
#: libraries/classes/Config/Descriptions.php:66
msgid "Allow login to any MySQL server"
msgstr ""
msgstr "ھەرقانداق MySQL مۇلازىمىتىرىگە كىرىشكە قوشۇل"
#: libraries/classes/Config/Descriptions.php:69
msgid ""
@ -3815,10 +3811,8 @@ msgid ""
msgstr ""
#: libraries/classes/Config/Descriptions.php:74
#, fuzzy
#| msgid "Cannot log in to the MySQL server"
msgid "Restrict login to MySQL server"
msgstr "MySQL مۇلازىمىتېرىغا ئۇلىنالمىدى."
msgstr "MySQL مۇلازىمىتېرىغا كىرىشنى چەكلە."
#: libraries/classes/Config/Descriptions.php:77
msgid ""

File diff suppressed because it is too large Load Diff

View File

@ -54,7 +54,7 @@
</td>
<td class="center">
{# column collation #}
{{ Charsets_getCollationDropdownBox(
{{ get_collation_dropdown_box(
dbi,
disable_is,
'field_collation[' ~ column_number ~ ']',

View File

@ -1,7 +1,7 @@
<form method="post" action="{{ action }}" class="
{{- action == 'tbl_create.php' ? 'create_table' : 'append_fields' -}}
_form ajax lock-page">
{{ Url_getHiddenInputs(form_params) }}
{{ get_hidden_inputs(form_params) }}
{# happens when an index has been set on a column #}
{# and a column is added to the table creation dialog #}
{# This contains a JSON-encoded string #}
@ -75,12 +75,12 @@
<td width="25">&nbsp;</td>
<th>
{% trans 'Storage Engine:' %}
{{ Util_showMySQLDocu('Storage_engines') }}
{{ show_mysql_docu('Storage_engines') }}
</th>
<td width="25">&nbsp;</td>
<th>
{% trans 'Connection:' %}
{{ Util_showMySQLDocu('federated-create-connection') }}
{{ show_mysql_docu('federated-create-connection') }}
</th>
</tr>
<tr>
@ -94,7 +94,7 @@
</td>
<td width="25">&nbsp;</td>
<td>
{{ Charsets_getCollationDropdownBox(
{{ get_collation_dropdown_box(
dbi,
disable_is,
'tbl_collation',
@ -105,7 +105,7 @@
</td>
<td width="25">&nbsp;</td>
<td>
{{ StorageEngine_getHtmlSelect(
{{ get_html_select(
'tbl_storage_engine',
null,
tbl_storage_engine
@ -126,7 +126,7 @@
<tr class="vtop">
<th colspan="5">
{% trans 'PARTITION definition:' %}
{{ Util_showMySQLDocu('Partitioning') }}
{{ show_mysql_docu('Partitioning') }}
</th>
</tr>
<tr>

View File

@ -4,5 +4,5 @@
{%- if column_meta['column_status'] is defined and not column_meta['column_status']['isEditable'] -%}
disabled="disabled"
{%- endif %}>
{{ Util_getSupportedDatatypes(true, type_upper) }}
{{ get_supported_datatypes(true, type_upper) }}
</select>

View File

@ -9,7 +9,7 @@
{% for mi in 0..move_columns|length - 1 %}
<option value="{{ move_columns[mi].name }}"
{{- current_index == mi or current_index == mi + 1 ? ' disabled="disabled"' }}>
{{ 'after %s'|trans|format(Util_backquote(move_columns[mi].name|e)) }}
{{ 'after %s'|trans|format(backquote(move_columns[mi].name|e)) }}
</option>
{% endfor %}
</select>

View File

@ -46,7 +46,7 @@
<td>
<select name="subpartition_by" id="subpartition_by">
{% for option in sub_partition_options %}
<option value="<?= $option?>"
<option value="{{ option }}"
{%- if partition_details['subpartition_by'] == option %}
selected="selected"
{%- endif %}>
@ -134,7 +134,7 @@
</td>
{% endif %}
<td>
{{ StorageEngine_getHtmlSelect(
{{ get_html_select(
subpartition['prefix'] ~ '[engine]',
null,
subpartition['engine'],

View File

@ -2,7 +2,7 @@
<table id="table_columns" class="noclick">
<caption class="tblHeaders">
{% trans 'Structure' %}
{{ Util_showMySQLDocu('CREATE_TABLE') }}
{{ show_mysql_docu('CREATE_TABLE') }}
</caption>
<tr>
<th>
@ -10,15 +10,15 @@
</th>
<th>
{% trans 'Type' %}
{{ Util_showMySQLDocu('data-types') }}
{{ show_mysql_docu('data-types') }}
</th>
<th>
{% trans 'Length/Values' %}
{{ Util_showHint('If column type is "enum" or "set", please enter the values using this format: \'a\',\'b\',\'c\'…<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, precede it with a backslash (for example \'\\\\xyz\' or \'a\\\'b\').'|trans) }}
{{ show_hint('If column type is "enum" or "set", please enter the values using this format: \'a\',\'b\',\'c\'…<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, precede it with a backslash (for example \'\\\\xyz\' or \'a\\\'b\').'|trans) }}
</th>
<th>
{% trans 'Default' %}
{{ Util_showHint('For default values, please enter just a single value, without backslash escaping or quotes, using this format: a'|trans) }}
{{ show_hint('For default values, please enter just a single value, without backslash escaping or quotes, using this format: a'|trans) }}
</th>
<th>
{% trans 'Collation' %}
@ -34,7 +34,7 @@
{% if change_column is defined and change_column is not empty %}
<th>
{% trans 'Adjust privileges' %}
{{ Util_showDocu('faq', 'faq6-39') }}
{{ show_docu('faq', 'faq6-39') }}
</th>
{% endif %}
@ -72,7 +72,7 @@
</th>
<th>
<a href="transformation_overview.php
{{- Url_getCommon() }}#transformation" title="
{{- get_common() }}#transformation" title="
{%- trans 'List of available transformations and their options' -%}
" target="_blank">
{% trans 'Browser display transformation' %}
@ -80,10 +80,10 @@
</th>
<th>
{% trans 'Browser display transformation options' %}
{{ Util_showHint('Please enter the values for transformation options using this format: \'a\', 100, b,\'c\'…<br />If you ever need to put a backslash ("\\") or a single quote ("\'") amongst those values, precede it with a backslash (for example \'\\\\xyz\' or \'a\\\'b\').'|trans) }}
{{ show_hint('Please enter the values for transformation options using this format: \'a\', 100, b,\'c\'…<br />If you ever need to put a backslash ("\\") or a single quote ("\'") amongst those values, precede it with a backslash (for example \'\\\\xyz\' or \'a\\\'b\').'|trans) }}
</th>
<th>
<a href="transformation_overview.php<?= PhpMyAdmin\Url::getCommon(); ?>#input_transformation"
<a href="transformation_overview.php{{ get_common() }}#input_transformation"
title="{% trans 'List of available transformations and their options' %}"
target="_blank">
{% trans 'Input transformation' %}
@ -91,7 +91,7 @@
</th>
<th>
{% trans 'Input transformation options' %}
{{ Util_showHint('Please enter the values for transformation options using this format: \'a\', 100, b,\'c\'…<br />If you ever need to put a backslash ("\\") or a single quote ("\'") amongst those values, precede it with a backslash (for example \'\\\\xyz\' or \'a\\\'b\').'|trans) }}
{{ show_hint('Please enter the values for transformation options using this format: \'a\', 100, b,\'c\'…<br />If you ever need to put a backslash ("\\") or a single quote ("\'") amongst those values, precede it with a backslash (for example \'\\\\xyz\' or \'a\\\'b\').'|trans) }}
</th>
{% endif %}
</tr>

View File

@ -9,11 +9,11 @@
and mime_map[column_meta['Field']][type] matches
'@' ~ available_mime[type ~ '_file_quoted'][mimekey] ~ '3?@i'
? 'selected ' %}
{% set tooltip = Transformations_getDescription(
{% set tooltip = get_description(
available_mime[type ~ '_file'][mimekey]
) %}
{% set parts = transform|split(':') %}
{% set name = Transformations_getName(
{% set name = get_name(
available_mime[type ~ '_file'][mimekey]
) ~ ' (' ~ parts[0]|lower ~ ':' ~ parts[1] ~ ')' %}
<option value="{{ available_mime[type ~ '_file'][mimekey] }}"

View File

@ -1,6 +1,6 @@
<div id="div_create_version">
<form method="post" action="{{ url_query|raw }}">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
{% for selected_table in selected %}
<input type="hidden" name="selected[]" value="{{ selected_table }}">
{% endfor %}

View File

@ -5,7 +5,7 @@
</a>
<form id="add_new" class="new_central_col{{ (total_rows != 0) ? ' hide' : ''}}"
method="post" action="db_central_columns.php">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<input type="hidden" name="add_new_column" value="add_new_column">
<div class="responsivetable">
<table>
@ -91,7 +91,7 @@
} only %}
</td>
<td name="collation" class="nowrap">
{{ Charsets_getCollationDropdownBox(
{{ get_collation_dropdown_box(
dbi,
disableIs,
'field_collation[0]',
@ -147,7 +147,7 @@
{% if pos - max_rows >= 0 %}
<td>
<form action="db_central_columns.php" method="post">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<input type="hidden" name="pos" value="{{ pos - max_rows }}" />
<input type="hidden" name="total_rows" value="{{ total_rows }}"/>
<input type="submit" name="navig" class="ajax" value="&lt" />
@ -157,7 +157,7 @@
{% if tn_nbTotalPage > 1 %}
<td>
<form action="db_central_columns.php" method="post">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<input type="hidden" name="total_rows" value="{{ total_rows }}"/>
{{ tn_page_selector | raw }}
</form>
@ -166,7 +166,7 @@
{% if pos + max_rows < total_rows %}
<td>
<form action="db_central_columns.php" method="post">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<input type="hidden" name="pos" value="{{ pos + max_rows }}"/>
<input type="hidden" name="total_rows" value="{{ total_rows }}"/>
<input type="submit" name="navig" class="ajax" value="&gt" />
@ -189,9 +189,9 @@
<tr>
<td class="navigation_separator largescreenonly"></td>
<td class="central_columns_navigation">
{{ Util_getIcon('centralColumns_add', 'Add column' | trans)|raw }}
{{ get_icon('centralColumns_add', 'Add column' | trans)|raw }}
<form id="add_column" action="db_central_columns.php" method="post">
{{ Url_getHiddenInputs(db) | raw }}
{{ get_hidden_inputs(db) | raw }}
<input type="hidden" name="add_column" value="add">
<input type="hidden" name="pos" value="{{ pos }}" />
<input type="hidden" name="total_rows" value="{{ total_rows }}"/>
@ -215,7 +215,7 @@
</table>
{% if total_rows > 0 %}
<form method="post" id="del_form" action="db_central_columns.php">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<input id="del_col_name" type="hidden" name="col_name" value="">
<input type="hidden" name="pos" value="{{ pos }}">
<input type="hidden" name="delete_save" value="delete">
@ -269,17 +269,17 @@
{% for row in rows_list %}
{# getHtmlForTableRow #}
<tr data-rownum="{{ row_num }}" id="{{ 'f_' ~ row_num }}">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<input type="hidden" name="edit_save" value="save">
<td class="nowrap">
<input type="checkbox" class="checkall" name="selected_fld[]"
value="{{ row['col_name'] | raw }}" id="{{ 'checkbox_row_' ~ row_num }}"/>
</td>
<td id="{{ 'edit_' ~ row_num }}" class="edit center">
<a href="#"> {{ Util_getIcon('b_edit', 'Edit' | trans) | raw }}</a>
<a href="#"> {{ get_icon('b_edit', 'Edit' | trans) | raw }}</a>
</td>
<td class="del_row" data-rownum = "{{ row_num }}">
<a hrf="#">{{ Util_getIcon('b_drop', 'Delete' | trans) }}</a>
<a hrf="#">{{ get_icon('b_drop', 'Delete' | trans) }}</a>
<input type="submit" data-rownum = "{{ row_num }}" class="edit_cancel_form" value="Cancel">
</td>
<td id="{{ 'save_' ~ row_num }}" class="hide">
@ -338,7 +338,7 @@
</td>
<td name="collation" class="nowrap">
<span>{{ row['col_collation'] | raw }}</span>
{{ Charsets_getCollationDropdownBox(
{{ get_collation_dropdown_box(
dbi,
disableIs,
'field_collation[' ~ row_num ~ ']',
@ -391,14 +391,14 @@
'text_dir' : text_dir,
'form_name' : 'tableslistcontainer',
} only %}
{{ Util_getButtonOrImage(
{{ get_button_or_image(
'edit_central_columns',
'mult_submit change_central_columns',
'Edit' | trans,
'b_edit',
'edit central columns'
) | raw }}
{{ Util_getButtonOrImage(
{{ get_button_or_image(
'delete_central_columns',
'mult_submit',
'Delete' | trans,

View File

@ -1,12 +1,12 @@
<form id="create_table_form_minimal" method="post" action="tbl_create.php" class="lock-page">
<fieldset>
<legend>
{% if Util_showIcons('ActionLinksMode') -%}
{{ Util_getImage('b_table_add') }}
{% if show_icons('ActionLinksMode') -%}
{{ get_image('b_table_add') }}
{%- endif %}
{% trans "Create table" %}
</legend>
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<div class="formelement">
{% trans "Name" %}:
<input type="text" name="table" maxlength="64" size="30" required="required" />

View File

@ -57,14 +57,14 @@
</thead>
<tbody id="id_tbody_{{ t_n_url|url_encode }}"
{{- tab_pos[t_n] is defined and tab_pos[t_n]['V'] is empty ? ' style="display: none"' }}>
{% set display_field = Relation_getDisplayField(get_db, table_names_small[i]) %}
{% set display_field = get_display_field(get_db, table_names_small[i]) %}
{% for j in 0..tab_column[t_n]['COLUMN_ID']|length - 1 %}
{% set tmp_column = t_n ~ '.' ~ tab_column[t_n]['COLUMN_NAME'][j] %}
{% set click_field_param = [
table_names_small_url[i],
tab_column[t_n]['COLUMN_NAME'][j]|url_encode
] %}
{% if not Util_isForeignKeySupported(table_types[i]) %}
{% if not is_foreign_key_supported(table_types[i]) %}
{% set click_field_param = click_field_param|merge([tables_pk_or_unique_keys[tmp_column] is defined ? 1 : 0]) %}
{% else %}
{# if foreign keys are supported, it's not necessary that the

View File

@ -1,5 +1,5 @@
<form action="db_designer.php" method="post" name="edit_delete_pages" id="edit_delete_pages" class="ajax">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<fieldset id="page_edit_delete_options">
<input type="hidden" name="operation" value="{{ operation }}" />
<label for="selected_page">

View File

@ -110,7 +110,7 @@ var designer_config = {{ designer_config | raw }};
{% trans 'Reload' %}
</span>
</a>
<a href="{{ Util_getDocuLink('faq', 'faq6-31') }}"
<a href="{{ get_docu_link('faq', 'faq6-31') }}"
target="documentation"
class="M_butt">
<img title="{% trans 'Help' %}"
@ -1130,7 +1130,7 @@ var designer_config = {{ designer_config | raw }};
<form method="post" action="db_qbe.php" id="vqb_form">
<textarea cols="80" name="sql_query" id="textSqlquery" rows="15"></textarea>
<input type="hidden" name="submit_sql" value="true">
{{ Url_getHiddenInputs(get_db) }}
{{ get_hidden_inputs(get_db) }}
</form>
</div>
{% endif %}

View File

@ -1,5 +1,5 @@
<form action="db_designer.php" method="post" name="save_as_pages" id="save_as_pages" class="ajax">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<fieldset id="page_save_as_options">
<table>
<tbody>
@ -14,7 +14,7 @@
</tr>
<tr>
<td>
{{ Util_getRadioFields(
{{ get_radio_fields(
'save_page',
{
'same': 'Save to selected page'|trans,

View File

@ -1,9 +1,9 @@
<form method="post" action="schema_export.php" class="disableAjax" id="id_export_pages">
<fieldset>
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<label>{% trans 'Select Export Relational Type' %}</label>
{{ Plugins_getChoice('Schema', 'export_type', export_list, 'format') }}
{{ get_choice('Schema', 'export_type', export_list, 'format') }}
<input type="hidden" name="page_number" value="{{ page }}" />
{{ Plugins_getOptions('Schema', export_list) }}
{{ get_options('Schema', export_list) }}
</fieldset>
</form>

View File

@ -1,4 +1,4 @@
{{ Util_getDivForSliderEffect('query_div', 'Query window'|trans, 'open') }}
{{ get_div_for_slider_effect('query_div', 'Query window'|trans, 'open') }}
<form action="" id="query_form">
<input type="hidden" id="db_name" value="{{ db }}">
<fieldset>

View File

@ -1,6 +1,6 @@
<a id="db_search"></a>
<form id="db_search_form" method="post" action="db_search.php" name="db_search" class="ajax lock-page">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<fieldset>
<legend>{% trans 'Search in database' %}</legend>
<p>
@ -16,7 +16,7 @@
{# 4th parameter set to true to add line breaks #}
{# 5th parameter set to false to avoid htmlspecialchars() escaping
in the label since we have some HTML in some labels #}
{{ Util_getRadioFields(
{{ get_radio_fields(
'criteriaSearchType',
choices,
criteria_search_type,

View File

@ -28,7 +28,7 @@
<td>
<a name="browse_search"
class="ajax browse_results"
href="sql.php{{ Url_getCommon(url_params) }}"
href="sql.php{{ get_common(url_params) }}"
data-browse-sql="{{ row.new_search_sqls.select_columns }}"
data-table-name="{{ row.table }}">
{% trans 'Browse' %}
@ -37,7 +37,7 @@
<td>
<a name="delete_search"
class="ajax delete_results"
href="sql.php{{ Url_getCommon(url_params) }}"
href="sql.php{{ get_common(url_params) }}"
data-delete-sql="{{ row.new_search_sqls.delete }}"
data-table-name="{{ row.table }}">
{% trans 'Delete' %}

View File

@ -5,7 +5,7 @@
{% set num_tables_trans -%}
{% trans %}%s table{% plural num_tables %}%s tables{% endtrans %}
{%- endset %}
{{ num_tables_trans|format(Util_formatNumber(num_tables, 0)) }}
{{ num_tables_trans|format(format_number(num_tables, 0)) }}
</th>
{% if server_slave_status %}
<th>{% trans 'Replication' %}</th>
@ -15,7 +15,7 @@
{% set sum_colspan = sum_colspan - 1 %}
{% endif %}
<th colspan="{{ sum_colspan }}" class="print_ignore">{% trans 'Sum' %}</th>
{% set row_count_sum = Util_formatNumber(sum_entries, 0) %}
{% set row_count_sum = format_number(sum_entries, 0) %}
{# If a table shows approximate rows count, display update-all-real-count anchor. #}
{% set row_sum_url = [] %}
{% if approx_rows is defined %}
@ -29,7 +29,7 @@
{% if approx_rows %}
{% set cell_text -%}
<a href="db_structure.php
{{- Url_getCommon(row_sum_url) }}" class="ajax row_count_sum">~
{{- get_common(row_sum_url) }}" class="ajax row_count_sum">~
{{- row_count_sum -}}
</a>
{%- endset %}
@ -51,7 +51,7 @@
</th>
<th>
{% if db_collation is not empty %}
<dfn title="{{ Charsets_getCollationDescr(db_collation) }} ({% trans 'Default' %})">
<dfn title="{{ get_collation_descr(db_collation) }} ({% trans 'Default' %})">
{{ db_collation }}
</dfn>
{% endif %}
@ -59,12 +59,12 @@
{% endif %}
{% if is_show_stats %}
{% set sum = Util_formatByteDown(sum_size, 3, 1) %}
{% set sum = format_byte_down(sum_size, 3, 1) %}
{% set sum_formatted = sum[0] %}
{% set sum_unit = sum[1] %}
<th class="value tbl_size">{{ sum_formatted }} {{ sum_unit }}</th>
{% set overhead = Util_formatByteDown(overhead_size, 3, 1) %}
{% set overhead = format_byte_down(overhead_size, 3, 1) %}
{% set overhead_formatted = overhead[0] %}
{% set overhead_unit = overhead[1] %}
<th class="value tbl_overhead">{{ overhead_formatted }} {{ overhead_unit }}</th>

View File

@ -1,6 +1,6 @@
<a id="{{ table_name_hash }}_favorite_anchor"
class="ajax favorite_table_anchor"
href="db_structure.php{{ Url_getCommon(fav_params) }}"
href="db_structure.php{{ get_common(fav_params) }}"
title="{{ already_favorite ? 'Remove from Favorites'|trans : 'Add to Favorites'|trans }}"
data-favtargets="{{ db_table_name_hash }}" >
{{ already_favorite ? titles['Favorite']|raw : titles['NoFavorite']|raw }}

View File

@ -1,8 +1,8 @@
<p class="print_ignore">
<a href="#" id="printView">
{{ Util_getIcon('b_print', 'Print'|trans, true) }}
{{ get_icon('b_print', 'Print'|trans, true) }}
</a>
<a href="db_datadict.php{{ url_query }}" target="print_view">
{{ Util_getIcon('b_tblanalyse', 'Data dictionary'|trans, true) }}
{{ get_icon('b_tblanalyse', 'Data dictionary'|trans, true) }}
</a>
</p>

View File

@ -10,8 +10,8 @@
<tbody>
{% for object in db_objects %}
<tr>
<td><strong>{{ Core_mimeDefaultFunction(object) }}</strong></td>
<td>{{ Core_mimeDefaultFunction(dbi.getTable(db, object).showCreate()) }}</td>
<td><strong>{{ object|mime_default_function }}</strong></td>
<td>{{ dbi.getTable(db, object).showCreate()|mime_default_function }}</td>
</tr>
{% endfor %}
</tbody>

View File

@ -14,8 +14,8 @@
</th>
{% if server_slave_status %}
<td class="center">
{{ ignored ? Util_getImage('s_cancel', 'Not replicated'|trans) }}
{{ do ? Util_getImage('s_success', 'Replicated'|trans) }}
{{ ignored ? get_image('s_cancel', 'Not replicated'|trans) }}
{{ do ? get_image('s_success', 'Replicated'|trans) }}
</td>
{% endif %}
@ -81,14 +81,14 @@
{% if current_table['TABLE_ROWS'] is defined
and (current_table['ENGINE'] != null or table_is_view) %}
{# Get the row count #}
{% set row_count = Util_formatNumber(current_table['TABLE_ROWS'], 0) %}
{% set row_count = format_number(current_table['TABLE_ROWS'], 0) %}
{# Content to be appended into 'tbl_rows' cell.
If row count is approximate, display it as an anchor to get real count. #}
<td class="value tbl_rows"
data-table="{{ current_table['TABLE_NAME'] }}">
{% if approx_rows %}
<a href="db_structure.php{{ Url_getCommon({
<a href="db_structure.php{{ get_common({
'ajax_request': true,
'db': db,
'table': current_table['TABLE_NAME'],

View File

@ -1,11 +1,11 @@
<form method="post" action="db_structure.php" name="tablesForm" id="tablesForm">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<div class="responsivetable">
<table id="structureTable" class="data">
<thead>
<tr>
<th class="print_ignore"></th>
<th>{{ Util_sortableTableHeader('Table'|trans, 'table') }}</th>
<th>{{ sortable_table_header('Table'|trans, 'table') }}</th>
{% if replication %}
<th>{% trans 'Replication' %}</th>
{% endif %}
@ -23,44 +23,42 @@
</th>
{# larger values are more interesting so default sort order is DESC #}
<th>
{{ Util_sortableTableHeader('Rows'|trans, 'records', 'DESC') }}
{{ Util_showHint(Sanitize_sanitize(
'May be approximate. Click on the number to get the exact count. See [doc@faq3-11]FAQ 3.11[/doc].'|trans
)) }}
{{ sortable_table_header('Rows'|trans, 'records', 'DESC') }}
{{ show_hint('May be approximate. Click on the number to get the exact count. See [doc@faq3-11]FAQ 3.11[/doc].'|trans|sanitize) }}
</th>
{% if not (properties_num_columns > 1) %}
<th>{{ Util_sortableTableHeader('Type'|trans, 'type') }}</th>
<th>{{ Util_sortableTableHeader('Collation'|trans, 'collation') }}</th>
<th>{{ sortable_table_header('Type'|trans, 'type') }}</th>
<th>{{ sortable_table_header('Collation'|trans, 'collation') }}</th>
{% endif %}
{% if is_show_stats %}
{# larger values are more interesting so default sort order is DESC #}
<th>{{ Util_sortableTableHeader('Size'|trans, 'size', 'DESC') }}</th>
<th>{{ sortable_table_header('Size'|trans, 'size', 'DESC') }}</th>
{# larger values are more interesting so default sort order is DESC #}
<th>{{ Util_sortableTableHeader('Overhead'|trans, 'overhead', 'DESC') }}</th>
<th>{{ sortable_table_header('Overhead'|trans, 'overhead', 'DESC') }}</th>
{% endif %}
{% if show_charset %}
<th>{{ Util_sortableTableHeader('Charset'|trans, 'charset') }}</th>
<th>{{ sortable_table_header('Charset'|trans, 'charset') }}</th>
{% endif %}
{% if show_comment %}
<th>{{ Util_sortableTableHeader('Comment'|trans, 'comment') }}</th>
<th>{{ sortable_table_header('Comment'|trans, 'comment') }}</th>
{% endif %}
{% if show_creation %}
{# newer values are more interesting so default sort order is DESC #}
<th>{{ Util_sortableTableHeader('Creation'|trans, 'creation', 'DESC') }}</th>
<th>{{ sortable_table_header('Creation'|trans, 'creation', 'DESC') }}</th>
{% endif %}
{% if show_last_update %}
{# newer values are more interesting so default sort order is DESC #}
<th>{{ Util_sortableTableHeader('Last update'|trans, 'last_update', 'DESC') }}</th>
<th>{{ sortable_table_header('Last update'|trans, 'last_update', 'DESC') }}</th>
{% endif %}
{% if show_last_check %}
{# newer values are more interesting so default sort order is DESC #}
<th>{{ Util_sortableTableHeader('Last check'|trans, 'last_check', 'DESC') }}</th>
<th>{{ sortable_table_header('Last check'|trans, 'last_check', 'DESC') }}</th>
{% endif %}
</tr>
</thead>

View File

@ -1,7 +1,7 @@
<a href="tbl_tracking.php{{ Url_getCommon({'table': table, 'db': db}) }}">
<a href="tbl_tracking.php{{ get_common({'table': table, 'db': db}) }}">
{% if is_tracked -%}
{{ Util_getImage('eye', 'Tracking is active.'|trans) }}
{{ get_image('eye', 'Tracking is active.'|trans) }}
{%- else -%}
{{ Util_getImage('eye_grey', 'Tracking is not active.'|trans) }}
{{ get_image('eye_grey', 'Tracking is not active.'|trans) }}
{%- endif %}
</a>

View File

@ -5,7 +5,7 @@
<form method="post" action="db_tracking.php" name="trackedForm"
id="trackedForm" class="ajax">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<table id="versions" class="data">
<thead>
<tr>
@ -48,23 +48,23 @@
<a class="delete_tracking_anchor ajax"
href="db_tracking.php{{ url_query|raw }}&amp;table=
{{- version.table_name }}&amp;delete_tracking=true">
{{ Util_getIcon('b_drop', 'Delete tracking'|trans) }}
{{ get_icon('b_drop', 'Delete tracking'|trans) }}
</a>
</td>
<td>
<a href="tbl_tracking.php{{ url_query|raw }}&amp;table=
{{- version.table_name }}">
{{ Util_getIcon('b_versions', 'Versions'|trans) }}
{{ get_icon('b_versions', 'Versions'|trans) }}
</a>
<a href="tbl_tracking.php{{ url_query|raw }}&amp;table=
{{- version.table_name }}&amp;report=true&amp;version=
{{- version.version }}">
{{ Util_getIcon('b_report', 'Tracking report'|trans) }}
{{ get_icon('b_report', 'Tracking report'|trans) }}
</a>
<a href="tbl_tracking.php{{ url_query|raw }}&amp;table=
{{- version.table_name }}&amp;snapshot=true&amp;version=
{{- version.version }}">
{{ Util_getIcon('b_props', 'Structure snapshot'|trans) }}
{{ get_icon('b_props', 'Structure snapshot'|trans) }}
</a>
</td>
</tr>
@ -76,7 +76,7 @@
'text_dir': text_dir,
'form_name': 'trackedForm'
} only %}
{{ Util_getButtonOrImage(
{{ get_button_or_image(
'submit_mult',
'mult_submit',
'Delete tracking'|trans,
@ -90,7 +90,7 @@
<h3>{% trans 'Untracked tables' %}</h3>
<form method="post" action="db_tracking.php" name="untrackedForm"
id="untrackedForm" class="ajax">
{{ Url_getHiddenInputs(db) }}
{{ get_hidden_inputs(db) }}
<table id="noversions" class="data">
<thead>
<tr>
@ -100,7 +100,7 @@
</tr>
</thead>
<tbody>
{% for table_name in untracked_tables if Tracker_getVersion(db, table_name) == -1 %}
{% for table_name in untracked_tables if get_tracker_version(db, table_name) == -1 %}
<tr>
<td class="center">
<input type="checkbox" name="selected_tbl[]"
@ -114,7 +114,7 @@
</th>
<td>
<a href="tbl_tracking.php{{ url_query|raw }}&amp;table={{ table_name }}">
{{ Util_getIcon('eye', 'Track table'|trans) }}
{{ get_icon('eye', 'Track table'|trans) }}
</a>
</td>
</tr>
@ -126,7 +126,7 @@
'text_dir': text_dir,
'form_name': 'untrackedForm'
} only %}
{{ Util_getButtonOrImage(
{{ get_button_or_image(
'submit_mult',
'mult_submit',
'Track table'|trans,

View File

@ -1,9 +1,9 @@
{% if export_type == 'server' %}
{{ Url_getHiddenInputs('', '', 1) }}
{{ get_hidden_inputs('', '', 1) }}
{% elseif export_type == 'database' %}
{{ Url_getHiddenInputs(db, '', 1) }}
{{ get_hidden_inputs(db, '', 1) }}
{% else %}
{{ Url_getHiddenInputs(db, table, 1) }}
{{ get_hidden_inputs(db, table, 1) }}
{% endif %}
{# Just to keep this value for possible next display of this form after saving on server #}

View File

@ -1,6 +1,6 @@
<div class="exportoptions" id="header">
<h2>
{{ Util_getImage('b_export', 'Export'|trans) }}
{{ get_image('b_export', 'Export'|trans) }}
{% if export_type == 'server' %}
{% trans 'Exporting databases from the current server' %}
{% elseif export_type == 'database' %}

View File

@ -1,7 +1,7 @@
<li>
<label for="filename_template" class="desc">
{% trans 'File name template:' %}
{{ Util_showHint(message) }}
{{ show_hint(message) }}
</label>
<input type="text" name="filename_template" id="filename_template" value="
{{- filename_template }}">

View File

@ -25,17 +25,17 @@
<input type="hidden" name="{{ id_key }}" value="{{ upload_id }}" />
{% if import_type == 'server' %}
{{ Url_getHiddenInputs('', '', 1) }}
{{ get_hidden_inputs('', '', 1) }}
{% elseif import_type == 'database' %}
{{ Url_getHiddenInputs(db, '', 1) }}
{{ get_hidden_inputs(db, '', 1) }}
{% else %}
{{ Url_getHiddenInputs(db, table, 1) }}
{{ get_hidden_inputs(db, table, 1) }}
{% endif %}
<input type="hidden" name="import_type" value="{{ import_type }}" />
<div class="exportoptions" id="header">
<h2>
{{ Util_getImage('b_import', 'Import'|trans) }}
{{ get_image('b_import', 'Import'|trans) }}
{% if import_type == 'server' %}
{% trans 'Importing into the current server' %}
{% elseif import_type == 'database' %}
@ -65,7 +65,7 @@
<ul>
<li>
<input type="radio" name="file_location" id="radio_import_file" required="required" />
{{ Util_getBrowseUploadFileBlock(max_upload_size) }}
{{ get_browse_upload_file_block(max_upload_size) }}
{% trans 'You may also drag and drop a file on any page.' %}
</li>
<li>
@ -73,19 +73,19 @@
{%- if timeout_passed_global is not empty and local_import_file is not empty %}
checked="checked"
{%- endif %} />
{{ Util_getSelectUploadFileBlock(
{{ get_select_upload_file_block(
import_list,
upload_dir
) }}
</li>
</ul>
{% elseif is_upload %}
{{ Util_getBrowseUploadFileBlock(max_upload_size) }}
{{ get_browse_upload_file_block(max_upload_size) }}
<p>{% trans 'You may also drag and drop a file on any page.' %}</p>
{% elseif not is_upload %}
{{ Message_notice('File uploads are not allowed on this server.'|trans) }}
{{ 'File uploads are not allowed on this server.'|trans|notice }}
{% elseif upload_dir is not empty %}
{{ Util_getSelectUploadFileBlock(
{{ get_select_upload_file_block(
import_list,
upload_dir
) }}
@ -108,7 +108,7 @@
{% endfor %}
</select>
{% else %}
{{ Charsets_getCharsetDropdownBox(
{{ get_charset_dropdown_box(
dbi,
disable_is,
'charset_of_file',
@ -132,7 +132,7 @@
<div class="formelementrow">
<input type="checkbox" name="allow_interrupt" value="yes" id="checkbox_allow_interrupt"
{{ Plugins_checkboxCheck('Import', 'allow_interrupt') }} />
{{ checkbox_check('Import', 'allow_interrupt') }} />
<label for="checkbox_allow_interrupt">
{% trans 'Allow the interruption of an import in case the script detects it is close to the PHP timeout limit. <em>(This might be a good way to import large files, however it can break transactions.)</em>' %}
</label>
@ -144,7 +144,7 @@
{% trans 'Skip this number of queries (for SQL) starting from the first one:' %}
</label>
<input type="number" name="skip_queries" value="
{{- Plugins_getDefault('Import', 'skip_queries') -}}
{{- get_default_plugin('Import', 'skip_queries') -}}
" id="text_skip_queries" min="0" />
</div>
{% else %}
@ -152,7 +152,7 @@
do not show the Skip dialog to avoid the risk of someone
entering a value here that would interfere with "skip" #}
<input type="hidden" name="skip_queries" value="
{{- Plugins_getDefault('Import', 'skip_queries') -}}
{{- get_default_plugin('Import', 'skip_queries') -}}
" id="text_skip_queries" />
{% endif %}
</div>
@ -160,13 +160,13 @@
<div class="importoptions">
<h3>{% trans 'Other options:' %}</h3>
<div class="formelementrow">
{{ Util_getFKCheckbox() }}
{{ get_fk_checkbox() }}
</div>
</div>
<div class="importoptions">
<h3>{% trans 'Format:' %}</h3>
{{ Plugins_getChoice('Import', 'format', import_list) }}
{{ get_choice('Import', 'format', import_list) }}
<div id="import_notification"></div>
</div>
@ -175,7 +175,7 @@
<p class="no_js_msg" id="scroll_to_options_msg">
{% trans 'Scroll down to fill in the options for the selected format and ignore the options for other formats.' %}
</p>
{{ Plugins_getOptions('Import', import_list) }}
{{ get_options('Import', import_list) }}
</div>
<div class="clearfloat"></div>

View File

@ -6,22 +6,16 @@ $( function() {
{% if handler != 'PhpMyAdmin\\Plugins\\Import\\Upload\\UploadNoplugin' %}
{# Some variable for javascript #}
{% set ajax_url = 'import_status.php?id=' ~ upload_id ~ '&' ~ Url_getCommonRaw({
{% set ajax_url = 'import_status.php?id=' ~ upload_id ~ '&' ~ get_common_raw({
'import_status': 1
}) %}
{% set promot_str = Sanitize_jsFormat(
'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'|trans,
false
) %}
{% set statustext_str = Sanitize_escapeJsString('%s of %s'|trans) %}
{% set second_str = Sanitize_jsFormat('%s/sec.'|trans, false) %}
{% set remaining_min = Sanitize_jsFormat('About %MIN min. %SEC sec. remaining.'|trans, false) %}
{% set remaining_second = Sanitize_jsFormat('About %SEC sec. remaining.'|trans, false) %}
{% set processed_str = Sanitize_jsFormat(
'The file is being processed, please be patient.'|trans,
false
) %}
{% set import_url = Url_getCommonRaw({'import_status': 1}) %}
{% set promot_str = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'|trans|js_format(false) %}
{% set statustext_str = '%s of %s'|trans|escape_js_string %}
{% set second_str = '%s/sec.'|trans|js_format(false) %}
{% set remaining_min = 'About %MIN min. %SEC sec. remaining.'|trans|js_format(false) %}
{% set remaining_second = 'About %SEC sec. remaining.'|trans|js_format(false) %}
{% set processed_str = 'The file is being processed, please be patient.'|trans|js_format(false) %}
{% set import_url = get_common_raw({'import_status': 1}) %}
{% set upload_html %}
{% spaceless %}
@ -33,7 +27,7 @@ $( function() {
</div>
</div>
<div>
<img src="{{ pma_theme_image }}ajax_clock_small.gif" width="16" height="16" alt="ajax clock" /> {{ Sanitize_jsFormat('Uploading your import file…'|trans, false) -}}
<img src="{{ pma_theme_image }}ajax_clock_small.gif" width="16" height="16" alt="ajax clock" /> {{ 'Uploading your import file…'|trans|js_format(false) -}}
</div>
<div id="statustext"></div>
</div>
@ -158,11 +152,8 @@ $( function() {
{% set image_tag -%}
<img src="{{ pma_theme_image -}}
ajax_clock_small.gif" width="16" height="16" alt="ajax clock" />
{{- Sanitize_jsFormat(
'Please be patient, the file is being uploaded. Details about the upload are not available.'|trans,
false
) -}}
{{- Util_showDocu('faq', 'faq2-9') -}}
{{- 'Please be patient, the file is being uploaded. Details about the upload are not available.'|trans|js_format(false) -}}
{{- show_docu('faq', 'faq2-9') -}}
{%- endset %}
$('#upload_form_status_info').html('{{ image_tag|raw }}');
$("#upload_form_status").css("display", "none");

View File

@ -4,7 +4,7 @@
<input type="hidden" name="pos" size="3" value="{{ pos }}" />
<input type="hidden" name="is_browse_distinct" value="{{ is_browse_distinct }}" />
{% trans 'Number of rows:' %}
{{ Util_getDropdown(
{{ get_dropdown(
'session_max_rows',
number_of_rows_choices,
max_rows,

View File

@ -4,7 +4,7 @@
name="resultsForm"
id="resultsForm_{{ unique_id }}"
class="ajax">
{{ Url_getHiddenInputs(db, table, 1) }}
{{ get_hidden_inputs(db, table, 1) }}
<input type="hidden" name="goto" value="sql.php" />
{% endif %}

View File

@ -1,5 +1,5 @@
<form method="post" action="sql.php" name="displayOptionsForm" class="ajax print_ignore">
{{ Url_getHiddenInputs({
{{ get_hidden_inputs({
'db': db,
'table': table,
'sql_query': sql_query,
@ -7,11 +7,11 @@
'display_options_form': 1
}) }}
{{ Util_getDivForSliderEffect('', 'Options'|trans) }}
{{ get_div_for_slider_effect('', 'Options'|trans) }}
<fieldset>
<div class="formelement">
{# pftext means "partial or full texts" (done to reduce line lengths #}
{{ Util_getRadioFields(
{{ get_radio_fields(
'pftext',
{
'P': 'Partial texts'|trans,
@ -27,7 +27,7 @@
{% if relwork and displaywork %}
<div class="formelement">
{{ Util_getRadioFields(
{{ get_radio_fields(
'relational_display',
{
'K': 'Relational key'|trans,
@ -76,7 +76,7 @@
{% if possible_as_geometry %}
<div class="formelement">
{{ Util_getRadioFields(
{{ get_radio_fields(
'geoOption',
{
'GEOM': 'Geometry'|trans,
@ -93,7 +93,7 @@
{% else %}
<div class="formelement">
{{ possible_as_geometry }}
{{ Util_getRadioFields(
{{ get_radio_fields(
'geoOption',
{
'WKT': 'Well Known Text'|trans,

View File

@ -1,6 +1,6 @@
<td>
<form action="sql.php" method="post">
{{ Url_getHiddenInputs(db, table) }}
{{ get_hidden_inputs(db, table) }}
<input type="hidden" name="sql_query" value="{{ html_sql_query|raw }}" />
<input type="hidden" name="pos" value="0" />
<input type="hidden" name="is_browse_distinct" value="{{ is_browse_distinct }}" />

View File

@ -1,6 +1,6 @@
<td>
<form action="sql.php" method="post"{{ onsubmit|raw }}>
{{ Url_getHiddenInputs(db, table) }}
{{ get_hidden_inputs(db, table) }}
<input type="hidden" name="sql_query" value="{{ sql_query|raw }}" />
<input type="hidden" name="pos" value="{{ pos }}" />
<input type="hidden" name="is_browse_distinct" value="{{ is_browse_distinct }}" />

View File

@ -8,14 +8,14 @@
<meta http-equiv="Refresh" content="0;url={{ uri }}" />
<script type="text/javascript">
//<![CDATA[
setTimeout(function() { window.location = decodeURI('{{ Sanitize_escapeJsString(uri) }}'); }, 2000);
setTimeout(function() { window.location = decodeURI('{{ uri|escape_js_string }}'); }, 2000);
//]]>
</script>
</head>
<body>
<script type="text/javascript">
//<![CDATA[
document.write('<p><a href="{{ Sanitize_escapeJsString(uri|e) }}">{% trans 'Go' %}</a></p>');
document.write('<p><a href="{{ uri|e|escape_js_string }}">{% trans 'Go' %}</a></p>');
//]]>
</script>
</body>

View File

@ -14,6 +14,6 @@
</a>
{% endif %}
{% if mysql_help_page is not empty %}
{{ Util_showMySQLDocu(mysql_help_page) }}
{{ show_mysql_docu(mysql_help_page) }}
{% endif %}
</li>

View File

@ -2,15 +2,15 @@
<div id="modalOverlay">
{% endif %}
<div class="container{{ add_class }}">
<a href="{{ Url_link('https://www.phpmyadmin.net/') }}" target="_blank" rel="noopener noreferrer" class="logo">
<a href="{{ 'https://www.phpmyadmin.net/'|link }}" target="_blank" rel="noopener noreferrer" class="logo">
<img src="{{ theme.getImgPath('logo_right.png', 'pma_logo.png') }}" id="imLogo" name="imLogo" alt="phpMyAdmin" border="0" />
</a>
<h1>{{ 'Welcome to %s'|trans|format('<bdo dir="ltr" lang="en">phpMyAdmin</bdo>')|raw }}</h1>
<noscript>
{{ Message_error("Javascript must be enabled past this point!"|trans) }}
{{ "Javascript must be enabled past this point!"|trans|error }}
</noscript>
<div class="hide" id="js-https-mismatch">
{{ Message_error("There is mismatch between HTTPS indicated on the server and client. This can lead to non working phpMyAdmin or a security risk. Please fix your server configuration to indicate HTTPS properly."|trans) }}
{{ "There is mismatch between HTTPS indicated on the server and client. This can lead to non working phpMyAdmin or a security risk. Please fix your server configuration to indicate HTTPS properly."|trans|error }}
</div>

View File

@ -1,5 +1,5 @@
<form method="POST" class="disableAjax">
{{ Url_getHiddenInputs() }}
{{ get_hidden_inputs() }}
{{ form|raw }}
{% if show_submit %}
<input type="submit" value="{% trans "Verify" %}" />

View File

@ -1,4 +1,4 @@
{{ Url_getHiddenInputs() }}
{{ get_hidden_inputs() }}
{% if image is defined %}
<p>
{% trans "Please scan following QR code into the two-factor authentication app on your device and enter authentication code it generates." %}

View File

@ -1,7 +1,7 @@
<div class="group">
<h2>
{% trans "Two-factor authentication status" %}
{{ Util_showDocu('two_factor') }}
{{ show_docu('two_factor') }}
</h2>
<div class="group-cnt">
{% if enabled %}
@ -33,7 +33,7 @@
<p>{% trans "You have enabled two factor authentication." %}</p>
<p>{{ backend_description }}</p>
<form method="POST" action="prefs_twofactor.php">
{{ Url_getHiddenInputs() }}
{{ get_hidden_inputs() }}
<input type="submit" name="2fa_remove" value="{% trans "Disable two-factor authentication" %}" />
</form>
</div>
@ -43,7 +43,7 @@
<h2>{% trans "Configure two-factor authentication" %}</h2>
<div class="group-cnt">
<form method="POST" action="prefs_twofactor.php">
{{ Url_getHiddenInputs() }}
{{ get_hidden_inputs() }}
{% for backend in backends %}
<label>
<input type="radio" name="2fa_configure" {% if backend["id"] == "" %}checked="checked"{% endif %} value="{{ backend["id"] }}"/>

View File

@ -2,7 +2,7 @@
<h2>{% trans "Configure two-factor authentication" %}</h2>
<div class="group-cnt">
<form method="POST" action="prefs_twofactor.php">
{{ Url_getHiddenInputs() }}
{{ get_hidden_inputs() }}
<input type="hidden" name="2fa_configure" value="{{ configure }}" />
{{ form|raw }}
<input type="submit" value="{% trans "Enable two-factor authentication" %}" />

View File

@ -2,8 +2,8 @@
<h2>{% trans "Confirm disabling two-factor authentication" %}</h2>
<div class="group-cnt">
<form method="POST" action="prefs_twofactor.php">
{{ Message_notice("By disabling two factor authentication you will be again able to login using password only."|trans) }}
{{ Url_getHiddenInputs() }}
{{ "By disabling two factor authentication you will be again able to login using password only."|trans|notice }}
{{ get_hidden_inputs() }}
{{ form|raw }}
<input type="hidden" name="2fa_remove" value="1" />
<input type="submit" value="{% trans "Disable two-factor authentication" %}" />

View File

@ -3,9 +3,9 @@
{% trans 'No change' %}
{% elseif query_data is iterable %}
{% for query in query_data %}
{{ Util_formatSql(query) }}
{{ format_sql(query) }}
{% endfor %}
{% else %}
{{ Util_formatSql(query_data) }}
{{ format_sql(query_data) }}
{% endif %}
</div>

View File

@ -1,14 +0,0 @@
<label for="text_dbname">{% trans 'Add privileges on the following database(s):' %}</label>
{%- if databases is not empty %}
<select name="pred_dbname[]" multiple="multiple">
{% for database in databases %}
<option value="{{ Util_escapeMysqlWildcards(database) }}">
{{ database }}
</option>
{% endfor %}
</select>
{% endif -%}
<input type="text" id="text_dbname" name="dbname" />
{{ Util_showHint("Wildcards % and _ should be escaped with a \\ to use them literally."|trans) }}

View File

@ -1,14 +0,0 @@
<input type="hidden" name="dbname" value="{{ database }}"/>
<label for="text_routinename">{% trans 'Add privileges on the following routine:' %}</label>
{%- if routines is not empty %}
<select name="pred_routinename" class="autosubmit">
<option value="" selected="selected">{% trans 'Use text field' %}:</option>
{% for routine in routines %}
<option value="{{ routine }}">{{ routine }}</option>
{% endfor %}
</select>
{% endif -%}
<input type="text" id="text_routinename" name="routinename" />

View File

@ -1,14 +0,0 @@
<input type="hidden" name="dbname" value="{{ database }}"/>
<label for="text_tablename">{% trans 'Add privileges on the following table:' %}</label>
{%- if tables is not empty %}
<select name="pred_tablename" class="autosubmit">
<option value="" selected="selected">{% trans 'Use text field' %}:</option>
{% for table in tables %}
<option value="{{ table }}">{{ table }}</option>
{% endfor %}
</select>
{% endif -%}
<input type="text" id="text_tablename" name="tablename" />

View File

@ -1,8 +0,0 @@
<fieldset id="fieldset_add_user">
<legend>{% trans %}New{% context %}Create new user{% endtrans %}</legend>
<a id="add_user_anchor" href="server_privileges.php{{ Url_getCommon(url_params) }}"
{% if rel_params is not empty %}
rel="{{ Url_getCommon(rel_params) }}"
{% endif %}>
{{ Util_getIcon('b_usradd') }}{% trans 'Add user account' %}</a>
</fieldset>

View File

@ -1,9 +0,0 @@
<div class="item">
<input type="checkbox" class="checkall" name="{{ priv[0] }}_priv" id="checkbox_{{ priv[0] }}_priv"
value="Y" title="{{ priv[2] }}" {{ checked }} />
<label for="checkbox_{{ priv[0] }}_priv">
<code>
{{ formatted_priv|raw }}
</code>
</label>
</div>

Some files were not shown because too many files have changed in this diff Show More