diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000000..db0ed3b2c0 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,26 @@ +### Steps to reproduce +1. +2. +3. + +### Expected behaviour +Tell us what should happen + +### Actual behaviour +Tell us what happens instead + +### Server configuration +**Operating system**: + +**Web server:** + +**Database:** + +**PHP version:** + +**phpMyAdmin version:** + +### Client configuration +**Browser:** + +**Operating system:** diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..94147d21c5 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,5 @@ +Before submitting pull request, please check that every commit: + +- [ ] Has proper Signed-Off-By +- [ ] Has commit message which describes it +- [ ] Is needed on it's own, if you have just minor fixes to previous commits, you can squash them diff --git a/ChangeLog b/ChangeLog index afb9b0d9b9..48cb733410 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,8 @@ phpMyAdmin - ChangeLog - issue #11880 Fixed rendering of missing extension error - issue #11923 Errors on Structure tab when user only has select access on certain columns - issue #11972 Missing documentation for $cfg['Servers'][$i]['favorite'] and $cfg['NumFavoriteTables'] +- issue #11907 Avoid displaying UPDATE query twice +- issue #11850 Fixed CSV import 4.5.5.0 (not yet released) - issue Undefined index: is_ajax_request diff --git a/doc/config.rst b/doc/config.rst index d08b84f245..87128eba90 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -41,7 +41,7 @@ Basic settings :type: string :default: ``''`` - .. versionremoved:: 4.6.0 + .. deprecated:: 4.6.0 This setting is no longer available since phpMyAdmin 4.6.0. Please adjust your webserver instead. @@ -1306,7 +1306,7 @@ Generic settings :type: boolean :default: false - .. versionremoved:: 4.6.0 + .. deprecated:: 4.6.0 This setting is no longer available since phpMyAdmin 4.6.0. Please adjust your webserver instead. diff --git a/doc/faq.rst b/doc/faq.rst index 2115452355..f3e338d3b1 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -627,6 +627,7 @@ A list of files and corresponding functionality which degrade gracefully when re * :file:`./setup/` (setup script) * :file:`./examples/` * :file:`./sql/` (SQL scripts to configure advanced functionality) +* :file:`./js/openlayers/` (GIS visualization) .. _faqconfig: diff --git a/doc/setup.rst b/doc/setup.rst index 1274e3c525..1316992624 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -782,6 +782,8 @@ are always ways to make your installation more secure: * If you are afraid of automated attacks, enabling Captcha by :config:option:`$cfg['CaptchaLoginPublicKey']` and :config:option:`$cfg['CaptchaLoginPrivateKey']` might be an option. +* Alternative approach might be using using fail2ban as phpMyAdmin logs failed + authentication attempts to syslog (if available) Known issues ++++++++++++ diff --git a/import.php b/import.php index 2f183178aa..cd4c22721e 100644 --- a/import.php +++ b/import.php @@ -670,12 +670,16 @@ if (! empty($id_bookmark) && $_REQUEST['action_bookmark'] == 2) { htmlspecialchars($_POST['bkm_label']) ); } elseif ($finished && ! $error) { - if ($import_type == 'query') { - $message = PMA\libraries\Message::success(); - } else { + // Do not display the query with message, we do it separately + $display_query = ';'; + if ($import_type != 'query') { $message = PMA\libraries\Message::success( '' - . __('Import has been successfully finished, %d queries executed.') + . _ngettext( + 'Import has been successfully finished, %d query executed.', + 'Import has been successfully finished, %d queries executed.', + $executed_queries + ) . '' ); $message->addParam($executed_queries); diff --git a/libraries/Console.php b/libraries/Console.php index b00a2c6352..7ce772c947 100644 --- a/libraries/Console.php +++ b/libraries/Console.php @@ -95,32 +95,14 @@ class Console $output .= '
'; } - $retval .= ''; return $retval; } // end of the 'getMessage()' function diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index ba2d3a387f..96633f7dc9 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -293,6 +293,11 @@ function PMA_analyseShowGrant() $GLOBALS['dbs_where_create_table_allowed'] ); PMA\libraries\Util::cacheSet('dbs_to_test', $GLOBALS['dbs_to_test']); + + PMA\libraries\Util::cacheSet('proc_priv', $GLOBALS['proc_priv']); + PMA\libraries\Util::cacheSet('table_priv', $GLOBALS['table_priv']); + PMA\libraries\Util::cacheSet('col_priv', $GLOBALS['col_priv']); + PMA\libraries\Util::cacheSet('db_priv', $GLOBALS['db_priv']); } // end function $user = $GLOBALS['dbi']->fetchValue("SELECT CURRENT_USER();"); diff --git a/libraries/import.lib.php b/libraries/import.lib.php index 8e4f19e164..0276b7fab7 100644 --- a/libraries/import.lib.php +++ b/libraries/import.lib.php @@ -974,6 +974,7 @@ $import_notice = null; * @param array &$analyses Analyses of the tables * @param array &$additional_sql Additional SQL statements to be executed * @param array $options Associative array of options + * @param array &$sql_data 2-element array with sql data * * @return void * @access public @@ -981,7 +982,7 @@ $import_notice = null; * @link http://wiki.phpmyadmin.net/pma/Import */ function PMA_buildSQL($db_name, &$tables, &$analyses = null, - &$additional_sql = null, $options = null + &$additional_sql = null, $options = null, &$sql_data ) { /* Take care of the options */ if (isset($options['db_collation'])&& ! is_null($options['db_collation'])) { @@ -1021,7 +1022,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, /* Execute the SQL statements create above */ $sql_len = count($sql); for ($i = 0; $i < $sql_len; ++$i) { - PMA_importRunQuery($sql[$i], $sql[$i]); + PMA_importRunQuery($sql[$i], $sql[$i], $sql_data); } /* No longer needed */ @@ -1056,7 +1057,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, $additional_sql[$i] ); /* Execute the resulting statements */ - PMA_importRunQuery($additional_sql[$i], $additional_sql[$i]); + PMA_importRunQuery($additional_sql[$i], $additional_sql[$i], $sql_data); } } @@ -1108,7 +1109,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, * after it is formed so that we don't have * to store them in a (possibly large) buffer */ - PMA_importRunQuery($tempSQLStr, $tempSQLStr); + PMA_importRunQuery($tempSQLStr, $tempSQLStr, $sql_data); } } @@ -1199,7 +1200,7 @@ function PMA_buildSQL($db_name, &$tables, &$analyses = null, * after it is formed so that we don't have * to store them in a (possibly large) buffer */ - PMA_importRunQuery($tempSQLStr, $tempSQLStr); + PMA_importRunQuery($tempSQLStr, $tempSQLStr, $sql_data); } /* No longer needed */ diff --git a/libraries/logging.lib.php b/libraries/logging.lib.php index 105a9ead7d..c82c478017 100644 --- a/libraries/logging.lib.php +++ b/libraries/logging.lib.php @@ -22,10 +22,12 @@ function PMA_logUser($user, $status = 'ok') apache_note('userID', $user); apache_note('userStatus', $status); } - if (function_exists('syslog')) { + if (function_exists('syslog') && $status != 'ok') { + @openlog('phpMyAdmin', LOG_NDELAY | LOG_PID, LOG_AUTHPRIV); @syslog( - LOG_AUTHPRIV, - 'phpMyAdmin: ' . $user . ' (' . $status . ') from ' . $_SERVER['REMOTE_ADDR'] + LOG_WARNING, + 'user denied: ' . $user . ' (' . $status . ') from ' . + $_SERVER['REMOTE_ADDR'] ); } } diff --git a/libraries/plugins/import/ImportCsv.php b/libraries/plugins/import/ImportCsv.php index 56620f0a1f..2e3ebc4611 100644 --- a/libraries/plugins/import/ImportCsv.php +++ b/libraries/plugins/import/ImportCsv.php @@ -90,9 +90,11 @@ class ImportCsv extends AbstractImportCsv /** * Handles the whole import logic * + * @param array &$sql_data 2-element array with sql data + * * @return void */ - public function doImport() + public function doImport(&$sql_data = array()) { global $db, $table, $csv_terminated, $csv_enclosed, $csv_escaped, $csv_new_line, $csv_columns, $err_url; @@ -569,7 +571,7 @@ class ImportCsv extends AbstractImportCsv * @todo maybe we could add original line to verbose * SQL in comment */ - PMA_importRunQuery($sql, $sql); + PMA_importRunQuery($sql, $sql, $sql_data); } $line++; @@ -645,14 +647,14 @@ class ImportCsv extends AbstractImportCsv $create = null; /* Created and execute necessary SQL statements from data */ - PMA_buildSQL($db_name, $tables, $analyses, $create, $options); + PMA_buildSQL($db_name, $tables, $analyses, $create, $options, $sql_data); unset($tables); unset($analyses); } // Commit any possible data in buffers - PMA_importRunQuery(); + PMA_importRunQuery('', '', $sql_data); if (count($values) != 0 && !$error) { $message = PMA\libraries\Message::error( diff --git a/libraries/plugins/import/ImportLdi.php b/libraries/plugins/import/ImportLdi.php index d118372c92..7ccc26326b 100644 --- a/libraries/plugins/import/ImportLdi.php +++ b/libraries/plugins/import/ImportLdi.php @@ -90,9 +90,11 @@ class ImportLdi extends AbstractImportCsv /** * Handles the whole import logic * + * @param array &$sql_data 2-element array with sql data + * * @return void */ - public function doImport() + public function doImport(&$sql_data = array()) { global $finished, $import_file, $compression, $charset_conversion, $table; global $ldi_local_option, $ldi_replace, $ldi_ignore, $ldi_terminated, @@ -164,8 +166,8 @@ class ImportLdi extends AbstractImportCsv $sql .= ')'; } - PMA_importRunQuery($sql, $sql); - PMA_importRunQuery(); + PMA_importRunQuery($sql, $sql, $sql_data); + PMA_importRunQuery('', '', $sql_data); $finished = true; } } diff --git a/libraries/plugins/import/ImportMediawiki.php b/libraries/plugins/import/ImportMediawiki.php index eb0223972e..fce1c8687f 100644 --- a/libraries/plugins/import/ImportMediawiki.php +++ b/libraries/plugins/import/ImportMediawiki.php @@ -61,9 +61,11 @@ class ImportMediawiki extends ImportPlugin /** * Handles the whole import logic * + * @param array &$sql_data 2-element array with sql data + * * @return void */ - public function doImport() + public function doImport(&$sql_data = array()) { global $error, $timeout_passed, $finished; @@ -231,7 +233,7 @@ class ImportMediawiki extends ImportPlugin ); // Import the current table data into the database - $this->_importDataOneTable($current_table); + $this->_importDataOneTable($current_table, $sql_data); // Reset table name $cur_table_name = ""; @@ -282,18 +284,20 @@ class ImportMediawiki extends ImportPlugin /** * Imports data from a single table * - * @param array $table containing all table info: - *
- * $table[0] - string containing table name
- * $table[1] - array[] of table headers
- * $table[2] - array[][] of table content rows
- *
+ * @param array $table containing all table info:
+ *
+ * $table[0] - string containing table name
+ * $table[1] - array[] of table headers
+ * $table[2] - array[][] of table content rows
+ *
+ *
+ * @param array &$sql_data 2-element array with sql data
*
* @global bool $analyze whether to scan for column types
*
* @return void
*/
- private function _importDataOneTable($table)
+ private function _importDataOneTable($table, &$sql_data)
{
$analyze = $this->_getAnalyze();
if ($analyze) {
@@ -311,11 +315,11 @@ class ImportMediawiki extends ImportPlugin
$analyses = array();
$analyses [] = PMA_analyzeTable($tables[0]);
- $this->_executeImportTables($tables, $analyses);
+ $this->_executeImportTables($tables, $analyses, $sql_data);
}
// Commit any possible data in buffers
- PMA_importRunQuery();
+ PMA_importRunQuery('', '', $sql_data);
}
/**
@@ -368,12 +372,13 @@ class ImportMediawiki extends ImportPlugin
* $analyses = array(
* array(array() column_types, array() column_sizes)
* )
+ * @param array &$sql_data 2-element array with sql data
*
* @global string $db name of the database to import in
*
* @return void
*/
- private function _executeImportTables(&$tables, &$analyses)
+ private function _executeImportTables(&$tables, &$analyses, &$sql_data)
{
global $db;
@@ -387,7 +392,7 @@ class ImportMediawiki extends ImportPlugin
$create = null;
// Create and execute necessary SQL statements from data
- PMA_buildSQL($db_name, $tables, $analyses, $create, $options);
+ PMA_buildSQL($db_name, $tables, $analyses, $create, $options, $sql_data);
unset($tables);
unset($analyses);
diff --git a/libraries/plugins/import/ImportOds.php b/libraries/plugins/import/ImportOds.php
index ee0bc5c3b9..39272a26b2 100644
--- a/libraries/plugins/import/ImportOds.php
+++ b/libraries/plugins/import/ImportOds.php
@@ -95,9 +95,11 @@ class ImportOds extends ImportPlugin
/**
* Handles the whole import logic
*
+ * @param array &$sql_data 2-element array with sql data
+ *
* @return void
*/
- public function doImport()
+ public function doImport(&$sql_data = array())
{
global $db, $error, $timeout_passed, $finished;
@@ -371,13 +373,13 @@ class ImportOds extends ImportPlugin
$create = null;
/* Created and execute necessary SQL statements from data */
- PMA_buildSQL($db_name, $tables, $analyses, $create, $options);
+ PMA_buildSQL($db_name, $tables, $analyses, $create, $options, $sql_data);
unset($tables);
unset($analyses);
/* Commit any possible data in buffers */
- PMA_importRunQuery();
+ PMA_importRunQuery('', '', $sql_data);
}
/**
diff --git a/libraries/plugins/import/ImportShp.php b/libraries/plugins/import/ImportShp.php
index dd72a893b7..1f9435665e 100644
--- a/libraries/plugins/import/ImportShp.php
+++ b/libraries/plugins/import/ImportShp.php
@@ -57,9 +57,11 @@ class ImportShp extends ImportPlugin
/**
* Handles the whole import logic
*
+ * @param array &$sql_data 2-element array with sql data
+ *
* @return void
*/
- public function doImport()
+ public function doImport(&$sql_data = array())
{
global $db, $error, $finished, $compression,
$import_file, $local_import_file, $message;
@@ -287,7 +289,7 @@ class ImportShp extends ImportPlugin
// Created and execute necessary SQL statements from data
$null_param = null;
- PMA_buildSQL($db_name, $tables, $analyses, $null_param, $options);
+ PMA_buildSQL($db_name, $tables, $analyses, $null_param, $options, $sql_data);
unset($tables);
unset($analyses);
@@ -296,7 +298,7 @@ class ImportShp extends ImportPlugin
$error = false;
// Commit any possible data in buffers
- PMA_importRunQuery();
+ PMA_importRunQuery('', '', $sql_data);
}
/**
diff --git a/libraries/plugins/import/ImportXml.php b/libraries/plugins/import/ImportXml.php
index 2bc90814d7..4954fdf948 100644
--- a/libraries/plugins/import/ImportXml.php
+++ b/libraries/plugins/import/ImportXml.php
@@ -52,9 +52,11 @@ class ImportXml extends ImportPlugin
/**
* Handles the whole import logic
*
+ * @param array &$sql_data 2-element array with sql data
+ *
* @return void
*/
- public function doImport()
+ public function doImport(&$sql_data = array())
{
global $error, $timeout_passed, $finished, $db;
@@ -355,13 +357,13 @@ class ImportXml extends ImportPlugin
}
/* Created and execute necessary SQL statements from data */
- PMA_buildSQL($db_name, $tables, $analyses, $create, $options);
+ PMA_buildSQL($db_name, $tables, $analyses, $create, $options, $sql_data);
unset($analyses);
unset($tables);
unset($create);
/* Commit any possible data in buffers */
- PMA_importRunQuery();
+ PMA_importRunQuery('', '', $sql_data);
}
}
diff --git a/libraries/plugins/import/README b/libraries/plugins/import/README
index 509df5120f..9ec4df7d50 100644
--- a/libraries/plugins/import/README
+++ b/libraries/plugins/import/README
@@ -96,9 +96,11 @@ class Import[Name] extends PMA\libraries\plugins\ImportPlugin
/**
* Handles the whole import logic
*
+ * @param array &$sql_data 2-element array with sql data
+ *
* @return void
*/
- public function doImport()
+ public function doImport(&$sql_data = array())
{
// get globals (others are optional)
global $error, $timeout_passed, $finished;
@@ -117,10 +119,10 @@ class Import[Name] extends PMA\libraries\plugins\ImportPlugin
$buffer .= $data;
}
// PARSE $buffer here, post sql queries using:
- PMA_importRunQuery($sql, $verbose_sql_with_comments);
+ PMA_importRunQuery($sql, $verbose_sql_with_comments, $sql_data);
} // End of import loop
// Commit any possible data in buffers
- PMA_importRunQuery();
+ PMA_importRunQuery('', '', $sql_data);
}
diff --git a/po/af.po b/po/af.po
index feabe367f6..3b0b5247b3 100644
--- a/po/af.po
+++ b/po/af.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:30+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -13857,15 +13845,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "With selected:"
@@ -13880,17 +13864,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "With selected:"
msgid "An alias was expected."
@@ -13912,19 +13897,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -13952,17 +13937,17 @@ msgstr "Tabel %s is verwyder"
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "By Begin van Tabel"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -13983,17 +13968,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Die ry is verwyder"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14686,7 +14671,7 @@ msgstr "Sien die storting (skema) van die tabel"
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -15765,7 +15750,7 @@ msgid "at beginning of table"
msgstr "By Begin van Tabel"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
msgid "Partitions"
msgstr "Operasies"
@@ -15808,7 +15793,7 @@ msgstr "Operasies"
msgid "Edit partitioning"
msgstr "Drukker mooi (print view)"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -15940,12 +15925,12 @@ msgstr ""
msgid "Column names"
msgstr "Kolom name"
-#: view_operations.php:97
+#: view_operations.php:106
#, fuzzy
msgid "Rename view to"
msgstr "Hernoem tabel na"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
msgid "Delete the view (DROP)"
msgstr "Geen databasisse"
@@ -17049,6 +17034,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr ""
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Soek"
+#~ msgstr[1] "Soek"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Die boekmerk is verwyder."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/ar.po b/po/ar.po
index 5efbc4c43e..3b2170b3a3 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:24+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "إكس إم إل"
@@ -14250,15 +14243,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -14273,17 +14262,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -14305,19 +14295,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14350,17 +14340,17 @@ msgstr "تم إنشاء الإجراء %1$s."
msgid "Variable name was expected."
msgstr "إسم قالب الجدول"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "في بداية الجدول"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14383,17 +14373,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "لقد تمّ حذف الصّف"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15096,7 +15086,7 @@ msgstr "عرض بنية الجدول"
msgid "Invalid table name"
msgstr "اسم الجدول غير صالح"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16222,7 +16212,7 @@ msgid "at beginning of table"
msgstr "في بداية الجدول"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16271,7 +16261,7 @@ msgstr "مقسم"
msgid "Edit partitioning"
msgstr "إزالة التقسيم"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16402,11 +16392,11 @@ msgstr "اسم VIEW"
msgid "Column names"
msgstr "اسم العمود"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "أعد تسمية العرض الـ"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Delete the table (DROP)"
msgid "Delete the view (DROP)"
@@ -17555,6 +17545,22 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr ""
+#, fuzzy
+#~| msgid "Table Search"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "بحث في الجدول"
+#~ msgstr[1] "بحث في الجدول"
+#~ msgstr[2] "بحث في الجدول"
+#~ msgstr[3] "بحث في الجدول"
+#~ msgstr[4] "بحث في الجدول"
+#~ msgstr[5] "بحث في الجدول"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "لقد حذفت العلامة المرجعية."
+
#, fuzzy
#~| msgid "Force secured connection while using phpMyAdmin"
#~ msgid "Force secured connection while using phpMyAdmin."
diff --git a/po/az.po b/po/az.po
index 6a92253897..5f608d444f 100644
--- a/po/az.po
+++ b/po/az.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-05-21 01:04+0200\n"
"Last-Translator: Sevdimali İsa AUTO_INCREMENT for zero values"
msgstr "Sıfır qiymətləri üçün AUTO_INCREMENT istifadə etmə"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13436,15 +13427,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -13459,17 +13446,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -13491,23 +13479,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Açıq olan cədvəl sayı."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Açıq olan cədvəl sayı."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -13540,17 +13528,17 @@ msgstr "%1$s hadisəsi yaradıldı."
msgid "Variable name was expected."
msgstr "Cədvəl adı şablonu"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "Cədvəlin başına"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -13573,19 +13561,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Açıq olan cədvəl sayı."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Sətir silindi."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14272,7 +14260,7 @@ msgstr "Cedvelin sxemini göster"
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -15290,7 +15278,7 @@ msgid "at beginning of table"
msgstr "Cədvəlin başına"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -15339,7 +15327,7 @@ msgstr "bölündü"
msgid "Edit partitioning"
msgstr "bölündü"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Redaktə görünuşü"
@@ -15462,12 +15450,12 @@ msgstr ""
msgid "Column names"
msgstr "Sütun adları"
-#: view_operations.php:97
+#: view_operations.php:106
#, fuzzy
msgid "Rename view to"
msgstr "Cedveli yeniden adlandır"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
msgid "Delete the view (DROP)"
msgstr "Baza seçilmemişdir ve ya mövcud deyildir."
@@ -16561,6 +16549,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert 0-a konfiqurasiya edilib"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Toplam %d əlfəcin"
+#~ msgstr[1] "Toplam %d əlfəcin"
+
+#~ msgid "private"
+#~ msgstr "özəl"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s and %3$s əlfəcin daxil edildi"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/be.po b/po/be.po
index 7973b40157..8e1edf4a1b 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-05-15 14:28+0200\n"
"Last-Translator: Viktar Palstsiuk AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14678,15 +14668,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14701,17 +14687,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14733,23 +14720,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Колькасьць адкрытых табліц."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Колькасьць адкрытых табліц."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14779,17 +14766,17 @@ msgstr "Табліца %1$s створаная."
msgid "Variable name was expected."
msgstr "Шаблён назвы файла"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "У пачатку табліцы"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14810,19 +14797,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Колькасьць адкрытых табліц."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Радок быў выдалены"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15539,7 +15526,7 @@ msgstr "Праглядзець дамп (схему) табліцы"
msgid "Invalid table name"
msgstr "Некарэктнае імя табліцы"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16679,7 +16666,7 @@ msgid "at beginning of table"
msgstr "У пачатку табліцы"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16728,7 +16715,7 @@ msgstr "падзеленая на сэкцыі"
msgid "Edit partitioning"
msgstr "Скасаваць падзел на часткі"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16863,12 +16850,12 @@ msgstr "Назва прагляду"
msgid "Column names"
msgstr "Назвы калёнак"
-#: view_operations.php:97
+#: view_operations.php:106
#, fuzzy
msgid "Rename view to"
msgstr "Перайменаваць табліцу ў"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
msgid "Delete the view (DROP)"
msgstr "Базы дадзеных адсутнічаюць"
@@ -18053,6 +18040,19 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "максымум адначасовых злучэньняў"
+#, fuzzy
+#~| msgid "Delete relation"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Выдаліць сувязь"
+#~ msgstr[1] "Выдаліць сувязь"
+#~ msgstr[2] "Выдаліць сувязь"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Закладка была выдаленая."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/be@latin.po b/po/be@latin.po
index 2eebd57021..cd90a506ae 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:22+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14755,15 +14745,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14778,17 +14764,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14810,23 +14797,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Kolkaść adkrytych tablic."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Kolkaść adkrytych tablic."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14855,17 +14842,17 @@ msgstr "Tablica %1$s stvoranaja."
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "U pačatku tablicy"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14886,19 +14873,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Kolkaść adkrytych tablic."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Radok byŭ vydaleny"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15602,7 +15589,7 @@ msgstr "Prahladzieć damp (schiemu) tablicy"
msgid "Invalid table name"
msgstr "Niekarektnaje imia tablicy"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16746,7 +16733,7 @@ msgid "at beginning of table"
msgstr "U pačatku tablicy"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16795,7 +16782,7 @@ msgstr "padzielenaja na sekcyi"
msgid "Edit partitioning"
msgstr "Skasavać padzieł na častki"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16931,11 +16918,11 @@ msgstr "Nazva prahladu"
msgid "Column names"
msgstr "Nazvy kalonak"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Copy database to"
msgid "Delete the view (DROP)"
@@ -18137,6 +18124,19 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "maksymum adnačasovych złučeńniaŭ"
+#, fuzzy
+#~| msgid "Delete relation"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Vydalić suviaź"
+#~ msgstr[1] "Vydalić suviaź"
+#~ msgstr[2] "Vydalić suviaź"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Zakładka była vydalenaja."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/bg.po b/po/bg.po
index 94090bf2d8..288e4d419b 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-06-28 13:36+0200\n"
"Last-Translator: Valter Georgiev AUTO_INCREMENT for zero values"
msgstr "Да не се използва AUTO_INCREMENT за нулеви стойности"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14153,15 +14144,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -14176,17 +14163,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -14208,23 +14196,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Броят отворени таблици."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Броят отворени таблици."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14257,17 +14245,17 @@ msgstr "Събитието %1$s беше създадено."
msgid "Variable name was expected."
msgstr "Шаблон за име на таблица"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "В началото на таблицата"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14290,19 +14278,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Броят отворени таблици."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Редът беше изтрит"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15008,7 +14996,7 @@ msgstr "Схема (дъмп) на таблицата"
msgid "Invalid table name"
msgstr "Невалидно име на таблица"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16081,7 +16069,7 @@ msgid "at beginning of table"
msgstr "В началото на таблицата"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Position"
msgid "Partitions"
@@ -16126,7 +16114,7 @@ msgstr "Положение"
msgid "Edit partitioning"
msgstr "Редактиране"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Изглед за редакция"
@@ -16253,11 +16241,11 @@ msgstr "Име на ИЗГЛЕД"
msgid "Column names"
msgstr "Име на колона"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Преименуване на изгледа на"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Delete the table (DROP)"
msgid "Delete the view (DROP)"
@@ -17388,6 +17376,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert e 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Изтриване на %d отметка"
+#~ msgstr[1] "Изтриване на %d отметки"
+
+#~ msgid "private"
+#~ msgstr "частен"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s и %3$s бележките бяха включени"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/bn.po b/po/bn.po
index 101ce07f83..c574ee1977 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:44+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr "শুন্য মানের জন্য AUTO_INCREMENT ব্যবহার করো না"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "এক্সএমএল"
@@ -14200,15 +14189,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14223,17 +14208,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14255,23 +14241,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "খোলা টেবিলের সংখ্যা।"
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "খোলা টেবিলের সংখ্যা।"
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14304,17 +14290,17 @@ msgstr "ইভেন্ট %1$s তৈরী হয়েছে।"
msgid "Variable name was expected."
msgstr "টেবলের নামের নকশা"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "টেবিলের শুরুতে"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14337,19 +14323,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "খোলা টেবিলের সংখ্যা।"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "রো টি মুছা হয়েছে।"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15054,7 +15040,7 @@ msgstr "টেবিলের স্তুপ (গঠন) দেখাও"
msgid "Invalid table name"
msgstr "টেবিলের নামটি অকার্যকর"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16095,7 +16081,7 @@ msgid "at beginning of table"
msgstr "টেবিলের শুরুতে"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16144,7 +16130,7 @@ msgstr "খন্ড করা হয়েছে"
msgid "Edit partitioning"
msgstr "খন্ড মুছ"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "সম্পাদনা ভিউ"
@@ -16271,11 +16257,11 @@ msgstr "ভিউ এর নাম"
msgid "Column names"
msgstr "স্তম্ভের নাম"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "ভিউ এর নাম পরিবর্তন কর"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "ভিউটি মুছ (DROP)"
@@ -17498,6 +17484,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert এর জন্য ০ নির্ধারন করা হয়েছে"
+#, fuzzy
+#~| msgid "Delete relation"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "সর্ম্পক মুছা"
+#~ msgstr[1] "সর্ম্পক মুছা"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "বুকর্মাকটি মুছা হয়েছে।"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/br.po b/po/br.po
index 6651aca776..f8fa2800ac 100644
--- a/po/br.po
+++ b/po/br.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2014-03-28 11:07+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -14079,15 +14068,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No rows selected"
@@ -14102,17 +14087,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No rows selected"
msgid "An alias was expected."
@@ -14134,19 +14120,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The bookmark has been deleted."
msgid "A rename operation was expected."
@@ -14177,17 +14163,17 @@ msgstr "Krouet eo bet an argerzh %1s."
msgid "Variable name was expected."
msgstr "Patrom anv taolenn"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "Number of inserted rows"
msgid "Unexpected beginning of statement."
msgstr "Niver a linennoù da ensoc'hañ"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14208,17 +14194,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The bookmark has been deleted."
msgid "At least one column definition was expected."
msgstr "Diverket eo bet ar sined."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14906,7 +14892,7 @@ msgstr ""
msgid "Invalid table name"
msgstr "Anv taolenn direizh"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -15964,7 +15950,7 @@ msgid "at beginning of table"
msgstr "Niver a linennoù da ensoc'hañ"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Relations"
msgid "Partitions"
@@ -16009,7 +15995,7 @@ msgstr "Darempredoù"
msgid "Edit partitioning"
msgstr "Mod aozañ"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16140,11 +16126,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Drop the database (DROP)"
msgid "Delete the view (DROP)"
@@ -17301,6 +17287,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr ""
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Klask"
+#~ msgstr[1] "Klask"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Diverket eo bet ar sined."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/brx.po b/po/brx.po
index 6c91690c38..cd02032655 100644
--- a/po/brx.po
+++ b/po/brx.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-09-04 09:33+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -12727,15 +12717,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr ""
@@ -12748,17 +12734,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr ""
@@ -12776,19 +12763,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr ""
@@ -12814,15 +12801,15 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -12843,15 +12830,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -13509,7 +13496,7 @@ msgstr ""
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -14405,7 +14392,7 @@ msgid "at beginning of table"
msgstr ""
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr ""
@@ -14438,7 +14425,7 @@ msgstr ""
msgid "Edit partitioning"
msgstr ""
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -14553,11 +14540,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr ""
diff --git a/po/bs.po b/po/bs.po
index 79e19def1e..9797712496 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:31+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14137,15 +14126,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14160,17 +14145,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14192,19 +14178,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14233,17 +14219,17 @@ msgstr "Tabela %s je odbačena"
msgid "Variable name was expected."
msgstr "Šablon imena datoteke"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "Na početku tabele"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14264,17 +14250,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Red je obrisan"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14977,7 +14963,7 @@ msgstr "Prikaži sadržaj (shemu) tabele"
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16085,7 +16071,7 @@ msgid "at beginning of table"
msgstr "Na početku tabele"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Relations"
msgid "Partitions"
@@ -16130,7 +16116,7 @@ msgstr "Relacije"
msgid "Edit partitioning"
msgstr "Dodaj novo polje"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16264,12 +16250,12 @@ msgstr ""
msgid "Column names"
msgstr "Imena kolona"
-#: view_operations.php:97
+#: view_operations.php:106
#, fuzzy
msgid "Rename view to"
msgstr "Promjeni ime tabele u "
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
msgid "Delete the view (DROP)"
msgstr "Baza ne postoji"
@@ -17380,6 +17366,19 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr ""
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Pretraživanje"
+#~ msgstr[1] "Pretraživanje"
+#~ msgstr[2] "Pretraživanje"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Obilježivač je upravo obrisan."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/ca.po b/po/ca.po
index c03d8defe5..ae1a8cf5ff 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,11 +3,11 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2016-02-11 23:11+0000\n"
"Last-Translator: Xavier Navarro AUTO_INCREMENT for zero values"
msgstr "No feu servir AUTO_INCREMENT per a valors zero"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13792,15 +13778,11 @@ msgstr "S'esperaven %1$d valors, però s'han trobat %2$d."
msgid "An opening bracket followed by a set of values was expected."
msgstr "S'esperava un claudàtor d'obertura seguit per un conjunt de valors."
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr "S'esperava un claudàtor d'obertura."
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr "S'esperava una coma o un claudàtor de tancament"
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr "S'esperava una coma o un claudàtor de tancament."
@@ -13813,17 +13795,18 @@ msgstr "S'esperava un claudàtor de tancament."
msgid "Unrecognized data type."
msgstr "Tipus de dades desconegut."
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr "S'ha trobat un àlies anteriorment."
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr "Punt inesperat."
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "S'esperava un àlies."
@@ -13841,19 +13824,19 @@ msgstr "S'esperava un desplaçament."
msgid "This option conflicts with \"%1$s\"."
msgstr "Aquesta opció està en conflicte amb \"%1$s\"."
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "S'esperava el nom antic de la taula."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr "S'esperava la paraula clau \"TO\"."
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr "S'esperava el nou nom de la taula."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "S'esperava una operació de canvi de nom."
@@ -13879,15 +13862,15 @@ msgstr "S'esperava una cometa de tancament %1$s."
msgid "Variable name was expected."
msgstr "S'esperava un nom de variable."
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr "Inici no esperat de declaració."
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr "Tipus de declaració no reconegut."
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr "No s'ha iniciat cap transacció anteriorment."
@@ -13910,15 +13893,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr "Paraula clau no reconeguda."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr "S'esperava el nom de l'entitat."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "S'esperava al menys la definició d'una columna."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr "S'esperava una paraula clau \"RETURNS\"."
@@ -14610,7 +14593,7 @@ msgstr "Veure un bolcat (esquema) de la taula"
msgid "Invalid table name"
msgstr "Nom de taula incorrecte"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Fila: %1$s, Columna: %2$s, Error: %3$s"
@@ -15530,7 +15513,7 @@ msgid "at beginning of table"
msgstr "a l'inici de la taula"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Particions"
@@ -15563,7 +15546,7 @@ msgstr "Taula de partició"
msgid "Edit partitioning"
msgstr "Edita particionament"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Editar vista"
@@ -15678,11 +15661,11 @@ msgstr "Nom de VISTA"
msgid "Column names"
msgstr "Nom de les columnes"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Reanomena la vista a"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Esborrar la vista (DROP)"
@@ -16983,6 +16966,20 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "{concurrent_insert} està establert a 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Total %d desat"
+#~ msgstr[1] "Total %d desats"
+
+#~ msgid "private"
+#~ msgstr "privat"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s i %3$s desats inclosos"
+
+#~ msgid "A comma or a closing bracket was expected"
+#~ msgstr "S'esperava una coma o un claudàtor de tancament"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/ckb.po b/po/ckb.po
index c79575e05c..de5097a0d6 100644
--- a/po/ckb.po
+++ b/po/ckb.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-11-20 15:47+0000\n"
"Last-Translator: Dana Akram AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -13435,15 +13426,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -13458,17 +13445,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -13490,19 +13478,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -13530,17 +13518,17 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "Number of rows"
msgid "Unexpected beginning of statement."
msgstr "ژمارەی ڕیزەکان"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -13561,17 +13549,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "ڕیزەکە سڕایەوە"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14249,7 +14237,7 @@ msgstr ""
msgid "Invalid table name"
msgstr "ناوی خشتەی نادروست"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -15269,7 +15257,7 @@ msgid "at beginning of table"
msgstr "ژمارەی ڕیزەکان"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partial texts"
msgid "Partitions"
@@ -15314,7 +15302,7 @@ msgstr "تێکستە لاوەکیەکان"
msgid "Edit partitioning"
msgstr "چاکردنی نیشاندەر"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -15439,11 +15427,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Drop the database (DROP)"
msgid "Delete the view (DROP)"
@@ -16504,6 +16492,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "نرخی concurrent_insert ڕێکخراوە بۆ 0"
+#, fuzzy
+#~| msgid "Table Search"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "گەڕانی خشتە"
+#~ msgstr[1] "گەڕانی خشتە"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "شوێندۆز سڕایەوە."
+
#, fuzzy
#~| msgid "Replace table prefix"
#~ msgid "Replace table prefix:"
diff --git a/po/cs.po b/po/cs.po
index 493906306d..9d74b726da 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
-"PO-Revision-Date: 2016-02-16 10:08+0000\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
+"PO-Revision-Date: 2016-02-17 12:16+0000\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr "Nepoužívat AUTO_INCREMENT pro nulové hodnoty"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13651,15 +13643,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -13674,17 +13662,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -13706,23 +13695,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Počet aktuálně otevřených tabulek."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Počet aktuálně otevřených tabulek."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "Template was deleted."
msgid "A rename operation was expected."
@@ -13755,17 +13744,17 @@ msgstr "Byla vytvořena událost %1$s."
msgid "Variable name was expected."
msgstr "Vzor pro jméno tabulky"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "at beginning of table"
msgid "Unexpected beginning of statement."
msgstr "na začátku tabulky"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -13788,19 +13777,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Počet aktuálně otevřených tabulek."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "Template was deleted."
msgid "At least one column definition was expected."
msgstr "Šablona byla smazána."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -13957,7 +13946,7 @@ msgstr "Vytvořit verzi"
#: libraries/tracking.lib.php:205
#, php-format
msgid "Activate tracking for %s"
-msgstr "Zapnuté sledování pro %s"
+msgstr "Zapnout sledování pro %s"
#: libraries/tracking.lib.php:207
msgid "Activate now"
@@ -14489,7 +14478,7 @@ msgstr "Export tabulky"
msgid "Invalid table name"
msgstr "Chybné jméno tabulky"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Řádek: %1$s, Sloupec: %2$s, Chyba: %3$s"
@@ -15467,7 +15456,7 @@ msgid "at beginning of table"
msgstr "na začátku tabulky"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Oddíly"
@@ -15510,7 +15499,7 @@ msgstr "používá oddíly"
msgid "Edit partitioning"
msgstr "Zrušit dělení"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Upravit pohled"
@@ -15629,11 +15618,11 @@ msgstr "Jméno pohledu"
msgid "Column names"
msgstr "Názvy polí"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Přejmenovat pohled na"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Odstranit pohled (DROP)"
@@ -16897,6 +16886,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert je nastaveno na 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Celkem %d záložka"
+#~ msgstr[1] "Celkem %d záložky"
+#~ msgstr[2] "Celkem %d záložek"
+
+#~ msgid "private"
+#~ msgstr "soukromá"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s a %3$s záložky zahrnuty"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/cy.po b/po/cy.po
index 2c49b30f58..bd700ccfce 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:04+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -14232,15 +14234,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14255,17 +14253,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14287,19 +14286,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14330,17 +14329,17 @@ msgstr "Cafodd y gronfa ddata %1$s ei chreu."
msgid "Variable name was expected."
msgstr "Templed enw tabl"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "Show dimension of tables"
msgid "Unexpected beginning of statement."
msgstr "Dangos dimensiynau'r tabl"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14361,17 +14360,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Cafodd y rhes ei dileu"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15079,7 +15078,7 @@ msgstr ""
msgid "Invalid table name"
msgstr "Enw tabl annilys"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16183,7 +16182,7 @@ msgid "at beginning of table"
msgstr "Dangos dimensiynau'r tabl"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16230,7 +16229,7 @@ msgstr "Ymraniad %s"
msgid "Edit partitioning"
msgstr "Tynnu'r ymraniadu"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16363,11 +16362,11 @@ msgstr "Enw VIEW"
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Ailenwch golwg i"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Copy database to"
msgid "Delete the view (DROP)"
@@ -17551,6 +17550,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr ""
+#, fuzzy
+#~| msgid "Delete relation"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Dilëwch berthynas"
+#~ msgstr[1] "Dilëwch berthynas"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Cafodd y clustnod ei ddileu."
+
#, fuzzy
#~| msgid "Rename table to"
#~ msgid "Replace table prefix:"
diff --git a/po/da.po b/po/da.po
index 2532054120..1cf87fb71c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-09-16 14:31+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr "Brug ikke AUTO_INCREMENT for nulværdier"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13940,15 +13931,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -13963,17 +13950,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -13995,23 +13983,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Antallet af tabeller der er åbne."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Antallet af tabeller der er åbne."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14044,17 +14032,17 @@ msgstr "Hændelse %1$s er oprettet."
msgid "Variable name was expected."
msgstr "Skabelon for tabelnavn"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "at beginning of table"
msgid "Unexpected beginning of statement."
msgstr "i begyndelsen af tabellen"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14077,19 +14065,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Antallet af tabeller der er åbne."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Rækken er slettet."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14789,7 +14777,7 @@ msgstr "Vis dump (skema) over tabel"
msgid "Invalid table name"
msgstr "Ugyldigt tabelnavn"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Række: %1$s, kolonne: %2$s, fejl: %3$s"
@@ -15756,7 +15744,7 @@ msgid "at beginning of table"
msgstr "i begyndelsen af tabellen"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -15805,7 +15793,7 @@ msgstr "partitioneret"
msgid "Edit partitioning"
msgstr "Fjern partitionering"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Rediger view"
@@ -15924,11 +15912,11 @@ msgstr "VIEW navn"
msgid "Column names"
msgstr "Kolonnenavne"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Omdøb view til"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Slet visningen (DROP)"
@@ -17211,6 +17199,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert er sat til 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "I alt %d bogmærke"
+#~ msgstr[1] "I alt %d bogmærker"
+
+#~ msgid "private"
+#~ msgstr "privat"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s og %3$s bogmærker blev inkluderet"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/de.po b/po/de.po
index dc4efd1493..289ec40612 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2016-01-18 18:42+0000\n"
"Last-Translator: BlackyPanther AUTO_INCREMENT for zero values"
msgstr "AUTO_INCREMENT nicht für Nullwerte verwenden"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13949,15 +13941,11 @@ msgid "An opening bracket followed by a set of values was expected."
msgstr ""
"Eine öffnende Klammer, gefolgt von einer Liste von Werten, wurde erwartet."
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr "Eine öffnende Klammer wurde erwartet."
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr "Ein Komma oder eine schließende Klammer wurde erwartet"
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr "Ein Komma oder eine schließende Klammer wird erwartet."
@@ -13970,17 +13958,18 @@ msgstr "Eine schließende Klammer wurde erwartet."
msgid "Unrecognized data type."
msgstr "Unerkannter Datentyp."
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr "Ein Alias wurde zuvor gefunden."
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr "Unerwarteter Punkt."
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "Ein Alias wurde erwartet."
@@ -13998,19 +13987,19 @@ msgstr "Ein Offset wurde erwartet."
msgid "This option conflicts with \"%1$s\"."
msgstr "Diese Option widerspricht „%1$s“."
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "Der ursprüngliche Tabellenname wurde erwartet."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr "Schlüsselwort „TO“ wurde erwartet."
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr "Der neue Tabellenname wurde erwartet."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "Eine Umbenennungsoperation wurde erwartet."
@@ -14036,15 +14025,15 @@ msgstr "Schließendes Anführungszeichen %1$s wurde erzeugt."
msgid "Variable name was expected."
msgstr "Variablenname wurde erwartet."
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr "Unerwarteter Statement-Anfang."
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr "Unerkannte Statement-Typ."
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr "Bisher wurde keine Transaktion gestartet."
@@ -14067,15 +14056,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr "Unerkanntes Schlüsselwort."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr "Der Name der Entität wurde erwartet."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "Mindestens eine Felddefinition wurde erwartet."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr "Ein „RETURNS“-Schlüsselwort wurde erwartet."
@@ -14769,7 +14758,7 @@ msgstr "Dump (Schema) der Tabelle anzeigen"
msgid "Invalid table name"
msgstr "Ungültiger Tabellenname"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Zeile: %1$s, Spalte: %2$s, Fehler: %3$s"
@@ -15693,7 +15682,7 @@ msgid "at beginning of table"
msgstr "am Tabellenanfang"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Partitionen"
@@ -15726,7 +15715,7 @@ msgstr "Partitioniere Tabelle"
msgid "Edit partitioning"
msgstr "Bearbeite die Partitionierung"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "View/Ansicht bearbeiten"
@@ -15841,11 +15830,11 @@ msgstr "VIEW Name"
msgid "Column names"
msgstr "Spaltennamen"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "View umbenennen in"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Ansicht löschen (DROP)"
@@ -17147,6 +17136,20 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert ist auf 0 gesetzt"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Insgesamt %d Lesezeichen"
+#~ msgstr[1] "Insgesamt %d Lesezeichen"
+
+#~ msgid "private"
+#~ msgstr "privat"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s und %3$s Lesezeichen enthalten"
+
+#~ msgid "A comma or a closing bracket was expected"
+#~ msgstr "Ein Komma oder eine schließende Klammer wurde erwartet"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/el.po b/po/el.po
index d1cca99e1a..a67bd7833a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
-"PO-Revision-Date: 2016-02-08 21:43+0000\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
+"PO-Revision-Date: 2016-02-17 12:54+0000\n"
"Last-Translator: Παναγιώτης Παπάζογλου AUTO_INCREMENT for zero values"
msgstr "Να μην γίνεται AUTO_INCREMENT σε μηδενικές τιμές"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "Κώδικας XML"
@@ -13903,15 +13893,11 @@ msgstr "Αναμενόταν %1$d τιμές, αλλά βρέθηκαν %2$d."
msgid "An opening bracket followed by a set of values was expected."
msgstr "Αναμενόταν μια ανοιχτή αγκύλη ακολουθούμενη από ένα σύνολο τιμών."
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr "Αναμενόταν μια ανοιχτή αγκύλη."
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr "Αναμενόταν ένα κόμμα ή μια κλειστή αγκύλη"
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr "Αναμενόταν ένα κόμμα ή μια κλειστή αγκύλη."
@@ -13924,17 +13910,18 @@ msgstr "Αναμενόταν κλείσιμο αγκύλης."
msgid "Unrecognized data type."
msgstr "Μη αναγνωρισμένος τύπος δεδομένων."
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr "Βρέθηκε μια ετικέτα προηγουμένως."
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr "Μη αναμενόμενη τελεία."
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "Αναμενόταν μια ετικέτα."
@@ -13952,19 +13939,19 @@ msgstr "Αναμενόταν μια αντιστάθμιση."
msgid "This option conflicts with \"%1$s\"."
msgstr "Αυτή η επιλογή έχει διαίνεξη με το «%1$s»."
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "Αναμενόταν το παλαιό όνομα του πίνακα."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr "Αναμενόταν η λέξη-κλειδί «TO»."
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr "Αναμενόταν το νέο όνομα του πίνακα."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "Αναμενόταν μια λειτουργία μετονομασίας."
@@ -13990,15 +13977,15 @@ msgstr "Αναμενόταν τελικό εισαγωγικό %1$s."
msgid "Variable name was expected."
msgstr "Αναμενόταν όνομα μεταβλητής."
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr "Μη αναμενόμενη έναρξη δήλωσης."
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr "Μη αναγνωρισμένος τύπος δήλωσης."
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr "Καμιά συναλλαγή δεν ξεκίνησε προηγουμένως."
@@ -14021,15 +14008,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr "Μη αναγνωρισμένη λέξη κλειδί."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr "Αναμενόταν το όνομα της οντότητας."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "Αναμενόταν τουλάχιστον ένας ορισμός πεδίου."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr "Αναμενόταν μια λέξη-κλειδί «RETURNS»."
@@ -14727,7 +14714,7 @@ msgstr "Εμφάνιση σκαριφήματος (σχήματος) του πί
msgid "Invalid table name"
msgstr "Μη έγκυρο όνομα πίνακα"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Γραμμή: %1$s, Στήλη: %2$s, Σφάλμα: %3$s"
@@ -15651,7 +15638,7 @@ msgid "at beginning of table"
msgstr "στην αρχή του πίνακα"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Κατατμήσεις"
@@ -15684,7 +15671,7 @@ msgstr "Πίνακας κατάτμησης"
msgid "Edit partitioning"
msgstr "Επεξεργασία κατάτμησης"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Επεξεργασία εμφάνισης"
@@ -15799,11 +15786,11 @@ msgstr "Όνομα VIEW"
msgid "Column names"
msgstr "Ονόματα στηλών"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Μετονομασία πίνακα σε"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Διαγραφή της προβολής (DROP)"
@@ -17123,6 +17110,20 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "Το concurrent_insert έχει οριστεί στο 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Συνολικά %d σελιδοδείκτης"
+#~ msgstr[1] "Συνολικά %d σελιδοδείκτες"
+
+#~ msgid "private"
+#~ msgstr "ιδιωτικό"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s και %3$s σελιδοδείκτες περιλαμβάνονται"
+
+#~ msgid "A comma or a closing bracket was expected"
+#~ msgstr "Αναμενόταν ένα κόμμα ή μια κλειστή αγκύλη"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/en_GB.po b/po/en_GB.po
index 092ba4ad80..08fc357ab2 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:38+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr "Do not use AUTO_INCREMENT for zero values"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14234,15 +14223,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14257,17 +14242,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14289,23 +14275,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "The number of tables that are open."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "The number of tables that are open."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14338,17 +14324,17 @@ msgstr "Event %1$s has been created."
msgid "Variable name was expected."
msgstr "Table name template"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "At Beginning of Table"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14371,19 +14357,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "The number of tables that are open."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "The row has been deleted."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15080,7 +15066,7 @@ msgstr "View dump (schema) of table"
msgid "Invalid table name"
msgstr "Invalid table name"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16123,7 +16109,7 @@ msgid "at beginning of table"
msgstr "At Beginning of Table"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16172,7 +16158,7 @@ msgstr "partitioned"
msgid "Edit partitioning"
msgstr "Remove partitioning"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Edit view"
@@ -16299,11 +16285,11 @@ msgstr "VIEW name"
msgid "Column names"
msgstr "Column names"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Rename view to"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Delete the view (DROP)"
@@ -17592,6 +17578,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert is set to 0"
+#, fuzzy
+#~| msgid "Delete relation"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Delete relation"
+#~ msgstr[1] "Delete relation"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "The bookmark has been deleted."
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/eo.po b/po/eo.po
index 689b193cb9..385cd05658 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-12-29 15:34+0000\n"
"Last-Translator: Robin van der Vliet AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -12728,15 +12718,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr ""
@@ -12749,17 +12735,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr ""
@@ -12777,19 +12764,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr ""
@@ -12815,15 +12802,15 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -12844,15 +12831,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -13510,7 +13497,7 @@ msgstr ""
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -14409,7 +14396,7 @@ msgid "at beginning of table"
msgstr ""
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr ""
@@ -14442,7 +14429,7 @@ msgstr ""
msgid "Edit partitioning"
msgstr ""
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -14557,11 +14544,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 32c45a0f5b..0fe79c325b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-14 14:56+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr "No utilizar AUTO_INCREMENT con el valor 0"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13989,15 +13980,11 @@ msgid "An opening bracket followed by a set of values was expected."
msgstr ""
"Se esperaba un corchete de apertura seguido por un conjunto de valores."
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr "Se esperaba un corchete de apertura."
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr "Se esperaba una coma o un corchete de cierre"
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr "Se esperaba una coma o un corchete de cierre."
@@ -14010,17 +13997,18 @@ msgstr "Se esperaba un corchete de cierre."
msgid "Unrecognized data type."
msgstr "Tipo de dato desconocido."
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr "Se encontró anteriormente un alias."
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr "Punto inesperado."
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "Se esperaba un alias."
@@ -14038,19 +14026,19 @@ msgstr "Se espera un desplazamiento."
msgid "This option conflicts with \"%1$s\"."
msgstr "Esta opción tiene conflictos con \"%1$s\"."
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "Se esperaba el nombre anterior de la tabla."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr "Se esperaba la palabra clave \"TO\"."
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr "Se esperaba el nuevo nombre de la tabla."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "Se esperaba un cambio de nombre."
@@ -14076,15 +14064,15 @@ msgstr "Se esperaba terminar la cita %1$s."
msgid "Variable name was expected."
msgstr "Se esperaba el nombre de la variable."
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr "Comienzo inesperado de declaración."
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr "Tipo de declaración desconocida."
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr "Ninguna operación se inició anteriormente."
@@ -14107,15 +14095,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr "Palabra clave no reconocida."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr "Se esperaba el nombre de la entidad."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "Se esperaba la definición de al menos una columna."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr "Se esperaba una palabra \"RETURNS\"."
@@ -14811,7 +14799,7 @@ msgstr "Mostrar volcado (esquema) de la tabla"
msgid "Invalid table name"
msgstr "El nombre de la tabla no es válido"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Fila: %1$s, Columna: %2$s, Error: %3$s"
@@ -15774,7 +15762,7 @@ msgid "at beginning of table"
msgstr "Al comienzo de la tabla"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Particiones"
@@ -15813,7 +15801,7 @@ msgstr "Dividido por:"
msgid "Edit partitioning"
msgstr "Remueva la partición"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Editar vista"
@@ -15932,11 +15920,11 @@ msgstr "VER nombre"
msgid "Column names"
msgstr "Nombre de las columnas"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Cambiar el nombre de la vista a"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Borrar la vista (DROP)"
@@ -17261,6 +17249,20 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "«concurrent_insert» está definido como 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Total de %d favorito"
+#~ msgstr[1] "Total de %d favoritos"
+
+#~ msgid "private"
+#~ msgstr "privado"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s y %3$s favoritos incluidos"
+
+#~ msgid "A comma or a closing bracket was expected"
+#~ msgstr "Se esperaba una coma o un corchete de cierre"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/et.po b/po/et.po
index d3caf307f4..af5cd451fb 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
-"PO-Revision-Date: 2016-02-08 14:54+0000\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
+"PO-Revision-Date: 2016-02-17 13:22+0000\n"
"Last-Translator: Kristjan Räts AUTO_INCREMENT for zero values"
msgstr "Ära kasuta nulliliste väärtuste puhul AUTO_INCREMENT"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13607,15 +13597,11 @@ msgstr "Oodati %1$d väärtust, kuid leiti %2$d."
msgid "An opening bracket followed by a set of values was expected."
msgstr "Oodati avanevat sulgu, millele järgnevad väärtused."
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr "Oodati avanevat sulgu."
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr "Oodati koma või lõpetavat sulgu"
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr "Oodati koma või lõpetavat sulgu."
@@ -13628,17 +13614,18 @@ msgstr "Oodati lõpetavat sulgu."
msgid "Unrecognized data type."
msgstr "Tundmatu andmetüüp."
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr "Eelnevalt leiti alias."
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr "Ootamatu punkt."
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "Oodati aliast."
@@ -13656,19 +13643,19 @@ msgstr "Oodati nihet."
msgid "This option conflicts with \"%1$s\"."
msgstr "See säte põhjustab konflikti sättega \"%1$s\"."
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "Oodati tabeli vana nime."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr "Oodati võtmesõna \"TO\"."
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr "Oodati tabeli uut nime."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "Oodati ümbernimetamist."
@@ -13694,15 +13681,15 @@ msgstr "Oodati lõpetavat sümbolit %1$s."
msgid "Variable name was expected."
msgstr "Oodati muutuja nime."
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr "Ootamatu lause algus."
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr "Tundmatut tüüpi lause."
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr "Transaktsiooni ei olnud eelnevalt alustatud."
@@ -13723,15 +13710,15 @@ msgstr "Leiti uus lause, kuid selle ja talle järgneva vahelt puudub eraldaja."
msgid "Unrecognized keyword."
msgstr "Tundmatu võtmesõna."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr "Oodati olemi nime."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "Oodati vähemalt ühe veeru kirjeldust."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr "Oodati võtmesõna \"RETURNS\"."
@@ -14421,7 +14408,7 @@ msgstr "Vaata tabeli tõmmist (skeemi)"
msgid "Invalid table name"
msgstr "Vigane tabeli nimi"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Rida: %1$s, veerg: %2$s, viga: %3$s"
@@ -15339,7 +15326,7 @@ msgid "at beginning of table"
msgstr "tabeli alguses"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Partitsioonid"
@@ -15372,7 +15359,7 @@ msgstr "Partitsioonide tabel"
msgid "Edit partitioning"
msgstr "Muuda partitsioneerimist"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Muuda vaadet"
@@ -15487,11 +15474,11 @@ msgstr "VIEW nimi"
msgid "Column names"
msgstr "Veeru nimed"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Muuda vaate nimeks"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Kustuta vaade (DROP)"
@@ -16750,6 +16737,20 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert väärtuseks on määratud 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Kokku %d järjehoidja"
+#~ msgstr[1] "Kokku %d järjehoidjat"
+
+#~ msgid "private"
+#~ msgstr "isiklikku"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s and %3$s järjehoidjat kaasatud"
+
+#~ msgid "A comma or a closing bracket was expected"
+#~ msgstr "Oodati koma või lõpetavat sulgu"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/eu.po b/po/eu.po
index 076a052058..645818d2ce 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:26+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14176,15 +14165,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14199,17 +14184,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14231,19 +14217,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14272,17 +14258,17 @@ msgstr "%s taula ezabatu egin da"
msgid "Variable name was expected."
msgstr "Txantiloi-fitxategiaren izena"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "Taularen hasieran"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14303,17 +14289,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Errenkada ezabatua izan da"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15024,7 +15010,7 @@ msgstr "Ikusi taularen iraulketa (eskema)"
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16137,7 +16123,7 @@ msgid "at beginning of table"
msgstr "Taularen hasieran"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Relations"
msgid "Partitions"
@@ -16182,7 +16168,7 @@ msgstr "Erlazioak"
msgid "Edit partitioning"
msgstr "Inprimatzeko ikuspegia"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16318,12 +16304,12 @@ msgstr ""
msgid "Column names"
msgstr "Zutabe izenak"
-#: view_operations.php:97
+#: view_operations.php:106
#, fuzzy
msgid "Rename view to"
msgstr "Taula berrizendatu izen honetara: "
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
msgid "Delete the view (DROP)"
msgstr "Datu-baserik ez"
@@ -17437,6 +17423,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr ""
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Bilatu"
+#~ msgstr[1] "Bilatu"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Gordetako kontsulta ezabatu da."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/fa.po b/po/fa.po
index 41e5809b80..925d5f2a14 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-11-21 11:45+0000\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13998,15 +13986,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14021,17 +14005,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14053,19 +14038,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14093,17 +14078,17 @@ msgstr "جدول %s حذف گرديد"
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "در ابتداي جدول"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14124,17 +14109,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "سطر حذف گرديد"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14847,7 +14832,7 @@ msgstr "نمايش الگوي جدول"
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -15942,7 +15927,7 @@ msgid "at beginning of table"
msgstr "در ابتداي جدول"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Position"
msgid "Partitions"
@@ -15987,7 +15972,7 @@ msgstr "موقعیت"
msgid "Edit partitioning"
msgstr "نماي چاپ"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16120,12 +16105,12 @@ msgstr ""
msgid "Column names"
msgstr "نام ستونها"
-#: view_operations.php:97
+#: view_operations.php:106
#, fuzzy
msgid "Rename view to"
msgstr "بازناميدن جدول به"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
msgid "Delete the view (DROP)"
msgstr "No databases"
@@ -17250,6 +17235,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "مقدار concurrent_insert صفر شده است"
+#, fuzzy
+#~| msgid "Delete relation"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "حذف رابطه"
+#~ msgstr[1] "حذف رابطه"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "تاریخچه حذف شد ."
+
#, fuzzy
#~| msgid "Replace table prefix"
#~ msgid "Replace table prefix:"
diff --git a/po/fi.po b/po/fi.po
index 04e541e220..450c068963 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,11 +3,11 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2016-02-11 19:47+0000\n"
"Last-Translator: Jouni Kähkönen AUTO_INCREMENT for zero values"
msgstr "Älä käytä nolla-arvoissa AUTO_INCREMENT:iä"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14222,15 +14176,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -14245,17 +14195,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -14277,23 +14228,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Avoinna olevien taulujen määrä."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Avoinna olevien taulujen määrä."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14326,17 +14277,17 @@ msgstr "Taulu %1$s on luotu."
msgid "Variable name was expected."
msgstr "Taulunimen pohja"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "Taulun alkuun"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14359,19 +14310,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Avoinna olevien taulujen määrä."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Rivi on nyt poistettu."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15125,7 +15076,7 @@ msgstr "Tee vedos taulusta"
msgid "Invalid table name"
msgstr "Virheellinen taulun nimi"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16242,7 +16193,7 @@ msgid "at beginning of table"
msgstr "Taulun alkuun"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16291,7 +16242,7 @@ msgstr "ositettu"
msgid "Edit partitioning"
msgstr "Poista ositus"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16427,12 +16378,12 @@ msgstr "VIEW-arvon nimi"
msgid "Column names"
msgstr "Sarakkeiden nimet"
-#: view_operations.php:97
+#: view_operations.php:106
#, fuzzy
msgid "Rename view to"
msgstr "Nimeä taulu uudelleen"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Go to database"
msgid "Delete the view (DROP)"
@@ -17639,6 +17590,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert on asetettu arvoon 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Yhteensä %d kirjanmerkki"
+#~ msgstr[1] "Yhteensä %d kirjanmerkkiä"
+
+#~ msgid "private"
+#~ msgstr "yksityinen"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s ja %3$s kirjanmerkit on luettu mukaan"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/fr.po b/po/fr.po
index 04b9db303a..cd70bb7a6b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
-"PO-Revision-Date: 2016-02-08 13:33+0000\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
+"PO-Revision-Date: 2016-02-17 12:53+0000\n"
"Last-Translator: Marc-Antoine Thevenet AUTO_INCREMENT for zero values"
msgstr "Ne pas utiliser AUTO_INCREMENT pour la valeur zéro"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13877,15 +13868,11 @@ msgstr "%1$d valeurs étaient attendues, mais %2$d ont été trouvées."
msgid "An opening bracket followed by a set of values was expected."
msgstr "Une parenthèse gauche suivie d'un ensemble de valeurs était attendus."
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr "Une parenthèse gauche était attendue."
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr "Une virgule ou une parenthèse droite était attendus"
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr "Une virgule ou une parenthèse droite était attendus."
@@ -13898,17 +13885,18 @@ msgstr "Une parenthèse droite était attendue."
msgid "Unrecognized data type."
msgstr "Type de données non reconnu."
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr "Un alias a été constaté précédemment."
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr "Point inattendu."
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "Un alias était attendu."
@@ -13926,19 +13914,19 @@ msgstr "Un décalage était prévu."
msgid "This option conflicts with \"%1$s\"."
msgstr "Cette option entre en conflit avec « %1$s »."
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "L'ancien nom de la table était attendu."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr "Le mot clé « TO » était attendu."
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr "Le nouveau nom de la table était attendu."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "Une opération de renommage était attendue."
@@ -13964,15 +13952,15 @@ msgstr "Un guillemet %1$s était attendu."
msgid "Variable name was expected."
msgstr "Un nom de variable était attendu."
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr "Début d'énoncé inattendu."
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr "Type d'énoncé non reconnu."
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr "Aucune transaction n'a été précédemment démarrée."
@@ -13995,15 +13983,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr "Mot clé non reconnu."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr "Le nom de l'entité était attendu."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "La définition d'au moins une colonne était attendue."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr "Le mot clé « RETURNS » était attendu."
@@ -14699,7 +14687,7 @@ msgstr "Afficher le schéma de la table"
msgid "Invalid table name"
msgstr "Nom de table invalide"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Ligne : %1$s, Colonne : %2$s, Erreur : %3$s"
@@ -15620,7 +15608,7 @@ msgid "at beginning of table"
msgstr "en début de table"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Partitions"
@@ -15653,7 +15641,7 @@ msgstr "Partitionner la table :"
msgid "Edit partitioning"
msgstr "Modifier le partitionnement"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Modifier la vue"
@@ -15768,11 +15756,11 @@ msgstr "Nom de la vue"
msgid "Column names"
msgstr "Nom des colonnes"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Changer le nom de la vue pour"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Supprimer la vue (DROP)"
@@ -17059,6 +17047,20 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "Le paramètre concurrent_insert a une valeur de 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Total de %d signet"
+#~ msgstr[1] "Total de %d signets"
+
+#~ msgid "private"
+#~ msgstr "privé"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, incluant les signets de type «%2$s» et «%3$s»"
+
+#~ msgid "A comma or a closing bracket was expected"
+#~ msgstr "Une virgule ou une parenthèse droite était attendus"
+
# OK
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
diff --git a/po/fy.po b/po/fy.po
index e530fbd941..5cff8be318 100644
--- a/po/fy.po
+++ b/po/fy.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-12-24 23:02+0000\n"
"Last-Translator: Robin van der Vliet AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -12920,15 +12910,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr ""
@@ -12941,17 +12927,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr ""
@@ -12969,19 +12956,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr ""
@@ -13007,17 +12994,17 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "Number of tables:"
msgid "Unexpected beginning of statement."
msgstr "Oantal tabellen:"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -13038,15 +13025,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -13707,7 +13694,7 @@ msgstr ""
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Rige: %1$s, Kolom: %2$s, Flater: %3$s"
@@ -14651,7 +14638,7 @@ msgid "at beginning of table"
msgstr "Oantal tabellen:"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -14696,7 +14683,7 @@ msgstr "Partysje %s"
msgid "Edit partitioning"
msgstr "Routine bewurkje"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -14815,11 +14802,11 @@ msgstr ""
msgid "Column names"
msgstr "Kolomnammen"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr ""
diff --git a/po/gl.po b/po/gl.po
index af567cf975..1f30131eac 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2016-01-17 22:02+0000\n"
"Last-Translator: Xosé Calvo AUTO_INCREMENT for zero values"
msgstr "Non empregar AUTO_INCREMENT cos valores cero"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14153,15 +14144,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14176,17 +14163,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14208,23 +14196,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "O número de táboas abertas."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "O número de táboas abertas."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14257,17 +14245,17 @@ msgstr "O acontecemento %1$s foi creado."
msgid "Variable name was expected."
msgstr "Modelo de nome dos ficheiros"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "No comezo da táboa"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14290,19 +14278,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "O número de táboas abertas."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Eliminouse a fileira"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15016,7 +15004,7 @@ msgstr "Ver o esquema do envorcado da táboa"
msgid "Invalid table name"
msgstr "O nome de táboa non é correcto"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16064,7 +16052,7 @@ msgid "at beginning of table"
msgstr "No comezo da táboa"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16113,7 +16101,7 @@ msgstr "particionado"
msgid "Edit partitioning"
msgstr "Eliminar particións"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Editar a vista"
@@ -16240,11 +16228,11 @@ msgstr "Nome da VISTA"
msgid "Column names"
msgstr "Nomes das columnas"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Renomear a vista como"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Delete the table (DROP)"
msgid "Delete the view (DROP)"
@@ -17588,6 +17576,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert está definido como 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "%d marcador en total"
+#~ msgstr[1] "%d marcadores en total"
+
+#~ msgid "private"
+#~ msgstr "privado"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s and %3$s marcadores incluídos"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/gu.po b/po/gu.po
index 853a020ded..1df81530e5 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2016-01-08 17:45+0000\n"
"Last-Translator: Nijraj Gelani AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -12729,15 +12719,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr ""
@@ -12750,17 +12736,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr ""
@@ -12778,19 +12765,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr ""
@@ -12816,15 +12803,15 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -12845,15 +12832,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -13511,7 +13498,7 @@ msgstr ""
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -14407,7 +14394,7 @@ msgid "at beginning of table"
msgstr ""
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr ""
@@ -14440,7 +14427,7 @@ msgstr ""
msgid "Edit partitioning"
msgstr ""
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -14555,11 +14542,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr ""
diff --git a/po/he.po b/po/he.po
index c493e0b241..bcba3db8ee 100644
--- a/po/he.po
+++ b/po/he.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-07-28 16:36+0200\n"
"Last-Translator: Moshe Harush AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14111,15 +14100,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14134,17 +14119,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14166,19 +14152,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14207,17 +14193,17 @@ msgstr "טבלה %s נמחקה"
msgid "Variable name was expected."
msgstr "תבנית שם קובץ"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "בתחילת טבלה"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14238,17 +14224,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "השורה נמחקה"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14953,7 +14939,7 @@ msgstr "ראיית הוצאה (תבנית) של טבלה"
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16067,7 +16053,7 @@ msgid "at beginning of table"
msgstr "בתחילת טבלה"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Position"
msgid "Partitions"
@@ -16112,7 +16098,7 @@ msgstr "מיקום"
msgid "Edit partitioning"
msgstr "הוספת שדה חדש"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16248,12 +16234,12 @@ msgstr ""
msgid "Column names"
msgstr "שמות עמודה"
-#: view_operations.php:97
+#: view_operations.php:106
#, fuzzy
msgid "Rename view to"
msgstr "שינוי שם טבלה אל"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
msgid "Delete the view (DROP)"
msgstr "אין מאגרי נתונים"
@@ -17371,6 +17357,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr ""
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "חיפוש"
+#~ msgstr[1] "חיפוש"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "הסימנייה נמחקה."
+
#, fuzzy
#~| msgid "Replace table prefix"
#~ msgid "Replace table prefix:"
diff --git a/po/hi.po b/po/hi.po
index ba1aa9ae2b..0b28bfa2f3 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:29+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14459,15 +14448,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14482,17 +14467,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14514,21 +14500,21 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "Title of browser window when a table is selected"
msgid "The old name of the table was expected."
msgstr "ब्राउज़र विंडो का शीर्षक है जब किसी भी सर्वर का चयन नहीं किया है"
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14559,17 +14545,17 @@ msgstr "%1$s टेबल बना दिया गया है"
msgid "Variable name was expected."
msgstr "टेबल नाम टेम्पलेट"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "टेबल के शुरू में"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14590,17 +14576,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "रौ को डिलीट कर दिया"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15325,7 +15311,7 @@ msgstr "टेबल डंप दृश्य"
msgid "Invalid table name"
msgstr "अवैध टेबल नाम"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16450,7 +16436,7 @@ msgid "at beginning of table"
msgstr "टेबल के शुरू में"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16499,7 +16485,7 @@ msgstr "विभाजित"
msgid "Edit partitioning"
msgstr "विभाजन हटायें"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16632,11 +16618,11 @@ msgstr "दृश्य का नाम"
msgid "Column names"
msgstr "कोलम के नाम"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "दृश्य का नाम बदलो"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Delete the table (DROP)"
msgid "Delete the view (DROP)"
@@ -17830,6 +17816,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert 0 पर सेट है"
+#, fuzzy
+#~| msgid "Delete relation"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "संबंध हटाना"
+#~ msgstr[1] "संबंध हटाना"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "यह बुकमार्क हटा दिया गया है."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/hr.po b/po/hr.po
index 547cff04cd..1ca5e09c46 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:24+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14696,15 +14686,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14719,17 +14705,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14751,23 +14738,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Broj otvorenih tablica."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Broj otvorenih tablica."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14797,17 +14784,17 @@ msgstr "Tablica %1$s je izrađena."
msgid "Variable name was expected."
msgstr "Predložak naziva datoteka"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "Pri početku tablice"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14828,19 +14815,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Broj otvorenih tablica."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Redak je izbrisan"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15556,7 +15543,7 @@ msgstr "Prikaži ispis (shemu) tablice"
msgid "Invalid table name"
msgstr "Neispravan naziv tablice"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16691,7 +16678,7 @@ msgid "at beginning of table"
msgstr "Pri početku tablice"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16740,7 +16727,7 @@ msgstr "particionirano"
msgid "Edit partitioning"
msgstr "Ukloni particioniranje"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16876,11 +16863,11 @@ msgstr "Naziv prikaza"
msgid "Column names"
msgstr "Nazivi stupaca"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Preimenuj prikaz u"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
msgid "Delete the view (DROP)"
msgstr "Nema baza podataka"
@@ -18070,6 +18057,19 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "najv. uzastopnih veza"
+#, fuzzy
+#~| msgid "Delete relation"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Izbriši relaciju"
+#~ msgstr[1] "Izbriši relaciju"
+#~ msgstr[2] "Izbriši relaciju"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Favorit je izbrisan."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/hu.po b/po/hu.po
index 201bc93980..72c282064e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:09+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr "Ne használja az AUTO_INCREMENT-et nulla értékekhez"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13955,15 +13947,11 @@ msgstr "%1$d értékek voltak elvárva, de %2$d található."
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -13978,17 +13966,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr "Felismerhetetlen adattípus."
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr "Egy álnév korábban már megtalálva."
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr "Váratlan pont."
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -14010,23 +13999,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr "Ez a lehetőség ütközik ezzel: „%1$s”."
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "A megnyitott táblák száma."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "A megnyitott táblák száma."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "Template was deleted."
msgid "A rename operation was expected."
@@ -14057,17 +14046,17 @@ msgstr "A(z) %1$s esemény létrejött."
msgid "Variable name was expected."
msgstr "Táblanév sablon"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "at beginning of table"
msgid "Unexpected beginning of statement."
msgstr "a tábla elejénél"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr "Felismerhetetlen utasítástípus."
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr "Nem volt korábban elindított tranzakció."
@@ -14092,19 +14081,19 @@ msgstr "Egy új utasítás található, de nincs elválasztó köztük."
msgid "Unrecognized keyword."
msgstr "Felismerhetetlen kulcsszó."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "A megnyitott táblák száma."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "Template was deleted."
msgid "At least one column definition was expected."
msgstr "A sablon törölve lett."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14805,7 +14794,7 @@ msgstr "Tábla kiírás (vázlat) megtekintése"
msgid "Invalid table name"
msgstr "Érvénytelen táblanév"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Sor: %1$s, oszlop: %2$s, hiba: %3$s"
@@ -15769,7 +15758,7 @@ msgid "at beginning of table"
msgstr "a tábla elejénél"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -15818,7 +15807,7 @@ msgstr "particionált"
msgid "Edit partitioning"
msgstr "Particionálás eltávolítása"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Nézet szerkesztése"
@@ -15937,11 +15926,11 @@ msgstr "NÉZET neve"
msgid "Column names"
msgstr "Oszlopnevek"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Nézet átnevezése"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "A nézet törlése (DROP)"
@@ -17248,6 +17237,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "A concurrent_insert 0-ra van állítva"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Összesen %d könyvjelző"
+#~ msgstr[1] "Összesen %d könyvjelző"
+
+#~ msgid "private"
+#~ msgstr "személyes"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s és %3$s könyvjelzők felvéve"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/hy.po b/po/hy.po
index d8daa39f7e..36ee5fbf63 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-12-18 18:19+0000\n"
"Last-Translator: Andrey Aleksanyants AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -13055,15 +13046,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr "Սպասվում էր ստորակետը կամ փակող փակագիծը։"
@@ -13076,17 +13063,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "Սպասվում էր այլանունը։"
@@ -13104,19 +13092,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "Սպասվում էր աղյուսակի հին անունը։"
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr "Սպասվում էր աղյուսակի նոր անունը։"
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "Սպասվում էր վերանվանման գործողությունը։"
@@ -13142,15 +13130,15 @@ msgstr "Սպասվում էր %1$s փակող չակերտը։"
msgid "Variable name was expected."
msgstr "Սպասվում էր փոփոխականի անունը։"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -13171,15 +13159,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "Սպասվում էր առնվազն մեկ սյունակի սահմանումը։"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -13846,7 +13834,7 @@ msgstr ""
msgid "Invalid table name"
msgstr "Անվավեր աղյուսակի անուն"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -14744,7 +14732,7 @@ msgid "at beginning of table"
msgstr "աղյուսակի սկզբում"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Մասնաբաժիններ"
@@ -14777,7 +14765,7 @@ msgstr "Մասնաբաժինների աղյուսակ"
msgid "Edit partitioning"
msgstr "Խմբագրել մասնաբաժանումը"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Խմբագրել ներկայացումը"
@@ -14892,11 +14880,11 @@ msgstr "VIEW անունը"
msgid "Column names"
msgstr "Սյունակների անուններ"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Վերանվանել ներկայացումը"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Ջնջել ներկայացումը (DROP)"
@@ -15938,6 +15926,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert նշված է 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Ընդամենը %d էջանիշ"
+#~ msgstr[1] "Ընդամենը %d էջանիշ"
+
+#~ msgid "private"
+#~ msgstr "մասնավոր"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s և %3$s էջանիշերը ներառված են"
+
#~ msgid "This %soption%s should be enabled if your web server supports it."
#~ msgstr ""
#~ "Այս %sկայանքը%s պետք է միացրած լինի՝ այն ձեր սպասարկչի կողմից աջակցվելու "
diff --git a/po/ia.po b/po/ia.po
index c6d66a9c9f..cf21e82e14 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
-"PO-Revision-Date: 2016-02-08 15:27+0000\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
+"PO-Revision-Date: 2016-02-17 13:24+0000\n"
"Last-Translator: Giovanni Sora AUTO_INCREMENT for zero values"
msgstr "Non usa AUTO_INCREMENT pro valores de zero"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13522,15 +13524,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr "On expectava un comma o un parentheses claudite."
@@ -13543,17 +13541,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "On expectava un alias."
@@ -13571,19 +13570,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "On expectava le vetule nomine de le tabella."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "On expectava un operation de renominar.."
@@ -13609,15 +13608,15 @@ msgstr ""
msgid "Variable name was expected."
msgstr "On expectava un nomine de variabile."
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr "Un initio de instruction non expectate."
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -13638,15 +13637,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "On expectava al minus un definition de columna."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14310,7 +14309,7 @@ msgstr ""
msgid "Invalid table name"
msgstr "Nomine de tabella invalide"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -15213,7 +15212,7 @@ msgid "at beginning of table"
msgstr "a le initio de tabella"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Partitiones"
@@ -15246,7 +15245,7 @@ msgstr "Tabella de partition"
msgid "Edit partitioning"
msgstr "Modifica partitionemento"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -15361,11 +15360,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr ""
@@ -16407,6 +16406,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert - insertion concurrente- es ponite a 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Marcator de libro o favorit %d total"
+#~ msgstr[1] "Marcatores de libro o favoritos %d total"
+
+#~ msgid "private"
+#~ msgstr "private"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s e %3$s marcatores de libro includite"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/id.po b/po/id.po
index ccedbfb403..9bbc896f64 100644
--- a/po/id.po
+++ b/po/id.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-11-23 11:13+0000\n"
"Last-Translator: CV. Gavitha Rantama AUTO_INCREMENT for zero values"
msgstr "Jangan gunakan AUTO_INCREMENT untuk nilai nol"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14686,15 +14676,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -14709,17 +14695,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -14741,23 +14728,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Jumlah tabel yang terbuka."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Jumlah tabel yang terbuka."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14790,17 +14777,17 @@ msgstr "Event %1$s telah dibuat."
msgid "Variable name was expected."
msgstr "Templat nama tabel"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "Pada Awal Tabel"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14823,19 +14810,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Jumlah tabel yang terbuka."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Baris telah dihapus."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15586,7 +15573,7 @@ msgstr "Tampilkan Dump (Skema) dari tabel"
msgid "Invalid table name"
msgstr "Nama tabel tidak valid"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Baris: %1$s, Kolom: %2$s, Kesalahan: %3$s"
@@ -16683,7 +16670,7 @@ msgid "at beginning of table"
msgstr "Pada Awal Tabel"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16732,7 +16719,7 @@ msgstr "dipartisi"
msgid "Edit partitioning"
msgstr "Hapus partisi"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Tampilan edit"
@@ -16864,11 +16851,11 @@ msgstr "Nama VIEW"
msgid "Column names"
msgstr "Nama kolom"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Ubah nama tampilan menjadi"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Delete the table (DROP)"
msgid "Delete the view (DROP)"
@@ -18292,6 +18279,16 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert diatur ke 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Total %d"
+
+#~ msgid "private"
+#~ msgstr "Privat"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s and %3$s bookmarks diikutsertakan"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/it.po b/po/it.po
index 09fd3681d7..e2ae57ca96 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2016-02-04 11:09+0000\n"
"Last-Translator: Stefano Martinelli AUTO_INCREMENT for zero values"
msgstr "Non usare AUTO_INCREMENT per il valori zero"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13905,15 +13896,11 @@ msgstr "Erano attesi %1$d valori, ma ne sono stati trovati %2$d."
msgid "An opening bracket followed by a set of values was expected."
msgstr "Era attesa una parentesi aperta seguita da un insieme di valori."
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr "Era attesa una parentesi aperta."
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr "Era attesa una virgola o una parentesi chiusa"
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr "Era attesa una virgola o una parentesi chiusa."
@@ -13926,17 +13913,18 @@ msgstr "Era attesa una parentesi chiusa."
msgid "Unrecognized data type."
msgstr "Tipo dati non riconosciuto."
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr "Un alias è stato trovato precedentemente."
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr "Segno di punteggiatura \"punto\" inatteso."
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "Era atteso un alias."
@@ -13954,19 +13942,19 @@ msgstr "Era atteso un offset."
msgid "This option conflicts with \"%1$s\"."
msgstr "Questa opzione è in conflitto con \"%1$s\"."
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "Era atteso il vecchio nome della tabella."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr "Era attesa la parola chiave \"TO\"."
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr "Era atteso il nuovo nome della tabella."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "Era attesa una operazione di rinomina."
@@ -13992,15 +13980,15 @@ msgstr "Era atteso il fine quote %1$s."
msgid "Variable name was expected."
msgstr "Era atteso un nome di variabile."
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr "Inizio di statement inatteso."
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr "Tipo statement non riconosciuto."
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr "Non è stata iniziata alcuna transazione in precedenza."
@@ -14023,15 +14011,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr "Parola chiave non riconosciuta."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr "Era atteso il nome dell'entity."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "Era attesa almeno la definizione di un campo."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr "Era attesa una parola chiave \"RETURNS\"."
@@ -14726,7 +14714,7 @@ msgstr "Visualizza dump (schema) della tabella"
msgid "Invalid table name"
msgstr "Nome tabella non valido"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Riga: %1$s, Campo: %2$s, Errore: %3$s"
@@ -15647,7 +15635,7 @@ msgid "at beginning of table"
msgstr "All'inizio della tabella"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Partizioni"
@@ -15680,7 +15668,7 @@ msgstr "Tabella partizioni"
msgid "Edit partitioning"
msgstr "Modifica partizionamento"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Modifica la vista"
@@ -15795,11 +15783,11 @@ msgstr "Nome VISTA"
msgid "Column names"
msgstr "Nomi dei campi"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Rinomina la vista in"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Elimina la vista (DROP)"
@@ -17109,6 +17097,20 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert è impostato a 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Totale %d segnalibro"
+#~ msgstr[1] "Totale %d segnalibri"
+
+#~ msgid "private"
+#~ msgstr "privato"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s e %3$s segnalibri inclusi"
+
+#~ msgid "A comma or a closing bracket was expected"
+#~ msgstr "Era attesa una virgola o una parentesi chiusa"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/ja.po b/po/ja.po
index 896ace031c..bb925a472f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2016-01-22 11:11+0000\n"
"Last-Translator: Masahiro Nishi AUTO_INCREMENT for zero values"
msgstr "値がゼロのものに対して AUTO_INCREMENT を使用しない"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14842,15 +14830,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -14865,17 +14849,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -14897,23 +14882,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "開いているテーブルの数。"
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "開いているテーブルの数。"
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14946,17 +14931,17 @@ msgstr "イベント %1$s を作成しました。"
msgid "Variable name was expected."
msgstr "テーブル名のテンプレート"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "テーブルの先頭"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14979,19 +14964,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "開いているテーブルの数。"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "行を削除しました"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15726,7 +15711,7 @@ msgstr "テーブルのダンプ (スキーマ) 表示"
msgid "Invalid table name"
msgstr "テーブル名が不正です"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16799,7 +16784,7 @@ msgid "at beginning of table"
msgstr "テーブルの先頭"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16848,7 +16833,7 @@ msgstr "パーティション有り"
msgid "Edit partitioning"
msgstr "パーティションを削除"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "ビューを編集する"
@@ -16975,11 +16960,11 @@ msgstr "ビューの名前"
msgid "Column names"
msgstr "カラム名"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "変更後のビュー名称"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Delete the table (DROP)"
msgid "Delete the view (DROP)"
@@ -18348,6 +18333,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert は 0 に設定されています"
+#, fuzzy
+#~| msgid "Delete relation"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "リレーションを削除"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "ブックマークを削除しました。"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/ka.po b/po/ka.po
index 719c3df8db..7a380c5ada 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:03+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14630,15 +14618,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "Remove selected users"
@@ -14653,17 +14637,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "Remove selected users"
msgid "An alias was expected."
@@ -14685,19 +14670,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14726,17 +14711,17 @@ msgstr "Table %1$s has been created."
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "ცხრილის დასაწყისში"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14757,17 +14742,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "სტრიქონი წაიშალა"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15493,7 +15478,7 @@ msgstr ""
msgid "Invalid table name"
msgstr "ცხრილის არასწორი სახელი"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16627,7 +16612,7 @@ msgid "at beginning of table"
msgstr "ცხრილის დასაწყისში"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16676,7 +16661,7 @@ msgstr "დაყოფილი"
msgid "Edit partitioning"
msgstr "დაყოფილი"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16811,12 +16796,12 @@ msgstr "VIEW name"
msgid "Column names"
msgstr "სვეტების სახელები"
-#: view_operations.php:97
+#: view_operations.php:106
#, fuzzy
msgid "Rename view to"
msgstr "Rename table to"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Delete the table (DROP)"
msgid "Delete the view (DROP)"
@@ -18014,6 +17999,12 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "max. concurrent connections"
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "ძებნა"
+
#, fuzzy
#~| msgid "You should use SSL connections if your web server supports it"
#~ msgid "This %soption%s should be enabled if your web server supports it."
diff --git a/po/kk.po b/po/kk.po
index 32b5573810..754ffab508 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:03+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -13422,15 +13411,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No rows selected"
@@ -13445,17 +13430,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No rows selected"
msgid "An alias was expected."
@@ -13477,19 +13463,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "Table %s has been emptied."
msgid "A rename operation was expected."
@@ -13517,17 +13503,17 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "Replace table prefix"
msgid "Unexpected beginning of statement."
msgstr "Кестениң префиксін ауыстыру"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -13548,17 +13534,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "Table %s has been emptied."
msgid "At least one column definition was expected."
msgstr "%s кестесі аластанды"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14236,7 +14222,7 @@ msgstr ""
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -15239,7 +15225,7 @@ msgid "at beginning of table"
msgstr "Кестениң префиксін ауыстыру"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr ""
@@ -15282,7 +15268,7 @@ msgstr "Сипаттама"
msgid "Edit partitioning"
msgstr "Индексті өзгерту"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -15410,11 +15396,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Қойылымның атын өзгерту"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Drop the database (DROP)"
msgid "Delete the view (DROP)"
@@ -16520,6 +16506,13 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "Паралельді_кірістірмелерді анықтау"
+#, fuzzy
+#~| msgid "Delete"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Жою"
+#~ msgstr[1] "Жою"
+
#, fuzzy
#~| msgid "Replace table prefix"
#~ msgid "Replace table prefix:"
diff --git a/po/km.po b/po/km.po
index 5fc6ac78d4..b0ccdb345e 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:06+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -13003,15 +12990,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -13026,17 +13009,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -13058,19 +13042,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The bookmark has been deleted."
msgid "A rename operation was expected."
@@ -13098,15 +13082,15 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -13127,17 +13111,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The bookmark has been deleted."
msgid "At least one column definition was expected."
msgstr "បានលុបចំណាំ។"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -13802,7 +13786,7 @@ msgstr ""
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -14733,7 +14717,7 @@ msgid "at beginning of table"
msgstr ""
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr ""
@@ -14770,7 +14754,7 @@ msgstr "ការបង្កើត៖"
msgid "Edit partitioning"
msgstr "កែសន្ទស្សន៍"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -14889,11 +14873,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr ""
@@ -15935,6 +15919,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert ត្រូវវបានកំណត់ទៅ 0"
+#, fuzzy
+#~| msgid "New bookmark"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "បង្កើតចំណាំថ្មី"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "បានលុបចំណាំ។"
+
#, fuzzy
#~| msgid "Table"
#~ msgid "tables"
diff --git a/po/kn.po b/po/kn.po
index e9f3b51706..c60e80546b 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-07-24 13:05+0200\n"
"Last-Translator: Shameem Ahmed A Mulla AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -12750,15 +12740,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr ""
@@ -12771,17 +12757,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr ""
@@ -12799,19 +12786,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr ""
@@ -12837,15 +12824,15 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -12866,15 +12853,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -13532,7 +13519,7 @@ msgstr ""
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -14437,7 +14424,7 @@ msgid "at beginning of table"
msgstr ""
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr ""
@@ -14472,7 +14459,7 @@ msgstr "ಸೃಷ್ಟಿ:"
msgid "Edit partitioning"
msgstr ""
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -14589,11 +14576,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr ""
diff --git a/po/ko.po b/po/ko.po
index f4c4517eb1..2eb0524699 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -3,11 +3,11 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2016-02-08 15:17+0000\n"
"Last-Translator: Seongki Shin AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13481,15 +13471,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -13504,17 +13490,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -13536,23 +13523,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "열린 테이블 수."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "열린 테이블 수."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -13585,17 +13572,17 @@ msgstr "이벤트 %1$s 를 생성했습니다."
msgid "Variable name was expected."
msgstr "파일명 템플릿"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "테이블의 처음"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -13618,19 +13605,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "열린 테이블 수."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "행을 삭제 하였습니다."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14332,7 +14319,7 @@ msgstr "테이블의 덤프(스키마) 데이터 보기"
msgid "Invalid table name"
msgstr "잘못된 테이블 이름"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -15345,7 +15332,7 @@ msgid "at beginning of table"
msgstr "테이블의 처음"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -15392,7 +15379,7 @@ msgstr "파티션 있음"
msgid "Edit partitioning"
msgstr "파티셔닝 삭제"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "뷰 편집"
@@ -15517,11 +15504,11 @@ msgstr "뷰 이름"
msgid "Column names"
msgstr "열(칼럼) 이름"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "뷰 이름 변경"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "뷰 삭제(DROP)"
@@ -16740,6 +16727,13 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert가 0으로 설정되었습니다"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "총 %d 개의 북마크"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "북마크 %1$s, %2$s 그리고 %3$s가 포함되었습니다"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/ksh.po b/po/ksh.po
index cde66cb7de..6e39893a39 100644
--- a/po/ksh.po
+++ b/po/ksh.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2014-10-02 15:09+0200\n"
"Last-Translator: Purodha AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -12814,15 +12805,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr ""
@@ -12835,17 +12822,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr ""
@@ -12863,19 +12851,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr ""
@@ -12901,15 +12889,15 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -12930,15 +12918,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -13596,7 +13584,7 @@ msgstr ""
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -14499,7 +14487,7 @@ msgid "at beginning of table"
msgstr ""
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr ""
@@ -14533,7 +14521,7 @@ msgstr "Ein Tabäll"
msgid "Edit partitioning"
msgstr ""
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -14648,11 +14636,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr ""
diff --git a/po/ky.po b/po/ky.po
index a1c166caa9..21ea0e85ee 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:03+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -12886,15 +12876,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "Database %1$s has been created."
@@ -12909,17 +12895,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "Database %1$s has been created."
msgid "An alias was expected."
@@ -12939,19 +12926,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "Database %1$s has been created."
msgid "A rename operation was expected."
@@ -12979,15 +12966,15 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -13008,17 +12995,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "Database %1$s has been created."
msgid "At least one column definition was expected."
msgstr "%1$s аттуу берилиштер базасы түзүлдү."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -13681,7 +13668,7 @@ msgstr ""
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -14608,7 +14595,7 @@ msgid "at beginning of table"
msgstr ""
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr ""
@@ -14643,7 +14630,7 @@ msgstr "Тузуу:"
msgid "Edit partitioning"
msgstr ""
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -14760,11 +14747,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr ""
diff --git a/po/li.po b/po/li.po
index 274556324a..155e14c300 100644
--- a/po/li.po
+++ b/po/li.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-12-29 15:36+0000\n"
"Last-Translator: Robin van der Vliet AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -12727,15 +12717,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr ""
@@ -12748,17 +12734,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr ""
@@ -12776,19 +12763,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr ""
@@ -12814,15 +12801,15 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -12843,15 +12830,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -13509,7 +13496,7 @@ msgstr ""
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -14405,7 +14392,7 @@ msgid "at beginning of table"
msgstr ""
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr ""
@@ -14438,7 +14425,7 @@ msgstr ""
msgid "Edit partitioning"
msgstr ""
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -14553,11 +14540,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 67b041be5a..750f51106a 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:20+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr "Nenaudokite AUTO_INCREMENT nulinėms reikšmėms"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14729,15 +14719,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14752,17 +14738,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14784,23 +14771,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Lentelių kurios yra atidarytos skaičius."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Lentelių kurios yra atidarytos skaičius."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14831,17 +14818,17 @@ msgstr "Įvykis %1$s buvo sukurtas."
msgid "Variable name was expected."
msgstr "Lentelės vardo šablonas"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "Lentelės pradžioje"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14862,19 +14849,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Lentelių kurios yra atidarytos skaičius."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Eilutė buvo ištrinta"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15589,7 +15576,7 @@ msgstr "Peržiūrėti lentelės struktūros atvaizdį"
msgid "Invalid table name"
msgstr "Neteisingas lentelės vardas"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16700,7 +16687,7 @@ msgid "at beginning of table"
msgstr "Lentelės pradžioje"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16747,7 +16734,7 @@ msgstr "Skaidinys %s"
msgid "Edit partitioning"
msgstr "Pašalinti skaidymą"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Keisti rodinį"
@@ -16878,11 +16865,11 @@ msgstr "VIEW pavadinimas"
msgid "Column names"
msgstr "Stulpelių vardai"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Pervadinti rodinį į"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Delete the table (DROP)"
msgid "Delete the view (DROP)"
@@ -18073,6 +18060,19 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "MyISAM concurrent įterpimai"
+#, fuzzy
+#~| msgid "Delete relation"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Ištrinti sąryšį"
+#~ msgstr[1] "Ištrinti sąryšį"
+#~ msgstr[2] "Ištrinti sąryšį"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Nuoroda ištrinta."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/lv.po b/po/lv.po
index 58c67f0615..84ce589b9a 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2016-01-23 11:11+0000\n"
"Last-Translator: Arturs Nikolajevs AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14159,15 +14149,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14182,17 +14168,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14214,19 +14201,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14255,17 +14242,17 @@ msgstr "Tabula %s tika izdzēsta"
msgid "Variable name was expected."
msgstr "Faila nosaukuma šablons"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "Tabulas sākumā"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14286,17 +14273,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Ieraksts tika dzēsts"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15005,7 +14992,7 @@ msgstr "Apskatīt tabulas dampu (shēmu)"
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16126,7 +16113,7 @@ msgid "at beginning of table"
msgstr "Tabulas sākumā"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Position"
msgid "Partitions"
@@ -16171,7 +16158,7 @@ msgstr "Pozīcija"
msgid "Edit partitioning"
msgstr "Pievienot jaunu lauku"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16307,12 +16294,12 @@ msgstr ""
msgid "Column names"
msgstr "Kolonnu nosaukumi"
-#: view_operations.php:97
+#: view_operations.php:106
#, fuzzy
msgid "Rename view to"
msgstr "Pārsaukt tabulu uz"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
msgid "Delete the view (DROP)"
msgstr "Nav datubāzu"
@@ -17429,6 +17416,19 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr ""
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Meklēt"
+#~ msgstr[1] "Meklēt"
+#~ msgstr[2] "Meklēt"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Ieraksts tika dzēsts."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/mk.po b/po/mk.po
index d2451fbb9b..62e1a51861 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:23+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14302,15 +14290,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14325,17 +14309,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14357,19 +14342,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14398,17 +14383,17 @@ msgstr "Табелата %s е избришана"
msgid "Variable name was expected."
msgstr "Шаблон на име на податотека"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "на почетокот од табелата"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14429,17 +14414,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Записот е избришан"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15145,7 +15130,7 @@ msgstr "Прикажи содржина (шема) на табелите"
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16270,7 +16255,7 @@ msgid "at beginning of table"
msgstr "на почетокот од табелата"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Position"
msgid "Partitions"
@@ -16315,7 +16300,7 @@ msgstr "Позиција"
msgid "Edit partitioning"
msgstr "Додади ново поле"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16450,12 +16435,12 @@ msgstr ""
msgid "Column names"
msgstr "Имиња на колони"
-#: view_operations.php:97
+#: view_operations.php:106
#, fuzzy
msgid "Rename view to"
msgstr "Промени го името на табелата во "
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
msgid "Delete the view (DROP)"
msgstr "Базата на податоци не постои"
@@ -17602,6 +17587,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr ""
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Пребарување"
+#~ msgstr[1] "Пребарување"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Маркерот е избришан."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/ml.po b/po/ml.po
index 0b7ca01960..d3de7d5686 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:05+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -13048,15 +13038,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "Remove database"
@@ -13071,17 +13057,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "Remove database"
msgid "An alias was expected."
@@ -13103,19 +13090,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "Database %1$s has been created."
msgid "A rename operation was expected."
@@ -13143,15 +13130,15 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -13172,17 +13159,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "Database %1$s has been created."
msgid "At least one column definition was expected."
msgstr "വിവരശേഖരം(ങ്ങൾ) %1$s സൃഷ്ടിച്ചിരിക്കുന്നു."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -13842,7 +13829,7 @@ msgstr ""
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -14799,7 +14786,7 @@ msgid "at beginning of table"
msgstr ""
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr ""
@@ -14838,7 +14825,7 @@ msgstr "വിവരണം"
msgid "Edit partitioning"
msgstr "വിവരണം"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -14961,11 +14948,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Drop the database (DROP)"
msgid "Delete the view (DROP)"
diff --git a/po/mn.po b/po/mn.po
index b7f3c6ef59..3002d4be76 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:25+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14447,15 +14436,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14470,17 +14455,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14502,19 +14488,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14543,17 +14529,17 @@ msgstr "Хүснэгт %s нь устгагдлаа"
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "Хүснэгтийн эхэнд"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14574,17 +14560,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Мөр устгагдсан"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15289,7 +15275,7 @@ msgstr "Хүснэгтийн схем харах"
msgid "Invalid table name"
msgstr "Хүснэгтийн буруу нэр"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16419,7 +16405,7 @@ msgid "at beginning of table"
msgstr "Хүснэгтийн эхэнд"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Position"
msgid "Partitions"
@@ -16464,7 +16450,7 @@ msgstr "Байрлал"
msgid "Edit partitioning"
msgstr "Шинэ талбар нэмэх"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16600,11 +16586,11 @@ msgstr ""
msgid "Column names"
msgstr "Баганын нэрс"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Copy database to"
msgid "Delete the view (DROP)"
@@ -17791,6 +17777,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "ХИ. давхацсан холболтууд"
+#, fuzzy
+#~| msgid "Delete relation"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Холбоог устгах"
+#~ msgstr[1] "Холбоог устгах"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Хавчуурга устлаа."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/ms.po b/po/ms.po
index 6c4f03f746..0a609fa05c 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:06+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -13923,15 +13910,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "With selected:"
@@ -13946,17 +13929,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "With selected:"
msgid "An alias was expected."
@@ -13978,19 +13962,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14018,17 +14002,17 @@ msgstr "Jadual %s telah digugurkan"
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "Pada Awalan Jadual"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14049,17 +14033,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Baris telah dipadam"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14759,7 +14743,7 @@ msgstr "Lihat longgokan (skema) pangkalan data"
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -15843,7 +15827,7 @@ msgid "at beginning of table"
msgstr "Pada Awalan Jadual"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
msgid "Partitions"
msgstr "Operasi"
@@ -15886,7 +15870,7 @@ msgstr "Operasi"
msgid "Edit partitioning"
msgstr "Paparan Cetak"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16018,12 +16002,12 @@ msgstr ""
msgid "Column names"
msgstr "Nama Kolum"
-#: view_operations.php:97
+#: view_operations.php:106
#, fuzzy
msgid "Rename view to"
msgstr "Tukarnama jadual ke"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
msgid "Delete the view (DROP)"
msgstr "Tiada pangkalan data"
@@ -17128,6 +17112,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr ""
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Cari"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "TandaBuku telah dipadam."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/nb.po b/po/nb.po
index 78d39c9372..fb4fd37f46 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-11-11 21:15+0000\n"
"Last-Translator: nils kristian tomren AUTO_INCREMENT for zero values"
msgstr "Ikke bruk AUTO_INCREMENT for nullverdier"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14762,15 +14753,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -14785,17 +14772,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -14817,23 +14805,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Antall åpne tabeller."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Antall åpne tabeller."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14866,17 +14854,17 @@ msgstr "Tabellen %1$s har blitt opprettet."
msgid "Variable name was expected."
msgstr "Tabellnavnmal"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "Ved begynnelsen av tabellen"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14899,19 +14887,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Antall åpne tabeller."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Raden er slettet."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15659,7 +15647,7 @@ msgstr "Vis dump (skjema) av tabell"
msgid "Invalid table name"
msgstr "Ugylding tabellnavn"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16770,7 +16758,7 @@ msgid "at beginning of table"
msgstr "Ved begynnelsen av tabellen"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16819,7 +16807,7 @@ msgstr "partisjonert"
msgid "Edit partitioning"
msgstr "Fjern partisjonering"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16950,11 +16938,11 @@ msgstr "VIEW navn"
msgid "Column names"
msgstr "Kolonnenavn"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Endre tabellens navn"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Go to database"
msgid "Delete the view (DROP)"
@@ -18165,6 +18153,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert er satt til 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Totalt %d bokmerke"
+#~ msgstr[1] "Totalt %d bokmerker"
+
+#~ msgid "private"
+#~ msgstr "privat"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s og %3$s bokmerker er inkludert"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/ne.po b/po/ne.po
index d57cf9c28d..2a3c30215f 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:03+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -12794,15 +12784,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr ""
@@ -12815,17 +12801,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr ""
@@ -12843,19 +12830,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr ""
@@ -12881,15 +12868,15 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -12910,15 +12897,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -13587,7 +13574,7 @@ msgstr ""
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -14496,7 +14483,7 @@ msgid "at beginning of table"
msgstr ""
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr ""
@@ -14531,7 +14518,7 @@ msgstr "निर्माण:"
msgid "Edit partitioning"
msgstr ""
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -14649,11 +14636,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 2665da8dd5..8aa5f6fb89 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
-"PO-Revision-Date: 2016-02-08 11:22+0000\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
+"PO-Revision-Date: 2016-02-17 16:26+0000\n"
"Last-Translator: dingo thirteen AUTO_INCREMENT for zero values"
msgstr "Gebruik geen AUTO_INCREMENT voor 0-waarden"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13860,15 +13853,11 @@ msgstr "%1$d waarden werden verwacht, maar %2$d gevonden."
msgid "An opening bracket followed by a set of values was expected."
msgstr "Een openingshaakje gevolgd door een set met waardes werd verwacht."
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr "Een openingshaakje werd verwacht."
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr "Een komma of een sluitingshaakje werd verwacht"
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr "Een komma of een sluitingshaakje werd verwacht."
@@ -13881,17 +13870,18 @@ msgstr "Een sluitingshaakje werd verwacht."
msgid "Unrecognized data type."
msgstr "Onbekend gegevenstype."
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr "Een alias was eerder al gevonden."
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr "Onverwachte punt."
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "Een alias werd verwacht."
@@ -13909,19 +13899,19 @@ msgstr "Een offset werd verwacht."
msgid "This option conflicts with \"%1$s\"."
msgstr "Deze optie conflicteert met \"%1$s\"."
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "De oude naam van de tabel werd verwacht."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr "Sleutelwoord \"TO\" werd verwacht."
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr "De nieuwe naam van de tabel werd verwacht."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "Een hernoem bewerking werd verwacht."
@@ -13947,15 +13937,15 @@ msgstr "Eindquote %1$s werd verwacht."
msgid "Variable name was expected."
msgstr "Naam van variabele werd verwacht."
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr "Onverwacht begin van opdracht."
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr "Opdracht type niet herkent."
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr "Er is geen transactie gestart."
@@ -13978,15 +13968,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr "Sleutelwoord niet herkent."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr "De naam van de entiteit werd verwacht."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "Er werd minimaal één kolomdefinitie verwacht."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr "Een \"RETURNS\" sleutelwoord werd verwacht."
@@ -14686,7 +14676,7 @@ msgstr "Een export (schema) van tabel bekijken"
msgid "Invalid table name"
msgstr "Ongeldige tabelnaam"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Rij: %1$s, Kolom: %2$s, Fout: %3$s"
@@ -15613,7 +15603,7 @@ msgid "at beginning of table"
msgstr "bij begin van de tabel"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Partities %s"
@@ -15646,7 +15636,7 @@ msgstr "Partitietabel"
msgid "Edit partitioning"
msgstr "Partitionering bewerken"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "View bewerken"
@@ -15761,11 +15751,11 @@ msgstr "VIEW-naam"
msgid "Column names"
msgstr "Kolomnamen"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "View hernoemen naar"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "De VIEW verwijderen (DROP)"
@@ -17062,6 +17052,20 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert is ingesteld op 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "In totaal %d bladwijzer"
+#~ msgstr[1] "In totaal %d bladwijzers"
+
+#~ msgid "private"
+#~ msgstr "privaat"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s en %3$s bladwijzers inbegrepen"
+
+#~ msgid "A comma or a closing bracket was expected"
+#~ msgstr "Een komma of een sluitingshaakje werd verwacht"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/pa.po b/po/pa.po
index ab555f3959..83b7687cf6 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2014-01-06 12:13+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -12806,15 +12796,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "Database %1$s has been created."
@@ -12829,17 +12815,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "Database %1$s has been created."
msgid "An alias was expected."
@@ -12859,19 +12846,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "Database %1$s has been created."
msgid "A rename operation was expected."
@@ -12899,15 +12886,15 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -12928,17 +12915,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "Database %1$s has been created."
msgid "At least one column definition was expected."
msgstr "%1$s ਡਾਟਾਬੇਸ ਬਣ ਚੁੱਕਾ ਹੈ."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -13596,7 +13583,7 @@ msgstr ""
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -14503,7 +14490,7 @@ msgid "at beginning of table"
msgstr ""
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr ""
@@ -14538,7 +14525,7 @@ msgstr "ਸਾਰੇ ਦਿਖ਼ਾਓ"
msgid "Edit partitioning"
msgstr ""
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -14655,11 +14642,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr ""
diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot
index 2de14301c8..ce647cbaa2 100644
--- a/po/phpmyadmin.pot
+++ b/po/phpmyadmin.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -12726,15 +12716,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr ""
@@ -12747,17 +12733,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr ""
@@ -12775,19 +12762,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr ""
@@ -12813,15 +12800,15 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -12842,15 +12829,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -13508,7 +13495,7 @@ msgstr ""
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, possible-php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -14404,7 +14391,7 @@ msgid "at beginning of table"
msgstr ""
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr ""
@@ -14437,7 +14424,7 @@ msgstr ""
msgid "Edit partitioning"
msgstr ""
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -14552,11 +14539,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 987f182da4..721401ee46 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-12-31 14:50+0000\n"
"Last-Translator: Sebastian Weremczuk AUTO_INCREMENT for zero values"
msgstr "Nie używaj AUTO_INCREMENT dla wartości zerowych"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14318,15 +14310,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14341,17 +14329,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14373,23 +14362,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Liczba otwartych tabel."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Liczba otwartych tabel."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14422,17 +14411,17 @@ msgstr "Zdarzenie %1$s zostało utworzone."
msgid "Variable name was expected."
msgstr "Nazwa szablonu tabeli"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "Na początku tabeli"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14455,19 +14444,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Liczba otwartych tabel."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Wiersz został usunięty."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15176,7 +15165,7 @@ msgstr "Pokaż zrzut (schemat) tabeli"
msgid "Invalid table name"
msgstr "Niewłaściwa nazwa tabeli"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16221,7 +16210,7 @@ msgid "at beginning of table"
msgstr "Na początku tabeli"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16270,7 +16259,7 @@ msgstr "partycjonowanie"
msgid "Edit partitioning"
msgstr "Usuń partycjonowanie"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Edycja widoku"
@@ -16397,11 +16386,11 @@ msgstr "Nazwa widoku"
msgid "Column names"
msgstr "Nazwy kolumn"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Zmień nazwę widoku na"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Usuń widok (DROP)"
@@ -17735,6 +17724,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert jest ustawiony na 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "W sumie %d zakładka"
+#~ msgstr[1] "W sumie %d zakładki"
+#~ msgstr[2] "W sumie %d zakładek"
+
+#~ msgid "private"
+#~ msgstr "prywatny"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s i %3$s zakładek dołączonych"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/pt.po b/po/pt.po
index 9cb832755a..7c787af065 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-12-27 20:05+0000\n"
"Last-Translator: João Machaqueiro AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14133,15 +14124,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -14156,17 +14143,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -14188,21 +14176,21 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "Title of browser window when a table is selected."
msgid "The old name of the table was expected."
msgstr "Título da janela do navegador quando uma tabela estiver selecionada."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14234,17 +14222,17 @@ msgstr "A tabela %s foi eliminada"
msgid "Variable name was expected."
msgstr "Modelo de nome da tabela"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "No Início da Tabela"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14267,17 +14255,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Registo eliminado."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15006,7 +14994,7 @@ msgstr "Ver o esquema da tabela"
msgid "Invalid table name"
msgstr "Nome de tabela inválido"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16101,7 +16089,7 @@ msgid "at beginning of table"
msgstr "No Início da Tabela"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Position"
msgid "Partitions"
@@ -16144,7 +16132,7 @@ msgstr "Posição"
msgid "Edit partitioning"
msgstr "Vista de impressão"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16282,12 +16270,12 @@ msgstr ""
msgid "Column names"
msgstr "Nome dos Campos"
-#: view_operations.php:97
+#: view_operations.php:106
#, fuzzy
msgid "Rename view to"
msgstr "Renomeia a vista para "
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
msgid "Delete the view (DROP)"
msgstr "Sem bases de dados"
@@ -17512,6 +17500,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert é definido como 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Total de %d marcador"
+#~ msgstr[1] "Total de %d marcadores"
+
+#~ msgid "private"
+#~ msgstr "privado"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s and %3$s marcadores incluídos"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 02b76cc32e..4adba250d7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,11 +3,11 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2016-02-10 17:03+0000\n"
"Last-Translator: Rodrigo Moreira AUTO_INCREMENT for zero values"
msgstr "Não use AUTO_INCREMENT para valores zerados"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14125,15 +14092,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -14148,17 +14111,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -14180,23 +14144,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "O número de tabelas que estão abertas."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "O número de tabelas que estão abertas."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14229,17 +14193,17 @@ msgstr "O evento %1$s foi criado."
msgid "Variable name was expected."
msgstr "Modelo de nome da tabela"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "at beginning of table"
msgid "Unexpected beginning of statement."
msgstr "No início da tabela"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14262,19 +14226,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "O número de tabelas que estão abertas."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Registro eliminado."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14982,7 +14946,7 @@ msgstr "Ver o dump (esquema) da tabela"
msgid "Invalid table name"
msgstr "Nome de tabela inválido"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Linha: %1$s, Coluna: %2$s, Erro: %3$s"
@@ -15952,7 +15916,7 @@ msgid "at beginning of table"
msgstr "No início da tabela"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16001,7 +15965,7 @@ msgstr "particionado"
msgid "Edit partitioning"
msgstr "Remover particionamento"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Tela de edição"
@@ -16120,11 +16084,11 @@ msgstr "Nome da VIEW"
msgid "Column names"
msgstr "Nome das colunas"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Renomear view para"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Remover view (DROP)"
@@ -17437,6 +17401,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert está com valor 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Novo marcador"
+#~ msgstr[1] "Total de marcador%d"
+
+#~ msgid "private"
+#~ msgstr "Privado"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s e %3$s favoritos incluídos"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/ro.po b/po/ro.po
index 9e8abc10cb..123da83337 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:02+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14652,15 +14644,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -14675,17 +14663,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -14707,23 +14696,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Numărul de tabele ce sînt deschise."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Numărul de tabele ce sînt deschise."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14756,17 +14745,17 @@ msgstr "Evenimentul %1$s a fost creat."
msgid "Variable name was expected."
msgstr "Șablon nume tabel"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "La începutul tabelului"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14789,19 +14778,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Numărul de tabele ce sînt deschise."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Înregistrarea a fost ștearsă."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15523,7 +15512,7 @@ msgstr "Vizualizarea schemei tabelului"
msgid "Invalid table name"
msgstr "Denumire de tabel nevalidă"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16614,7 +16603,7 @@ msgid "at beginning of table"
msgstr "La începutul tabelului"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16663,7 +16652,7 @@ msgstr "partiționat"
msgid "Edit partitioning"
msgstr "Elimină partiționarea"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16795,12 +16784,12 @@ msgstr "Denumire VIZIUNE"
msgid "Column names"
msgstr "Denumirile coloanelor"
-#: view_operations.php:97
+#: view_operations.php:106
#, fuzzy
msgid "Rename view to"
msgstr "Redenumire tabel la"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
msgid "Delete the view (DROP)"
msgstr "Nu sînt baze de date"
@@ -18052,6 +18041,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert este setat cu 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Total %d semn de carte"
+#~ msgstr[1] "Total %d semne de carte"
+#~ msgstr[2] "Total %d semne de carte"
+
+#~ msgid "private"
+#~ msgstr "privat"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Semnele de carte %1$s, %2$s și %3$s au fost incluse"
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/ru.po b/po/ru.po
index 111e594034..442415c334 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-12-09 12:57+0000\n"
"Last-Translator: Roman Imankulov AUTO_INCREMENT for zero values"
msgstr ""
"Не использовать атрибут AUTO_INCREMENT для нулевых значений"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13828,15 +13820,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "A rename operation was expected."
@@ -13851,17 +13839,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr "Нераспознанный тип данных."
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr "Псевдоним был найден ранее."
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr "Неожиданная точка."
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "Ожидался псевдоним."
@@ -13879,19 +13868,19 @@ msgstr "Ожидалось смещение."
msgid "This option conflicts with \"%1$s\"."
msgstr "Этот параметр конфликтует с \"%1$s\"."
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "Ожидалось старое имя таблицы."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr "Ожидалось ключевое слово \"TO\"."
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr "Ожидалось новое имя таблицы."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "Ожидалась операция переименования."
@@ -13917,15 +13906,15 @@ msgstr "Ожидалась закрывающая кавычка %1$s."
msgid "Variable name was expected."
msgstr "Ожидалось имя переменной."
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr "Неожиданное начало выражения."
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -13946,15 +13935,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr "Неизвестное ключевое слово."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr "Ожидалось имя сущности."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "Ожидалось объявление, по крайней мере, одного столбца."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr "Ожидалось ключевое слово \"RETURNS\"."
@@ -14652,7 +14641,7 @@ msgstr "Отобразить дамп (схему) таблицы"
msgid "Invalid table name"
msgstr "Неправильное имя таблицы"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Строка: %1$s, Столбец: %2$s, Ошибка: %3$s"
@@ -15611,7 +15600,7 @@ msgid "at beginning of table"
msgstr "в начале таблицы"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Разделы"
@@ -15654,7 +15643,7 @@ msgstr "разделён"
msgid "Edit partitioning"
msgstr "Удалить разделение"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Редактировать представление"
@@ -15773,11 +15762,11 @@ msgstr "VIEW название"
msgid "Column names"
msgstr "Названия столбцов"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Переименовать представление в"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Удалить вид (DROP)"
@@ -17101,6 +17090,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert установлен в 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Итого %d закладка"
+#~ msgstr[1] "Итого %d закладок"
+#~ msgstr[2] "Итого %d закладок"
+
+#~ msgid "private"
+#~ msgstr "закрытый"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s и %3$s закладки включены"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/si.po b/po/si.po
index ceccccbc00..4b1ff8e23d 100644
--- a/po/si.po
+++ b/po/si.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2016-01-06 03:53+0000\n"
"Last-Translator: Isuru Abeywardana AUTO_INCREMENT for zero values"
msgstr "ශුන්ය අගයන් සඳහා AUTO_INCREMENT භාවිතා නොකරන්න"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14104,15 +14093,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14127,17 +14112,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14159,21 +14145,21 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "Title of browser window when a table is selected"
msgid "The old name of the table was expected."
msgstr "වගුවක් තෝරා ඇති විට බ්රව්සර කවුළුවේ මාතෘකාව"
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14206,17 +14192,17 @@ msgstr "%1$s සිද්ධිය සාදන ලදි."
msgid "Variable name was expected."
msgstr "ගොනු නාම ටෙම්ප්ලේටය"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "වගුව මුලදී"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14239,17 +14225,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "පේළිය ඉවත් කරන ලදි."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14948,7 +14934,7 @@ msgstr ""
msgid "Invalid table name"
msgstr "වලංගු නොවන වගු නම"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -15995,7 +15981,7 @@ msgid "at beginning of table"
msgstr "වගුව මුලදී"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16044,7 +16030,7 @@ msgstr "කොටස් කරන ලද"
msgid "Edit partitioning"
msgstr "කොටස් කිරීම ඉවත් කරන්න"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "දසුන සංස්කරණය කරන්න"
@@ -16167,11 +16153,11 @@ msgstr "දසුනේ නම"
msgid "Column names"
msgstr "තීර නම්"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "දසුනේ නම වෙනස් කරන්න"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Delete the table (DROP)"
msgid "Delete the view (DROP)"
@@ -17318,6 +17304,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert ශුන්යයට සිටුවා ඇත"
+#, fuzzy
+#~| msgid "Table Search"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "වගුව තුල සෙවීම"
+#~ msgstr[1] "වගුව තුල සෙවීම"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "පොත් සලකුණ ඉවත් කරන ලදි."
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/sk.po b/po/sk.po
index 8e63cba691..603e22622c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2016-01-19 21:35+0000\n"
"Last-Translator: Martin Lacina AUTO_INCREMENT for zero values"
msgstr "Nepoužívať AUTO_INCREMENT pre nulové hodnoty"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13408,15 +13400,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr "Bola očakávaná čiarka alebo uzatváracia zátvorka."
@@ -13429,17 +13417,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "Bol očakávaný alias."
@@ -13457,19 +13446,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "Bolo očakávané staré meno tabuľky."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr "Bolo očakávané nové meno tabuľky."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "Očakávala sa operácia premenovania."
@@ -13496,15 +13485,15 @@ msgstr "Udalosť %1$s bola vytvorená."
msgid "Variable name was expected."
msgstr "Očakávalo sa meno premennej."
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr "Neočakávaný začiatok výrazu."
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -13527,17 +13516,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Počet práve otvorených tabuliek."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "Očakávala sa aspoň jedna definícia stĺpca."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14210,7 +14199,7 @@ msgstr "Zobraziť dump (schému) tabuľky"
msgid "Invalid table name"
msgstr "Chybné meno tabuľky"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -15165,7 +15154,7 @@ msgid "at beginning of table"
msgstr "na začiatku tabuľky"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Oddiely"
@@ -15207,7 +15196,7 @@ msgstr "Pozícia"
msgid "Edit partitioning"
msgstr "Upraviť v riadku"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Upraviť zobrazenie"
@@ -15326,11 +15315,11 @@ msgstr "Meno pohľadu"
msgid "Column names"
msgstr "Názvy stĺpcov"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Premenovať pohľad na"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Odstrániť zobrazenie (DROP)"
@@ -16416,6 +16405,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert je nastavené na 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Spolu %d záložka"
+#~ msgstr[1] "Spolu %d záložky"
+#~ msgstr[2] "Spolu %d záložiek"
+
+#~ msgid "private"
+#~ msgstr "súkromne"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Zahrnuté záložky %1$s, %2$s a %3$s"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/sl.po b/po/sl.po
index 09f1d4f5c2..1ea2be6ec7 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
-"PO-Revision-Date: 2016-02-08 14:36+0000\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
+"PO-Revision-Date: 2016-02-17 17:14+0000\n"
"Last-Translator: Domen AUTO_INCREMENT for zero values"
msgstr "Ne uporabi AUTO_INCREMENT za ničelne vrednosti"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13720,15 +13712,11 @@ msgstr "Pričakovali smo %1$d vrednosti, vendar smo jih našli %2$d."
msgid "An opening bracket followed by a set of values was expected."
msgstr "Pričakovali smo začetni oklepaj, ki mu sledi množica vrednosti."
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr "Pričakovali smo začetni oklepaj."
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr "Pričakovali smo vejico ali zaklepaj"
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr "Pričakovali smo vejico ali zaklepaj."
@@ -13741,17 +13729,18 @@ msgstr "Pričakovali smo zaklepaj."
msgid "Unrecognized data type."
msgstr "Neprepoznana vrsta podatkov."
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr "Vzdevek smo našli že prej."
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr "Nepričakovana pika."
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "Pričakovali smo vzdevek."
@@ -13769,19 +13758,19 @@ msgstr "Pričakovali smo odmik."
msgid "This option conflicts with \"%1$s\"."
msgstr "Izbira je v sporu z \"%1$s\"."
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "Pričakovali smo staro ime tabele."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr "Pričakovali smo ključno besedo \"TO\"."
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr "Pričakovali smo novo ime tabele."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "Pričakovali smo poseg preimenovanja."
@@ -13807,15 +13796,15 @@ msgstr "Pričakovali smo končni narekovaj %1$s."
msgid "Variable name was expected."
msgstr "Pričakovali smo ime spremenljivke."
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr "Nepričakovan začetek stavka."
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr "Neprepoznana vrsta stavka."
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr "Začeli niste nobene transakcije."
@@ -13838,15 +13827,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr "Nepričakovana ključna beseda."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr "Pričakovali smo ime entitete."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "Pričakovali smo vsaj eno opredelitev stolpca."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr "Pričakovali smo ključno besedo \"RETURNS\"."
@@ -14536,7 +14525,7 @@ msgstr "Preglej povzetek stanja tabele"
msgid "Invalid table name"
msgstr "Neveljavno ime tabele"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Vrstica: %1$s, Stolpec: %2$s, Napaka: %3$s"
@@ -15455,7 +15444,7 @@ msgid "at beginning of table"
msgstr "na začetku tabele"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Particije"
@@ -15488,7 +15477,7 @@ msgstr "Tabela razdelitve"
msgid "Edit partitioning"
msgstr "Uredi razdelitev"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Urejevalni pogled"
@@ -15603,11 +15592,11 @@ msgstr "Ime VIEW"
msgid "Column names"
msgstr "Imena stolpcev"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Preimenuj pogled v"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Izbriši pogled (DROP)"
@@ -16871,6 +16860,22 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert je nastavljeno na 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Skupno %d zaznamek"
+#~ msgstr[1] "Skupno %d zaznamka"
+#~ msgstr[2] "Skupno %d zaznamki"
+#~ msgstr[3] "Skupno %d zaznamkov"
+
+#~ msgid "private"
+#~ msgstr "zasebnih"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s and %3$s vključenih zaznamkov"
+
+#~ msgid "A comma or a closing bracket was expected"
+#~ msgstr "Pričakovali smo vejico ali zaklepaj"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/sq.po b/po/sq.po
index dfd519f63d..a88f9445dc 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-09-05 23:03+0200\n"
"Last-Translator: Arben Çokaj AUTO_INCREMENT for zero values"
msgstr "Mos përdor AUTO_INCREMENT për vlerat zero"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13868,15 +13859,11 @@ msgstr "Vlerat %1$d u pranuan, por gjeti %2$d."
msgid "An opening bracket followed by a set of values was expected."
msgstr "Pritet një kllapë e hapur, e ndjekur nga një set vlerash."
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr "Pritet një kllapë e hapur."
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr "Pritet një presje ose një kllapë e mbyllur"
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr "Pritet një presje ose një kllapë mbyllëse."
@@ -13889,17 +13876,18 @@ msgstr "Pritet një kllapë e mbylljes."
msgid "Unrecognized data type."
msgstr "Tip të dhënash i panjohur."
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr "Një pseudonim është gjetur më përpara."
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr "Pikë (dot) e papritur."
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "Pritet një alias (pseudonim)."
@@ -13917,19 +13905,19 @@ msgstr "Pritet një rezultat (offset)."
msgid "This option conflicts with \"%1$s\"."
msgstr "Ky opsion konflikton me \"%1$s\"."
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "Pritet emri i vjetër i tabelës."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr "Pritet fjala kyçe \"TO\" (për)."
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr "Pritet emri i ri i tabelës."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "Pritet një veprim riemërimi."
@@ -13955,15 +13943,15 @@ msgstr "Pritet thonjëza e fundit %1$s."
msgid "Variable name was expected."
msgstr "Pritet emri i variablit."
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr "Fillim i papritur i deklaratës."
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr "Tip deklarate i panjohur."
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr "Nuk ka filluar ndonjë transaksion më parë."
@@ -13986,15 +13974,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr "Fjalë kyçe e panjohur."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr "Pritet emri i entitetit."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "Pritet së paku një përcaktim kolone."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr "Pritet një fjalë kyçe \"RETURNS\"."
@@ -14686,7 +14674,7 @@ msgstr "Shfaq zbrazjen (skema) e tabelës"
msgid "Invalid table name"
msgstr "Emër tabele i pavlefshëm"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Radhë: %1$s, Kolonë: %2$s, Gabim: %3$s"
@@ -15648,7 +15636,7 @@ msgid "at beginning of table"
msgstr "në fillim të tabelës"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Pjesët"
@@ -15687,7 +15675,7 @@ msgstr "Ndarë nga:"
msgid "Edit partitioning"
msgstr "Largo particionimin"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Korrigjo pamjen"
@@ -15806,11 +15794,11 @@ msgstr "SHFAQ emrin"
msgid "Column names"
msgstr "Emrat e kolonës"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Riemëro pamjen në"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Fshij pamjen (DROP)"
@@ -17124,6 +17112,20 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert është vendosur në 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Insgesamt %d Lesezeichen"
+#~ msgstr[1] "Insgesamt %d Lesezeichen"
+
+#~ msgid "private"
+#~ msgstr "private"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s dhe %3$s faqeruajtësit e përfshirë"
+
+#~ msgid "A comma or a closing bracket was expected"
+#~ msgstr "Pritet një presje ose një kllapë e mbyllur"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/sr.po b/po/sr.po
index 631a6ecf6f..d830fa43a5 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:25+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14568,15 +14558,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14591,17 +14577,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14623,23 +14610,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Број отворених табела."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Број отворених табела."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14668,17 +14655,17 @@ msgstr "Табела %s је одбачена"
msgid "Variable name was expected."
msgstr "Шаблон имена датотеке"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "На почетку табеле"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14699,19 +14686,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Број отворених табела."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Ред је обрисан"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15423,7 +15410,7 @@ msgstr "Прикажи садржај (схему) табеле"
msgid "Invalid table name"
msgstr "Неисправан назив табеле"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16554,7 +16541,7 @@ msgid "at beginning of table"
msgstr "На почетку табеле"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Position"
msgid "Partitions"
@@ -16599,7 +16586,7 @@ msgstr "Позиција"
msgid "Edit partitioning"
msgstr "Додај ново поље"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16734,12 +16721,12 @@ msgstr "назив за VIEW"
msgid "Column names"
msgstr "Имена колона"
-#: view_operations.php:97
+#: view_operations.php:106
#, fuzzy
msgid "Rename view to"
msgstr "Промени име табеле у "
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
msgid "Delete the view (DROP)"
msgstr "База не постоји"
@@ -17928,6 +17915,19 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "макс. истовремених веза"
+#, fuzzy
+#~| msgid "Delete relation"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Обриши релацију"
+#~ msgstr[1] "Обриши релацију"
+#~ msgstr[2] "Обриши релацију"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Обележивач је управо обрисан."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 1e6cf87eef..a8368c93ce 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:24+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14467,15 +14457,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14490,17 +14476,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14522,23 +14509,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Broj otvorenih tabela."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Broj otvorenih tabela."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14569,17 +14556,17 @@ msgstr "Događaj %1$s je kreiran."
msgid "Variable name was expected."
msgstr "Šablon imena tabele"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "Na početku tabele"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14600,19 +14587,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Broj otvorenih tabela."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Red je obrisan"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15313,7 +15300,7 @@ msgstr "Prikaži sadržaj (shemu) tabele"
msgid "Invalid table name"
msgstr "Neispravan naziv tabele"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16383,7 +16370,7 @@ msgid "at beginning of table"
msgstr "Na početku tabele"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Position"
msgid "Partitions"
@@ -16428,7 +16415,7 @@ msgstr "Pozicija"
msgid "Edit partitioning"
msgstr "Uredi indeks"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Uredi pogled"
@@ -16559,11 +16546,11 @@ msgstr "naziv za VIEW"
msgid "Column names"
msgstr "Imena kolona"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Preimenuj pogled u"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Delete the table (DROP)"
msgid "Delete the view (DROP)"
@@ -17687,6 +17674,19 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert je postavljeno na 0"
+#, fuzzy
+#~| msgid "Delete relation"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Obriši relaciju"
+#~ msgstr[1] "Obriši relaciju"
+#~ msgstr[2] "Obriši relaciju"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Obeleživač je upravo obrisan."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/sv.po b/po/sv.po
index e0b152c239..a1ac201ff9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-11-12 10:41+0000\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr "Använd inte AUTO_INCREMENT för nollvärden"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13671,15 +13662,11 @@ msgstr "%1$d värden var väntat, men hittade %2$d."
msgid "An opening bracket followed by a set of values was expected."
msgstr "En inledande hakparentes följt av en uppsättning värden förväntades."
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr "En inledande hakparentes förväntades."
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr "Semikolon eller en avslutande hakparentes förväntades"
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr "Semikolon eller en avslutande hakparentes förväntades."
@@ -13692,17 +13679,18 @@ msgstr "En avslutande hakparentes förväntades."
msgid "Unrecognized data type."
msgstr "Okänd datatyp."
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr "Ett alias hittades tidigare."
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr "Oväntad punkt."
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "Ett alias förväntades."
@@ -13720,19 +13708,19 @@ msgstr "En förskjutning förväntades."
msgid "This option conflicts with \"%1$s\"."
msgstr "Det här alternativet är i konflikt med \"%1$s\"."
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "Det gamla namnet på tabellen förväntades."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr "Sökordet \"Till\" förväntades."
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr "Det nya namnet på tabellen förväntades."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "Ett namnbyte förväntades."
@@ -13758,15 +13746,15 @@ msgstr "Slut citat %1$s förväntades."
msgid "Variable name was expected."
msgstr "Variabel namn förväntades."
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr "Oväntad början av satsen."
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr "Okänd uttryckstyp."
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr "Ingen transaktion startades tidigare."
@@ -13788,15 +13776,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr "Okänt nyckelord."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr "Namnet på entiteten förväntades."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "Minst en kolumndefinition förväntades."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr "Ett nyckelord förväntades."
@@ -14485,7 +14473,7 @@ msgstr "Visa SQL-satser för tabellen"
msgid "Invalid table name"
msgstr "Ogiltigt tabellnamn"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Rad: %1$s, kolumn: %2$s, fel: %3$s"
@@ -15442,7 +15430,7 @@ msgid "at beginning of table"
msgstr "I början av tabellen"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Partitioner"
@@ -15481,7 +15469,7 @@ msgstr "partitionerad"
msgid "Edit partitioning"
msgstr "Ta bort partitionering"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Redigera vy"
@@ -15598,11 +15586,11 @@ msgstr "VIEW-namn"
msgid "Column names"
msgstr "Kolumnnamn"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Ändra namn till"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Ta bort vyn (DROP)"
@@ -16868,6 +16856,20 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert är satt till 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Totalt %d bokmärke"
+#~ msgstr[1] "Totalt %d bokmärken"
+
+#~ msgid "private"
+#~ msgstr "privat"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s och %3$s bokmärken ingår"
+
+#~ msgid "A comma or a closing bracket was expected"
+#~ msgstr "Semikolon eller en avslutande hakparentes förväntades"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/ta.po b/po/ta.po
index adb349db20..7b6641df7e 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:17+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -13232,15 +13223,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -13255,17 +13242,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -13287,19 +13275,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -13329,17 +13317,17 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "Rate of table open"
msgid "Unexpected beginning of statement."
msgstr "திறந்தநிலை அட்டவணைகளின் விழுக்காடு"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -13362,17 +13350,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "இந்நிரைவரிசை அழிக்கப்பட்டது."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14051,7 +14039,7 @@ msgstr ""
msgid "Invalid table name"
msgstr "தகுதியற்ற அட்டவணைப் பெயர்"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -15011,7 +14999,7 @@ msgid "at beginning of table"
msgstr "திறந்தநிலை அட்டவணைகளின் விழுக்காடு"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -15056,7 +15044,7 @@ msgstr "பிரிவினை %s"
msgid "Edit partitioning"
msgstr "தொகுப்பு பார்வை"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "தொகுப்பு பார்வை"
@@ -15175,11 +15163,11 @@ msgstr "பெயரை பார்"
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "தரவு பார்வையை அழி (கைவிடு)"
@@ -16221,6 +16209,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr ""
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "மொத்தம் %d புத்தகக்குறி"
+#~ msgstr[1] "மொத்தம் %d புத்தகக்குறிகள்"
+
+#~ msgid "private"
+#~ msgstr "தனிப்பட்ட"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s மற்றும் %3$s புத்தகக்குறிகள் சேர்க்கப்பட்டன"
+
#~ msgid "Replace table prefix:"
#~ msgstr "அட்டவணை முன்னொட்டை பதிலிடு:"
diff --git a/po/te.po b/po/te.po
index 567df1e86a..54a9e9f164 100644
--- a/po/te.po
+++ b/po/te.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:05+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -13836,15 +13824,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "Table name"
@@ -13859,17 +13843,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "Table name"
msgid "An alias was expected."
@@ -13891,19 +13876,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "Database %s has been dropped."
msgid "A rename operation was expected."
@@ -13934,18 +13919,18 @@ msgid "Variable name was expected."
msgstr ""
# మొదటి అనువాదము
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgctxt "short form"
#| msgid "Create table"
msgid "Unexpected beginning of statement."
msgstr "పట్టికను సృష్టించు"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -13966,17 +13951,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "Database %s has been dropped."
msgid "At least one column definition was expected."
msgstr "%s డేటాబేస్ తుడిచివేయడమైనది"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14674,7 +14659,7 @@ msgstr ""
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -15748,7 +15733,7 @@ msgid "at beginning of table"
msgstr "పట్టికను సృష్టించు"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Relations"
msgid "Partitions"
@@ -15789,7 +15774,7 @@ msgstr "సంబంధాలు"
msgid "Edit partitioning"
msgstr "క్రొత్త వాడుకరిని చేర్చు"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Add a new User"
msgid "Edit view"
@@ -15927,11 +15912,11 @@ msgstr "నామధేయమును చూపుము"
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Drop the database (DROP)"
msgid "Delete the view (DROP)"
@@ -17053,6 +17038,14 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr ""
+# Research అంటే పరిశోధన, అందువల్లన ఇది శోధనైంది
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "శోధించు"
+#~ msgstr[1] "శోధించు"
+
#, fuzzy
#~| msgid "Display table filter"
#~ msgid "Replace table prefix:"
diff --git a/po/th.po b/po/th.po
index 5d590610aa..b8fdd26017 100644
--- a/po/th.po
+++ b/po/th.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:31+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14127,15 +14115,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -14150,17 +14134,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -14182,19 +14167,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14223,17 +14208,17 @@ msgstr "โยนตาราง %s ทิ้งไปเรียบร้อ
msgid "Variable name was expected."
msgstr "รูปแบบของชื่อไฟล์"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "ที่จุดเริ่มต้นของตาราง"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14254,17 +14239,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "ลบเรียบร้อยแล้ว"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14976,7 +14961,7 @@ msgstr "ดูโครงสร้างของตาราง"
msgid "Invalid table name"
msgstr "ชื่อตารางไม่ถูกต้อง"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16088,7 +16073,7 @@ msgid "at beginning of table"
msgstr "ที่จุดเริ่มต้นของตาราง"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Position"
msgid "Partitions"
@@ -16133,7 +16118,7 @@ msgstr "ตำแหน่ง"
msgid "Edit partitioning"
msgstr "เพิ่มฟิลด์ใหม่"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16269,12 +16254,12 @@ msgstr ""
msgid "Column names"
msgstr "ชื่อคอลัมน์"
-#: view_operations.php:97
+#: view_operations.php:106
#, fuzzy
msgid "Rename view to"
msgstr "เปลี่ยนชื่อตารางเป็น"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
msgid "Delete the view (DROP)"
msgstr "ไม่มีฐานข้อมูล"
@@ -17472,6 +17457,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert ถูกตั้งค่าไว้ที่ 0"
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "ค้นหา"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "ลบคำค้นที่จดไว้เรียบร้อยแล้ว"
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/tk.po b/po/tk.po
index ea44b15e0f..2ad28d9224 100644
--- a/po/tk.po
+++ b/po/tk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2013-05-07 17:12+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -12849,15 +12839,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "Database %1$s has been created."
@@ -12872,17 +12858,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "Database %1$s has been created."
msgid "An alias was expected."
@@ -12902,19 +12889,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "Database %1$s has been created."
msgid "A rename operation was expected."
@@ -12942,15 +12929,15 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -12971,17 +12958,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "Database %1$s has been created."
msgid "At least one column definition was expected."
msgstr "%1$s maglumatlar ulgamy döredildi."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -13639,7 +13626,7 @@ msgstr ""
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -14552,7 +14539,7 @@ msgid "at beginning of table"
msgstr ""
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr ""
@@ -14589,7 +14576,7 @@ msgstr "Düşündiriş"
msgid "Edit partitioning"
msgstr "Düşündiriş"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -14706,11 +14693,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 77f43b6a0f..4854f7c95e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3,8 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
-"PO-Revision-Date: 2016-02-08 12:25+0000\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
+"PO-Revision-Date: 2016-02-17 19:14+0000\n"
"Last-Translator: Burak Yavuz AUTO_INCREMENT for zero values"
msgstr "Sıfır değerleri için AUTO_INCREMENT değeri kullanma"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13741,15 +13731,11 @@ msgstr "%1$d değer beklenmekte, ancak %2$d bulundu."
msgid "An opening bracket followed by a set of values was expected."
msgstr "Açık bir köşeli parantez ardından bir grup değer beklenmekte."
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr "Açık bir köşeli parantez beklenmekte."
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr "Bir virgül ya da kapalı bir köşeli parantez beklenmekte"
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr "Bir virgül ya da kapalı bir köşeli parantez beklenmekte."
@@ -13762,17 +13748,18 @@ msgstr "Kapalı bir köşeli parantez beklenmekte."
msgid "Unrecognized data type."
msgstr "Tanınmayan veri türü."
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr "Bir kodadı daha önce bulundu."
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr "Beklenmedik nokta."
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "Bir kodadı beklenmekte."
@@ -13790,19 +13777,19 @@ msgstr "Bir karşılık beklenmekte."
msgid "This option conflicts with \"%1$s\"."
msgstr "Bu seçenek \"%1$s\" ile çakışıyor."
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "Tablonun eski adı beklenmekte."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr "\"TO\" anahtar kelimesi beklenmekte."
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr "Tablonun yeni adı beklenmekte."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "Yeniden adlandırma işlemi beklenmekte."
@@ -13828,15 +13815,15 @@ msgstr "Sonlandırma tırnak işareti %1$s beklenmekte."
msgid "Variable name was expected."
msgstr "Değişken adı beklenmekte."
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr "Beklenmedik ifade başlangıcı."
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr "Tanınmayan ifade türü."
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr "Daha önce hiç işlem başlatılmadı."
@@ -13858,15 +13845,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr "Tanınmayan anahtar kelime."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr "Varlığın adı beklenmekte."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "En az bir sütun tanımı beklenmekte."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr "\"RETURNS\" anahtar kelimesi beklenmekte."
@@ -14559,7 +14546,7 @@ msgstr "Tablonun dökümünü (şemasını) göster"
msgid "Invalid table name"
msgstr "Geçersiz tablo adı"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Satır: %1$s, Sütun: %2$s, Hata: %3$s"
@@ -15478,7 +15465,7 @@ msgid "at beginning of table"
msgstr "tablonun başı"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Bölümler"
@@ -15511,7 +15498,7 @@ msgstr "Bölüm tablosu"
msgid "Edit partitioning"
msgstr "Bölümlemeyi düzenle"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Düzenleme görünümü"
@@ -15626,11 +15613,11 @@ msgstr "GÖRÜNÜM adı"
msgid "Column names"
msgstr "Sütun adları"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Görünümü yeniden şuna adlandır"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Görünümü sil (DROP)"
@@ -16885,6 +16872,20 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert 0'a ayarlı"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Toplam %d yer imi"
+#~ msgstr[1] "Toplam %d yer imi"
+
+#~ msgid "private"
+#~ msgstr "özel"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s ve %3$s yer imleri dahil edildi"
+
+#~ msgid "A comma or a closing bracket was expected"
+#~ msgstr "Bir virgül ya da kapalı bir köşeli parantez beklenmekte"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/tt.po b/po/tt.po
index 6c309f19c6..096e003558 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:22+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14339,15 +14326,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -14362,17 +14345,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -14394,23 +14378,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Açıq toruçı tüşämä sanı."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Açıq toruçı tüşämä sanı."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14439,17 +14423,17 @@ msgstr "\"%s\" atlı tüşämä beterelde"
msgid "Variable name was expected."
msgstr "Birem adınıñ tözeleşe"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "Tüşämä Başına"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14470,19 +14454,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Açıq toruçı tüşämä sanı."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Bu yazma salınğan buldı"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15197,7 +15181,7 @@ msgstr "Tüşämä eçtälegen (tözeleşen) çığaru"
msgid "Invalid table name"
msgstr "Tüşämä adı yaraqsız"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16320,7 +16304,7 @@ msgid "at beginning of table"
msgstr "Tüşämä Başına"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Position"
msgid "Partitions"
@@ -16365,7 +16349,7 @@ msgstr "Urın"
msgid "Edit partitioning"
msgstr "Bastıru küreneşe"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16500,12 +16484,12 @@ msgstr ""
msgid "Column names"
msgstr "Alan iseme"
-#: view_operations.php:97
+#: view_operations.php:106
#, fuzzy
msgid "Rename view to"
msgstr "Tüşämä adın üzgärtü"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
msgid "Delete the view (DROP)"
msgstr "Biremleklär yuq"
@@ -17672,6 +17656,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr ""
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Ezläw"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Tamğa beterelde."
+
#, fuzzy
#~| msgid "Replace table data with file"
#~ msgid "Replace table prefix:"
diff --git a/po/ug.po b/po/ug.po
index ef47c0ba58..87ad8e9166 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:03+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -13951,15 +13939,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "With selected:"
@@ -13974,17 +13958,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "With selected:"
msgid "An alias was expected."
@@ -14006,19 +13991,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The bookmark has been deleted."
msgid "A rename operation was expected."
@@ -14047,17 +14032,17 @@ msgstr "%1$s ساندان غەلبىلىك قۇرۇلدى"
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "Show dimension of tables"
msgid "Unexpected beginning of statement."
msgstr "جەدېۋەلنىڭ چوڭ-كىچىكلىكىنى كۆرسىتىش"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14078,17 +14063,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The bookmark has been deleted."
msgid "At least one column definition was expected."
msgstr "خەتكۈچ ئۆچۈرۈلدى."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14785,7 +14770,7 @@ msgstr ""
msgid "Invalid table name"
msgstr "ئۈنۈمسىز جەدۋەل ئىسمى"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -15861,7 +15846,7 @@ msgid "at beginning of table"
msgstr "جەدېۋەلنىڭ چوڭ-كىچىكلىكىنى كۆرسىتىش"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Relations"
msgid "Partitions"
@@ -15906,7 +15891,7 @@ msgstr "مۇناسىۋىتى"
msgid "Edit partitioning"
msgstr "بېسىپ كۆرسىتىش"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16035,11 +16020,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Drop the database (DROP)"
msgid "Delete the view (DROP)"
@@ -17192,6 +17177,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr ""
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "ئىزدەش"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "خەتكۈچ ئۆچۈرۈلدى."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/uk.po b/po/uk.po
index 5ca8f3e187..c6fe9df01d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:19+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr "Не використовувати AUTO_INCREMENT для нульових значень"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -14094,15 +14086,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No tables selected."
@@ -14117,17 +14105,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No tables selected."
msgid "An alias was expected."
@@ -14149,23 +14138,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Кількість відкритих таблиць."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Кількість відкритих таблиць."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -14198,17 +14187,17 @@ msgstr "Подія %1$s була створена."
msgid "Variable name was expected."
msgstr "Шаблон імені таблиці"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "На початку таблиці"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14231,19 +14220,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Кількість відкритих таблиць."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Рядок видалено."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14942,7 +14931,7 @@ msgstr "Переглянути дамп (схему) таблиці"
msgid "Invalid table name"
msgstr "Неправильна назва таблиці"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -15968,7 +15957,7 @@ msgid "at beginning of table"
msgstr "На початку таблиці"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -16017,7 +16006,7 @@ msgstr "розділений"
msgid "Edit partitioning"
msgstr "Видалити розділи"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Редагувати подання"
@@ -16144,11 +16133,11 @@ msgstr "Назва подання"
msgid "Column names"
msgstr "Назви колонок"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Перейменувати подання на"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Видалити подання (DROP)"
@@ -17432,6 +17421,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert встановлено у 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Всього %d закладка"
+#~ msgstr[1] "Всього %d закладки"
+#~ msgstr[2] "Всього %d закладок"
+
+#~ msgid "private"
+#~ msgstr "закритий"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s та %3$s закладки включено"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/ur.po b/po/ur.po
index 08ad349e1e..8d73474262 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:05+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr ""
@@ -14393,15 +14382,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "Removing Selected Users"
@@ -14416,17 +14401,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "Removing Selected Users"
msgid "An alias was expected."
@@ -14448,19 +14434,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The bookmark has been deleted."
msgid "A rename operation was expected."
@@ -14491,17 +14477,17 @@ msgstr "کوائفیہ $1%s بن گئی ہے۔"
msgid "Variable name was expected."
msgstr "جدول نام سانچا"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "Show dimension of tables"
msgid "Unexpected beginning of statement."
msgstr "ٹیبلز کی جسامت دیکھیں"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -14522,17 +14508,17 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The bookmark has been deleted."
msgid "At least one column definition was expected."
msgstr "نشانی حذف ہو چکی ہے۔"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -15230,7 +15216,7 @@ msgstr ""
msgid "Invalid table name"
msgstr "غلط جدول نام"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -16327,7 +16313,7 @@ msgid "at beginning of table"
msgstr "ٹیبلز کی جسامت دیکھیں"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Relations"
msgid "Partitions"
@@ -16372,7 +16358,7 @@ msgstr "تعلقات"
msgid "Edit partitioning"
msgstr "تدوین موڈ"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -16504,11 +16490,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Copy database to"
msgid "Delete the view (DROP)"
@@ -17666,6 +17652,18 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr ""
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "تلاش"
+#~ msgstr[1] "تلاش"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "نشانی حذف ہو چکی ہے۔"
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/uz.po b/po/uz.po
index f585703657..539d1b6251 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-10-15 11:39+0200\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr "Ноль қийматлари учун \"AUTO_INCREMENT\" ишлатмаслик"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -15490,15 +15480,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -15513,17 +15499,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -15545,23 +15532,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Очиқ жадваллар сони."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Очиқ жадваллар сони."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -15592,17 +15579,17 @@ msgstr "%1$s жадвали тузилди."
msgid "Variable name was expected."
msgstr "Жадвал номи шаблони"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "Жадвал бошига"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -15623,19 +15610,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Очиқ жадваллар сони."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Ёзув ўчирилди"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -16380,7 +16367,7 @@ msgstr "Жадвал дампини (схемасини) намойиш этиш
msgid "Invalid table name"
msgstr "Жадвал номи нотўғри"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -17531,7 +17518,7 @@ msgid "at beginning of table"
msgstr "Жадвал бошига"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -17580,7 +17567,7 @@ msgstr "бўлакларга бўлинган"
msgid "Edit partitioning"
msgstr "Бўлакларни (PARTITIONS) ўчириш"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -17716,11 +17703,11 @@ msgstr "Ном кўриниши"
msgid "Column names"
msgstr "Майдон номлари"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Кўриниш номини ўзгартириш"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Go to database"
msgid "Delete the view (DROP)"
@@ -18922,6 +18909,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "Максимал уланишлар сони "
+#, fuzzy
+#~| msgid "Delete relation"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Боғлиқликни ўчириш"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Хатчўп ўчирилди."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/uz@latin.po b/po/uz@latin.po
index 668e125742..25bbe22f9c 100644
--- a/po/uz@latin.po
+++ b/po/uz@latin.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-12-29 19:19+0000\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr "Nol qiymatlari uchun \"AUTO_INCREMENT\" ishlatmaslik"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -15556,15 +15544,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -15579,17 +15563,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -15612,23 +15597,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Ochiq jadvallar soni."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "Ochiq jadvallar soni."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -15659,17 +15644,17 @@ msgstr "%1$s jadvali tuzildi."
msgid "Variable name was expected."
msgstr "Jadval nomi shabloni"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "Jadval boshiga"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -15690,19 +15675,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "Ochiq jadvallar soni."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "Yozuv o‘chirildi"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -16448,7 +16433,7 @@ msgstr "Jadval dampini (sxemasini) namoyish etish"
msgid "Invalid table name"
msgstr "Jadval nomi noto‘g‘ri"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -17607,7 +17592,7 @@ msgid "at beginning of table"
msgstr "Jadval boshiga"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
#, fuzzy
#| msgid "Partition %s"
msgid "Partitions"
@@ -17656,7 +17641,7 @@ msgstr "bo‘laklarga bo‘lingan"
msgid "Edit partitioning"
msgstr "Bo‘laklarni (PARTITIONS) o‘chirish"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
#, fuzzy
#| msgid "Print view"
msgid "Edit view"
@@ -17792,11 +17777,11 @@ msgstr "Nom ko‘rinishi"
msgid "Column names"
msgstr "Maydon nomlari"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Ko‘rinish nomini o‘zgartirish"
-#: view_operations.php:136
+#: view_operations.php:145
#, fuzzy
#| msgid "Go to database"
msgid "Delete the view (DROP)"
@@ -18999,6 +18984,17 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "Maksimal ulanishlar soni "
+#, fuzzy
+#~| msgid "Delete relation"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Bog‘liqlikni o‘chirish"
+
+#, fuzzy
+#~| msgid "The bookmark has been deleted."
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "Xatcho‘p o‘chirildi."
+
#, fuzzy
#~| msgid ""
#~| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
diff --git a/po/vi.po b/po/vi.po
index 291f44ccd9..55139b468a 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2016-01-13 15:59+0000\n"
"Last-Translator: Michal Čihař AUTO_INCREMENT for zero values"
msgstr "Đừng dùng AUTO_INCREMENT cho các giá trị bằng không"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13094,15 +13085,11 @@ msgstr "Cần giá trị %1$d, nhưng lại nhận được %2$d."
msgid "An opening bracket followed by a set of values was expected."
msgstr "Cần một dấu ngoặc ôm mở theo sau bởi một tập hợp các giá trị."
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr "Cần dấu ngoặc ôm mở."
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr "Cần dấu phẩy hoặc dấu ngoặc ôm đóng"
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr "Cần dấu phẩy hoặc dấu ngoặc ôm đóng."
@@ -13115,17 +13102,18 @@ msgstr "Cần dấu ngoặc ôm đóng."
msgid "Unrecognized data type."
msgstr "Không nhận ra kiểu dữ liệu."
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr "Một bí danh đã tìm thấy từ trước đây."
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr "Gặp dấu chấm không cần."
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "Cần một bí danh."
@@ -13143,19 +13131,19 @@ msgstr "Cần vị trí tương đối."
msgid "This option conflicts with \"%1$s\"."
msgstr "Tùy chọn này xung đột với \"%1$s\"."
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "Cần tên cũ của bảng."
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr "Cần từ khóa \"TO\"."
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr "Cần tên mới của bảng."
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "Cần thao tác đổi tên."
@@ -13181,15 +13169,15 @@ msgstr "Cần trích dẫn đóng %1$s."
msgid "Variable name was expected."
msgstr "Cần tên biến."
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr "Gặp phần đầu mệnh đề không cần."
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr "Không thừa nhận kiểu mệnh đề."
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr "Chưa có giao địch nào đã bắt đầu trước đây."
@@ -13211,15 +13199,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr "Không nhận ra từ khóa."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr "Cần tên của thực thể."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "Chưa có bảng nào được chọn."
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr "Cần từ khóa \"RETURNS\"."
@@ -13909,7 +13897,7 @@ msgstr "Tới ô xem bảng sóng"
msgid "Invalid table name"
msgstr "Tên bảng không hợp lệ"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "Hàng: %1$s, Cột: %2$s, Lỗi: %3$s"
@@ -14814,7 +14802,7 @@ msgid "at beginning of table"
msgstr "tại đầu của bảng"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "Phân vùng"
@@ -14847,7 +14835,7 @@ msgstr "Bảng phân vùng"
msgid "Edit partitioning"
msgstr "Sửa phân vùng"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "Sửa view"
@@ -14962,11 +14950,11 @@ msgstr "Tên VIEW"
msgid "Column names"
msgstr "Các tên cột"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "Việc đổi tên %s thành %s bị lỗi"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "Xóa bảng (DROP)"
@@ -16038,6 +16026,19 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert được đặt thành 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "Tổng cộng %d đánh dấu"
+
+#~ msgid "private"
+#~ msgstr "riêng"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "%1$s, %2$s và %3$s đánh dấu được bao gồm"
+
+#~ msgid "A comma or a closing bracket was expected"
+#~ msgstr "Cần dấu phẩy hoặc dấu ngoặc ôm đóng"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/vls.po b/po/vls.po
index 89da9a5978..26970d5075 100644
--- a/po/vls.po
+++ b/po/vls.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2014-12-23 23:39+0200\n"
"Last-Translator: Robin van der Vliet AUTO_INCREMENT for zero values"
msgstr ""
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -12733,15 +12723,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr ""
@@ -12754,17 +12740,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr ""
@@ -12782,19 +12769,19 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr ""
@@ -12820,15 +12807,15 @@ msgstr ""
msgid "Variable name was expected."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -12849,15 +12836,15 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -13515,7 +13502,7 @@ msgstr ""
msgid "Invalid table name"
msgstr ""
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -14413,7 +14400,7 @@ msgid "at beginning of table"
msgstr ""
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr ""
@@ -14446,7 +14433,7 @@ msgstr ""
msgid "Edit partitioning"
msgstr ""
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr ""
@@ -14561,11 +14548,11 @@ msgstr ""
msgid "Column names"
msgstr ""
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr ""
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e372085852..f4db88a2c1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2015-11-19 08:10+0000\n"
"Last-Translator: disorderman AUTO_INCREMENT for zero values"
msgstr "不要给零值使用自增 (AUTO_INCREMENT)"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13388,15 +13378,11 @@ msgstr ""
msgid "An opening bracket followed by a set of values was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr ""
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
#, fuzzy
#| msgid "No databases selected."
@@ -13411,17 +13397,18 @@ msgstr ""
msgid "Unrecognized data type."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr ""
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
#, fuzzy
#| msgid "No databases selected."
msgid "An alias was expected."
@@ -13443,23 +13430,23 @@ msgstr ""
msgid "This option conflicts with \"%1$s\"."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "打开的数据表个数。"
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The new name of the table was expected."
msgstr "打开的数据表个数。"
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
#, fuzzy
#| msgid "The row has been deleted."
msgid "A rename operation was expected."
@@ -13492,17 +13479,17 @@ msgstr "已创建事件 %1$s 。"
msgid "Variable name was expected."
msgstr "表名称模板"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
#, fuzzy
#| msgid "At Beginning of Table"
msgid "Unexpected beginning of statement."
msgstr "于表开头"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr ""
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr ""
@@ -13525,19 +13512,19 @@ msgstr ""
msgid "Unrecognized keyword."
msgstr ""
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The name of the entity was expected."
msgstr "打开的数据表个数。"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
#, fuzzy
#| msgid "The row has been deleted."
msgid "At least one column definition was expected."
msgstr "已删除该行。"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr ""
@@ -14242,7 +14229,7 @@ msgstr "查看数据表的转储(大纲)"
msgid "Invalid table name"
msgstr "表名无效"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr ""
@@ -15278,7 +15265,7 @@ msgid "at beginning of table"
msgstr "于表开头"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "分区"
@@ -15325,7 +15312,7 @@ msgstr "已分区"
msgid "Edit partitioning"
msgstr "删除分区"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "编辑视图"
@@ -15452,11 +15439,11 @@ msgstr "视图名"
msgid "Column names"
msgstr "字段名"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "将视图改名为"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "删除视图(DROP)"
@@ -16612,6 +16599,16 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert 被设为 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "共计 %d 个书签"
+
+#~ msgid "private"
+#~ msgstr "私有"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "共计%1$s个书签,其中包括私有书签%2$s个和共享书签%3$s个"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f31e47a231..d1f1fe9857 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2016-02-08 09:42+0100\n"
+"POT-Creation-Date: 2016-02-17 11:57+0100\n"
"PO-Revision-Date: 2016-01-09 03:03+0000\n"
"Last-Translator: Kelvin Lee AUTO_INCREMENT for zero values"
msgstr "不要在零值使用自動遞增 (AUTO_INCREMENT)"
-#: libraries/plugins/import/ImportXml.php:52
+#: libraries/plugins/import/ImportXml.php:43
msgid "XML"
msgstr "XML"
@@ -13207,15 +13197,11 @@ msgstr "預期要有 %1$d 個數值,但只找到 %2$d 個。"
msgid "An opening bracket followed by a set of values was expected."
msgstr "預期要於數值之後接著開始括號。"
-#: libraries/sql-parser/src/Components/ArrayObj.php:102
+#: libraries/sql-parser/src/Components/ArrayObj.php:119
#: libraries/sql-parser/src/Components/CreateDefinition.php:207
msgid "An opening bracket was expected."
msgstr "預期要有開始括號。"
-#: libraries/sql-parser/src/Components/ArrayObj.php:127
-msgid "A comma or a closing bracket was expected"
-msgstr "預期要有逗號或者結束括號"
-
#: libraries/sql-parser/src/Components/CreateDefinition.php:251
msgid "A comma or a closing bracket was expected."
msgstr "預期要有逗號或者結束括號。"
@@ -13228,17 +13214,18 @@ msgstr "預期要有結束括號。"
msgid "Unrecognized data type."
msgstr "預期之外的資料類型。"
-#: libraries/sql-parser/src/Components/Expression.php:256
-#: libraries/sql-parser/src/Components/Expression.php:292
-#: libraries/sql-parser/src/Components/Expression.php:312
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:323
+#: libraries/sql-parser/src/Components/Expression.php:342
+#: libraries/sql-parser/src/Components/Expression.php:374
msgid "An alias was previously found."
msgstr "已於前面找到別名。"
-#: libraries/sql-parser/src/Components/Expression.php:267
+#: libraries/sql-parser/src/Components/Expression.php:355
msgid "Unexpected dot."
msgstr "預期之外的句點。"
-#: libraries/sql-parser/src/Components/Expression.php:336
+#: libraries/sql-parser/src/Components/Expression.php:385
msgid "An alias was expected."
msgstr "預期要有別名。"
@@ -13256,19 +13243,19 @@ msgstr "預期要有偏移量(Offset)。"
msgid "This option conflicts with \"%1$s\"."
msgstr "此選項與 \"%1$s\" 發生衝突。"
-#: libraries/sql-parser/src/Components/RenameOperation.php:103
+#: libraries/sql-parser/src/Components/RenameOperation.php:102
msgid "The old name of the table was expected."
msgstr "預期要有舊的資料表名稱。"
-#: libraries/sql-parser/src/Components/RenameOperation.php:113
+#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr "預期要有 \"TO\" 關鍵字。"
-#: libraries/sql-parser/src/Components/RenameOperation.php:130
+#: libraries/sql-parser/src/Components/RenameOperation.php:128
msgid "The new name of the table was expected."
msgstr "預期要有新的資料表名稱。"
-#: libraries/sql-parser/src/Components/RenameOperation.php:148
+#: libraries/sql-parser/src/Components/RenameOperation.php:146
msgid "A rename operation was expected."
msgstr "預期要有重新命名的操作。"
@@ -13294,15 +13281,15 @@ msgstr "預期要於結束使用括號 %1$s。"
msgid "Variable name was expected."
msgstr "預期要有變數名稱。"
-#: libraries/sql-parser/src/Parser.php:417
+#: libraries/sql-parser/src/Parser.php:418
msgid "Unexpected beginning of statement."
msgstr "預期之外的陳述句開頭。"
-#: libraries/sql-parser/src/Parser.php:436
+#: libraries/sql-parser/src/Parser.php:437
msgid "Unrecognized statement type."
msgstr "無法辨識的陳述句類型。"
-#: libraries/sql-parser/src/Parser.php:518
+#: libraries/sql-parser/src/Parser.php:519
msgid "No transaction was previously started."
msgstr "前面未開啟交易(Transaction)模式。"
@@ -13323,15 +13310,15 @@ msgstr "找到新的陳述句,但與前一個陳述句之間未加入間隔符
msgid "Unrecognized keyword."
msgstr "無法辨識的關鍵字。"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:353
+#: libraries/sql-parser/src/Statements/CreateStatement.php:352
msgid "The name of the entity was expected."
msgstr "預期要有實體名稱。"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:370
+#: libraries/sql-parser/src/Statements/CreateStatement.php:369
msgid "At least one column definition was expected."
msgstr "預期要至少一個欄位定義。"
-#: libraries/sql-parser/src/Statements/CreateStatement.php:481
+#: libraries/sql-parser/src/Statements/CreateStatement.php:480
msgid "A \"RETURNS\" keyword was expected."
msgstr "預期要使用 \"RETURNS\" 關鍵字。"
@@ -14005,7 +13992,7 @@ msgstr "檢視資料表結構的匯出資料"
msgid "Invalid table name"
msgstr "無效的資料表名稱"
-#: tbl_replace.php:234
+#: tbl_replace.php:238
#, php-format
msgid "Row: %1$s, Column: %2$s, Error: %3$s"
msgstr "列:%1$s,欄:%2$s,錯誤:%3$s"
@@ -14945,7 +14932,7 @@ msgid "at beginning of table"
msgstr "於資料表開始"
#: templates/table/structure/display_partitions.phtml:5
-#: templates/table/structure/display_structure.phtml:203
+#: templates/table/structure/display_structure.phtml:183
msgid "Partitions"
msgstr "分區"
@@ -14984,7 +14971,7 @@ msgstr "已做分區依:"
msgid "Edit partitioning"
msgstr "刪除分區"
-#: templates/table/structure/display_structure.phtml:149 view_create.php:186
+#: templates/table/structure/display_structure.phtml:129 view_create.php:186
msgid "Edit view"
msgstr "編輯檢視表"
@@ -15101,11 +15088,11 @@ msgstr "檢視表名稱"
msgid "Column names"
msgstr "欄位名稱"
-#: view_operations.php:97
+#: view_operations.php:106
msgid "Rename view to"
msgstr "重新命名檢視表為"
-#: view_operations.php:136
+#: view_operations.php:145
msgid "Delete the view (DROP)"
msgstr "刪除檢視表 (DROP)"
@@ -16277,6 +16264,19 @@ msgstr ""
msgid "concurrent_insert is set to 0"
msgstr "concurrent_insert 目前設定為 0"
+#~ msgid "Total %d bookmark"
+#~ msgid_plural "Total %d bookmarks"
+#~ msgstr[0] "共 %d 筆書籤"
+
+#~ msgid "private"
+#~ msgstr "私有"
+
+#~ msgid "%1$s, %2$s and %3$s bookmarks included"
+#~ msgstr "已包含 %1$s、%2$s 與 %3$s 書籤"
+
+#~ msgid "A comma or a closing bracket was expected"
+#~ msgstr "預期要有逗號或者結束括號"
+
#~ msgid ""
#~ "The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
#~ "configuration file!"
diff --git a/scripts/advisor2po b/scripts/advisor2po
index bfffb3860f..445fc11b13 100644
--- a/scripts/advisor2po
+++ b/scripts/advisor2po
@@ -50,6 +50,7 @@ function print_message($idx) {
}
define('PHPMYADMIN', 1);
+require_once 'libraries/vendor_config.php';
require_once 'libraries/autoloader.php';
require_once 'libraries/core.lib.php';
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 7c48d1e084..0b53d8a807 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -148,6 +148,9 @@ echo "* Removing unneeded files"
# if someone runs /test/wui.php and there are test failures
rm -rf test
+# Remove developer information
+rm -rf .github
+
# Remove phpcs coding standard definition
rm -rf PMAStandard
diff --git a/test/AllSeleniumTests.php b/test/AllSeleniumTests.php
deleted file mode 100644
index dcafe1f9d1..0000000000
--- a/test/AllSeleniumTests.php
+++ /dev/null
@@ -1,54 +0,0 @@
-addTestSuite('PmaSeleniumLoginTest');
- $suite->addTestSuite('PmaSeleniumXssTest');
- $suite->addTestSuite('PmaSeleniumPrivilegesTest');
- $suite->addTestSuite('PmaSeleniumCreateDropDatabaseTest');
- $suite->addTestSuite('PmaSeleniumCreateRemoveUserTest');
- return $suite;
- }
-}
diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php
index 939fe92d96..c99163498f 100644
--- a/test/bootstrap-dist.php
+++ b/test/bootstrap-dist.php
@@ -82,6 +82,7 @@ $_SESSION['PMA_Theme'] = PMA\libraries\Theme::load('./themes/pmahomme');
$_SESSION['tmpval']['pftext'] = 'F';
$GLOBALS['lang'] = 'en';
$GLOBALS['is_ajax_request'] = false;
+$GLOBALS['cell_align_left'] = 'left';
// Check whether we have runkit extension
define('PMA_HAS_RUNKIT', function_exists('runkit_constant_redefine'));
diff --git a/test/classes/LanguageTest.php b/test/classes/LanguageTest.php
index b367dc148e..e8260ab21f 100644
--- a/test/classes/LanguageTest.php
+++ b/test/classes/LanguageTest.php
@@ -104,7 +104,7 @@ class LanguageTest extends PMATestCase
$czech = $this->manager->getLanguage('cs');
$this->assertEquals('cs_CZ', $czech->getMySQLLocale());
- $korani = $this->manager->getLanguage('ckb');
+ $korani = $this->manager->getLanguage('hy');
$this->assertEquals('', $korani->getMySQLLocale());
}
@@ -130,6 +130,8 @@ class LanguageTest extends PMATestCase
$this->assertNotEquals(false, $lang);
$this->assertEquals('Czech', $lang->getEnglishName());
$this->assertEquals('Čeština', $lang->getNativeName());
+ $lang = $this->manager->getLanguage('nonexisting');
+ $this->assertEquals(false, $lang);
}
/**
diff --git a/test/theme.php b/test/theme.php
deleted file mode 100644
index 421f56681b..0000000000
--- a/test/theme.php
+++ /dev/null
@@ -1,360 +0,0 @@
-
-
-
-
-
-
-
-
-SELECT
-*
-FROM
-`test`
-
-LIMIT
-0
-,
-30;
-SELECT
-*
-FROM
-`test`
-
-LIMIT
-0
-,
-30;
-SELECT
-*
-FROM
-`test`
-
-LIMIT
-0
-,
-30;
-SELECT
-*
-FROM
-`test`
-
-LIMIT
-0
-,
-30;
-
-
-
-
-| - | table.data thead tr th | -table.data thead tr th | -action | -table.data thead tr th | -||
|---|---|---|---|---|---|---|
| - | table.data tfoot tr th | -table.data tfoot tr th | -action | -table.data tfoot tr th | -||
| - | - | td.value | -
-
- |
-
-
- |
-
-
- |
- table.data tbody tr.odd td | -
| - | - | td.value | -
-
- |
-
-
- |
-
-
- |
- table.data tbody tr.even td | -
| - | - | td.value | -
-
- |
-
-
- |
-
-
- |
- table.data tbody tr.odd td | -
| - | - | td.value | -
-
- |
-
-
- |
-
-
- |
- table.data tbody tr.even td | -