gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into multiquery

Browse Source
This commit is contained in:
Madhura Jayaratne 2014-12-01 08:47:53 +05:30
commit d8afbb7602
13 changed files with 181 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -7,6 +7,9 @@ phpMyAdmin - ChangeLog
+ rfe #1564 Improve action message on Tracking page
4.3.1.0 (not yet released)
- bug #4609 'Show all' checkbox label is not clickable
- bug #4610 JS error reporting: Hash fragment is reset
- bug Undefined index menuswork
4.3.0.0 (not yet released)
+ rfe #1502 Smart sorting for int keys
@ -71,8 +74,9 @@ phpMyAdmin - ChangeLog
- bug #4243 Super slow page rendering with tens of thousands of DBs
- bug #4391 Upgraded to 4.2.0, insanely slow now
+ rfe #1537 PHP OpenSSL support for cookie encryption/decryption
- bug #4227 Token mismatch when using HTTP AUTH and the SESSION expires
4.2.13.0 (not yet released)
4.2.13.0 (2014-11-30)
- bug #4604 Query history not being deleted
- bug #4057 db/table query string parameters no longer work
- bug #4605 Unseen messages in tracking

19
doc/setup.rst
View File

@ -498,14 +498,15 @@ Securing your phpMyAdmin installation
The phpMyAdmin team tries hard to make the application secure, however there
are always ways to make your installation more secure:
* remove ``setup`` directory from phpMyAdmin, you will probably not
use it after initial setup
* properly choose authentication method - :ref:`cookie`
is probably the best choice for shared hosting
* in case you don't want all MySQL users to be able to access
phpMyAdmin, you can use :config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` to limit them
* consider hiding phpMyAdmin behind authentication proxy, so that
MySQL credentials are not all users need to login
* if you are afraid of automated attacks, enabling Captcha by
* Remove the ``setup`` directory from phpMyAdmin, you will probably not
use it after the initial setup.
* Properly choose an authentication method - :ref:`cookie`
is probably the best choice for shared hosting.
* In case you don't want all MySQL users to be able to access
phpMyAdmin, you can use :config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` to limit them.
* Consider hiding phpMyAdmin behind an authentication proxy, so that
users need to authenticate prior to providing MySQL credentials
to phpMyAdmin.
* If you are afraid of automated attacks, enabling Captcha by
:config:option:`$cfg['CaptchaLoginPublicKey']` and
:config:option:`$cfg['CaptchaLoginPrivateKey']` might be an option.

2
export.php
View File

@ -324,6 +324,8 @@ if (!defined('TESTSUITE')) {
$export_type, $remember_template, $export_plugin, $compression,
$filename_template
);
} else {
$mime_type = '';
}
// Open file on server if needed

4
js/error_report.js
View File

@ -151,7 +151,9 @@ var ErrorReport = {
*
* @return void
*/
_removeErrorNotification: function () {
_removeErrorNotification: function (e) {
// don't remove the hash fragment by navigating to #
e.preventDefault();
$("#error_notification").fadeOut(function () {
$(this).remove();
});

2
libraries/DisplayResults.class.php
View File

@ -866,7 +866,7 @@ class PMA_DisplayResults
. (! $showing_all ? 'all' : $GLOBALS['cfg']['MaxRows']) . '" />'
. '<input type="hidden" name="goto" value="' . $this->__get('goto')
. '" />'
. '<input type="checkbox" name="navig" class="showAllRows"'
. '<input type="checkbox" name="navig" id="navig" class="showAllRows"'
. (! $showing_all ? '' : ' checked="checked"') . ' value="all" />'
. '<label for="navig">' . __('Show all') . '</label>'
. '</form>'

2
libraries/Menu.class.php
View File

@ -129,7 +129,7 @@ class PMA_Menu
{
$allowedTabs = PMA_Util::getMenuTabList($level);
$cfgRelation = PMA_getRelationsParam();
if ($cfgRelation['menuswork']) {
if (isset($cfgRelation['menuswork']) && $cfgRelation['menuswork']) {
$groupTable = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
. "."
. PMA_Util::backquote($GLOBALS['cfg']['Server']['usergroups']);

124
libraries/plugins/export/ExportSql.class.php
View File

@ -1294,29 +1294,11 @@ class ExportSql extends ExportPlugin
)) {
$has_constraints = 1;
// comments -> constraints for dumped tables
if (! isset($sql_constraints)) {
if (isset($GLOBALS['no_constraints_comments'])) {
$sql_constraints = '';
} else {
$sql_constraints = $crlf
. $this->_exportComment()
. $this->_exportComment(
__('Constraints for dumped tables')
)
. $this->_exportComment();
}
}
// comments for current table
if (! isset($GLOBALS['no_constraints_comments'])) {
$sql_constraints .= $crlf
. $this->_exportComment()
. $this->_exportComment(
__('Constraints for table')
. ' '
. PMA_Util::backquoteCompat($table_alias, $compat)
)
. $this->_exportComment();
}
$sql_constraints = $this->generateComment(
$crlf, $sql_constraints, __('Constraints for dumped tables'),
__('Constraints for table'), $table_alias, $compat
);
$sql_constraints_query .= 'ALTER TABLE '
. PMA_Util::backquoteCompat($table_alias, $compat)
. $crlf;
@ -1338,29 +1320,10 @@ class ExportSql extends ExportPlugin
$has_indexes = 1;
// comments -> indexes for dumped tables
if (! isset($sql_indexes)) {
if (isset($GLOBALS['no_constraints_comments'])) {
$sql_indexes = '';
} else {
$sql_indexes = $crlf
. $this->_exportComment()
. $this->_exportComment(
__('Indexes for dumped tables')
)
. $this->_exportComment();
}
}
// comments for current table
if (! isset($GLOBALS['no_constraints_comments'])) {
$sql_indexes .= $crlf
. $this->_exportComment()
. $this->_exportComment(
__('Indexes for table')
. ' '
. PMA_Util::backquoteCompat($table_alias, $compat)
)
. $this->_exportComment();
}
$sql_indexes = $this->generateComment(
$crlf, $sql_indexes, __('Indexes for dumped tables'),
__('Indexes for table'), $table_alias, $compat
);
$sql_indexes_query_start = 'ALTER TABLE '
. PMA_Util::backquoteCompat($table_alias, $compat)
. $crlf;
@ -1376,29 +1339,11 @@ class ExportSql extends ExportPlugin
$create_query
)) {
// comments -> auto increments for dumped tables
if (! isset($sql_auto_increments)) {
if (isset($GLOBALS['no_constraints_comments'])) {
$sql_auto_increments = '';
} else {
$sql_auto_increments = $crlf
. $this->_exportComment()
. $this->_exportComment(
__('AUTO_INCREMENT for dumped tables')
)
. $this->_exportComment();
}
}
// comments for current table
if (! isset($GLOBALS['no_constraints_comments'])) {
$sql_auto_increments .= $crlf
. $this->_exportComment()
. $this->_exportComment(
__('AUTO_INCREMENT for table')
. ' '
. PMA_Util::backquoteCompat($table_alias, $compat)
)
. $this->_exportComment();
}
$sql_auto_increments = $this->generateComment(
$crlf, $sql_auto_increments,
__('AUTO_INCREMENT for dumped tables'),
__('Indexes for table'), $table_alias, $compat
);
$sql_auto_increments .= 'ALTER TABLE '
. PMA_Util::backquoteCompat($table_alias, $compat)
. $crlf;
@ -2593,4 +2538,45 @@ class ExportSql extends ExportPlugin
);
return $sql_query;
}
/**
* Generate comment
*
* @param string $crlf Carriage return character
* @param string $sql_statement SQL statement
* @param string $comment1 Comment for dumped table
* @param string $comment2 Comment for current table
* @param string $table_alias Table alias
* @param string $compat Compatibility mode
*
* @return string
*/
protected function generateComment(
$crlf, $sql_statement, $comment1, $comment2, $table_alias, $compat
) {
if (!isset($sql_statement)) {
if (isset($GLOBALS['no_constraints_comments'])) {
$sql_statement = '';
} else {
$sql_statement = $crlf
. $this->_exportComment()
. $this->_exportComment($comment1)
. $this->_exportComment();
}
}
// comments for current table
if (!isset($GLOBALS['no_constraints_comments'])) {
$sql_statement .= $crlf
. $this->_exportComment()
. $this->_exportComment(
$comment2 . ' ' . PMA_Util::backquoteCompat(
$table_alias, $compat
)
)
. $this->_exportComment();
}
return $sql_statement;
}
}

76
libraries/sqlparser.lib.php
View File

@ -359,50 +359,50 @@ function PMA_SQP_parse($sql)
) - 1;
// ($pos === false)
if ($pos < 0) {
if ($c == '`') {
/*
* Behave same as MySQL and accept end of query as end
* of backtick.
* I know this is sick, but MySQL behaves like this:
*
* SELECT * FROM `table
*
* is treated like
*
* SELECT * FROM `table`
*/
$pos_quote_separator = /*overload*/mb_strpos(
' ' . $sql, $GLOBALS['sql_delimiter'], $oldpos + 1
) - 1;
if ($pos_quote_separator < 0) {
$len += 1;
$sql .= '`';
$sql_array['raw'] .= '`';
$pos = $len;
} else {
$len += 1;
$sql = /*overload*/mb_substr(
$sql, 0, $pos_quote_separator
) . '`' . /*overload*/mb_substr(
$sql, $pos_quote_separator
);
$sql_array['raw'] = $sql;
$pos = $pos_quote_separator;
}
if (class_exists('PMA_Message')
&& $GLOBALS['is_ajax_request'] != true
) {
PMA_Message::notice(
__('Automatically appended backtick to the end of query!')
)->display();
}
} else {
if ($c != '`') {
$debugstr = __('Unclosed quote')
. ' @ ' . $startquotepos . "\n"
. 'STR: ' . htmlspecialchars($quotetype);
PMA_SQP_throwError($debugstr, $sql);
return $sql_array;
}
/*
* Behave same as MySQL and accept end of query as end
* of backtick.
* I know this is sick, but MySQL behaves like this:
*
* SELECT * FROM `table
*
* is treated like
*
* SELECT * FROM `table`
*/
$pos_quote_separator = /*overload*/mb_strpos(
' ' . $sql, $GLOBALS['sql_delimiter'], $oldpos + 1
) - 1;
if ($pos_quote_separator < 0) {
$len += 1;
$sql .= '`';
$sql_array['raw'] .= '`';
$pos = $len;
} else {
$len += 1;
$sql = /*overload*/mb_substr(
$sql, 0, $pos_quote_separator
) . '`' . /*overload*/mb_substr(
$sql, $pos_quote_separator
);
$sql_array['raw'] = $sql;
$pos = $pos_quote_separator;
}
if (class_exists('PMA_Message')
&& $GLOBALS['is_ajax_request'] != true
) {
PMA_Message::notice(
__('Automatically appended backtick to the end of query!')
)->display();
}
}
// If the quote is the first character, it can't be

3
libraries/structure.lib.php
View File

@ -339,7 +339,8 @@ function PMA_getHtmlForCheckAllTables($pmaThemeImage, $text_dir,
$html_output .= '<option value="copy_tbl_change_prefix" >'
. __('Copy table with prefix') . '</option>' . "\n";
if (isset($GLOBALS['cfgRelation']['central_columnswork'])
&& $GLOBALS['cfgRelation']['central_columnswork']) {
&& $GLOBALS['cfgRelation']['central_columnswork']
) {
$html_output .= '<option value="sync_unique_columns_central_list" >'
. __('Add columns to central list') . '</option>' . "\n";
$html_output .= '<option value="delete_unique_columns_central_list" >'

36
po/de.po
View File

@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2014-11-26 08:29-0500\n"
"PO-Revision-Date: 2014-11-26 14:51+0200\n"
"Last-Translator: Jan Erik Zassenhaus <jan.zassenhaus@jgerman.de>\n"
"PO-Revision-Date: 2014-11-27 20:14+0200\n"
"Last-Translator: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>\n"
"Language-Team: German "
"<https://hosted.weblate.org/projects/phpmyadmin/master/de/>\n"
"Language: de\n"
@ -759,7 +759,7 @@ msgstr "Server-Typ:"
#: libraries/plugins/export/ExportSql.class.php:681
#: libraries/plugins/export/ExportXml.class.php:189
msgid "Server version:"
msgstr "Server Version:"
msgstr "Server-Version:"
#: index.php:292
msgid "Protocol version:"
@ -771,7 +771,7 @@ msgstr "Benutzer:"
#: index.php:301
msgid "Server charset:"
msgstr "Server Zeichensatz:"
msgstr "Server-Zeichensatz:"
#: index.php:316
msgid "Web server"
@ -908,8 +908,8 @@ msgstr ""
msgid ""
"Or alternately go to 'Operations' tab of any database to set it up there."
msgstr ""
"Oder wechseln Sie in einer beliebigen Datenbank zum Reiter „Operationen“ um "
"die Einstellung vorzunehmen."
"Oder wechseln Sie in einer beliebigen Datenbank zum Tab „Operationen“, um "
"die Einstellung dort vorzunehmen."
#: index.php:585
#, php-format
@ -2934,7 +2934,7 @@ msgstr "Lesezeichen"
#: libraries/Console.class.php:218
msgid "Press Ctrl+Enter to execute query"
msgstr "Drücken sie Strg+Enter um die Abfrage auszuführen"
msgstr "Drücken Sie Strg+Enter, um die Abfrage auszuführen"
#: libraries/Console.class.php:239
msgid "During current session"
@ -3804,7 +3804,7 @@ msgstr "Letzte Tabellen"
#: libraries/RecentFavoriteTable.class.php:267
msgid "Recent"
msgstr "Neulich"
msgstr "Letzte"
#: libraries/RecentFavoriteTable.class.php:269
#: libraries/config/messages.inc.php:467
@ -6892,9 +6892,8 @@ msgstr ""
"pma__pdf_pages[/kbd]."
#: libraries/config/messages.inc.php:622
#, fuzzy
msgid "PDF schema: pages table"
msgstr "PDF Pages Table"
msgstr "PDF-Schema: Seiten-Tabelle"
#: libraries/config/messages.inc.php:624
msgid ""
@ -7782,7 +7781,7 @@ msgstr "Kein Passwort"
#: libraries/replication_gui.lib.php:412 libraries/replication_gui.lib.php:853
#: libraries/server_privileges.lib.php:1493
msgid "Password:"
msgstr "Passwort:"
msgstr "Kennwort:"
#: libraries/display_change_password.lib.php:74
#: libraries/replication_gui.lib.php:877
@ -8958,6 +8957,9 @@ msgid ""
"There are large item groups in navigation panel which may affect the "
"performance. Consider disabling item grouping in the navigation panel."
msgstr ""
"Es gibt große Element-Gruppen im Navigations-Panel. Darunter kann die "
"Geschwindigkeit leiden. Eventuell sollten Sie das Gruppieren von Elementen "
"im Navigations-Panel abschalten."
#: libraries/navigation/NavigationTree.class.php:857
#, php-format
@ -10269,10 +10271,9 @@ msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
msgstr "<code>AUTO_INCREMENT</code> nicht für Nullwerte verwenden"
#: libraries/plugins/import/ImportSql.class.php:193
#, fuzzy
#| msgid "Read misses"
msgid "Read as multibytes"
msgstr "Fehlgeschlagene Leseanfragen"
msgstr "Als Multibyte lesen"
#: libraries/plugins/import/ImportXml.class.php:54
msgid "XML"
@ -10913,7 +10914,7 @@ msgstr "Benutzername"
#: libraries/server_privileges.lib.php:1525
#: libraries/server_privileges.lib.php:2964
msgid "Password"
msgstr "Passwort"
msgstr "Kennwort"
#: libraries/replication_gui.lib.php:435
msgid "Port:"
@ -12271,7 +12272,7 @@ msgstr ""
"Um Abfragen aus den Logs anzuzeigen, wählen Sie die relevante Zeitspanne in "
"einem Diagramm durch Drücken der linken Maustaste und markieren Sie einen "
"Bereich des Diagramms durch Ziehen. Dadurch wird eine Tabelle von "
"gruppierten Abfragen geladen. Sie können auf jedes SELECT Anweisung klicken, "
"gruppierten Abfragen geladen. Sie können auf jede SELECT-Anweisung klicken, "
"um diese weiter zu analysieren."
#: libraries/server_status_monitor.lib.php:147
@ -14012,10 +14013,9 @@ msgid "Display column was successfully updated."
msgstr "Spaltendarstellung erfolgreich aktualisiert."
#: libraries/tbl_relation.lib.php:900
#, fuzzy
#| msgid "Internal relation has been added."
msgid "Internal relations were successfully updated."
msgstr "Interne Verknüpfung wurde hinzugefügt."
msgstr "Interne Verknüpfungen wurden erfolgreich aktualisiert."
#: libraries/tbl_relation.lib.php:1165
#, php-format
@ -14318,7 +14318,7 @@ msgstr "Dump (Schema) der Datenbanken anzeigen"
#: server_privileges.php:139
msgid "Username and hostname didn't change."
msgstr "Nutzername und Rechnername haben sich nicht geändert."
msgstr "Benutzername und Rechnername haben sich nicht geändert."
#: server_status_processes.php:36
#, php-format

52
po/el.po
View File

@ -4,14 +4,14 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2014-11-26 08:29-0500\n"
"PO-Revision-Date: 2014-11-15 15:08+0200\n"
"PO-Revision-Date: 2014-11-27 16:08+0200\n"
"Last-Translator: Panagiotis Papazoglou <papaz_p@yahoo.com>\n"
"Language-Team: Greek <https://hosted.weblate.org/projects/phpmyadmin/master/"
"el/>\n"
"Language-Team: Greek "
"<https://hosted.weblate.org/projects/phpmyadmin/master/el/>\n"
"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: el\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2.1-dev\n"
@ -329,23 +329,23 @@ msgid "Access denied!"
msgstr "Άρνηση πρόσβασης!"
#: db_tracking.php:38 db_tracking.php:63
#, fuzzy
#| msgid "Tracking data definition successfully deleted"
msgid "Tracking data deleted successfully."
msgstr "Ο προσδιορισμός των δεδομένων παρακολούθησης διαγράφτηκε επιτυχώς"
msgstr "Τα δεδομένα παρακολούθησης διαγράφτηκαν επιτυχώς."
#: db_tracking.php:47
#, fuzzy, php-format
#, php-format
#| msgid "Version %1$s was created, tracking for %2$s is active."
msgid ""
"Version %1$s was created for selected tables, tracking is active for them."
msgstr "Η έκδοση %1$s δημιουργήθηκε, η παρακολούθηση του %2$s ενεργοποιήθηκε."
msgstr ""
"Η έκδοση %1$s δημιουργήθηκε για επιλεγμένους πίνακες, η παρακολούθηση είναι "
"ενεργοποιημένη για αυτούς."
#: db_tracking.php:78
#, fuzzy
#| msgid "No databases selected."
msgid "No tables selected."
msgstr "Δεν έχετε επιλέξει βάσεις δεδομένων."
msgstr "Δεν επιλέχθηκαν πίνακες."
#: db_tracking.php:112
msgid "Tracked tables"
@ -392,10 +392,9 @@ msgid "Delete tracking data for this table"
msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτόν τον πίνακα"
#: db_tracking.php:145 db_tracking.php:207
#, fuzzy
#| msgid "Deleting tracking data"
msgid "Delete tracking"
msgstr "Διαγραφή δεδομένων παρακολούθησης"
msgstr "Διαγραφή παρακολούθησης"
#: db_tracking.php:183
msgid "Versions"
@ -952,28 +951,24 @@ msgid "You are about to TRUNCATE a complete table!"
msgstr "Πρόκειται να TRUNCATE έναν ολόκληρο πίνακα!"
#: js/messages.php:40
#, fuzzy
#| msgid "Delete tracking data for this table"
msgid "Delete tracking data for this table?"
msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτόν τον πίνακα"
msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτόν τον πίνακα;"
#: js/messages.php:41
#, fuzzy
#| msgid "Delete tracking data for this table"
msgid "Delete tracking data for these tables?"
msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτόν τον πίνακα"
msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτούς τους πίνακες;"
#: js/messages.php:42
#, fuzzy
#| msgid "Delete tracking data for this table"
msgid "Delete tracking data for this version?"
msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτόν τον πίνακα"
msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτήν την έκδοση;"
#: js/messages.php:43
#, fuzzy
#| msgid "Delete tracking data for this table"
msgid "Delete tracking data for these versions?"
msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτόν τον πίνακα"
msgstr "Διαγραφή δεδομένων παρακολούθησης για αυτές τις εκδόσεις;"
#: js/messages.php:44
msgid "Deleting tracking data"
@ -13982,10 +13977,10 @@ msgid "Create version %1$s of %2$s"
msgstr "Δημιουργία έκδοσης %1$s του %2$s"
#: libraries/tracking.lib.php:73
#, fuzzy, php-format
#, php-format
#| msgid "Create version"
msgid "Create version %1$s"
msgstr "Δημιουργία έκδοσης"
msgstr "Δημιουργία έκδοσης %1$s"
#: libraries/tracking.lib.php:78
msgid "Track these data definition statements:"
@ -14018,10 +14013,9 @@ msgid "Deactivate now"
msgstr "Απενεργοποιήση τώρα"
#: libraries/tracking.lib.php:258 libraries/tracking.lib.php:312
#, fuzzy
#| msgid "Create version"
msgid "Delete version"
msgstr "Δημιουργία έκδοσης"
msgstr "Διαγραφή έκδοσης"
#: libraries/tracking.lib.php:377 libraries/tracking.lib.php:1386
msgid "active"
@ -14135,10 +14129,10 @@ msgid "Tracking for %1$s was deactivated at version %2$s."
msgstr "Παρακολούθηση του %1$s απενεργοποιήθηκε στην έκδοση %2$s."
#: libraries/tracking.lib.php:1258
#, fuzzy, php-format
#, php-format
#| msgid "Create version %1$s of %2$s"
msgid "Version %1$s of %2$s was deleted."
msgstr "Δημιουργία έκδοσης %1$s του %2$s"
msgstr "Η έκδοση %1$s από %2$s διαγράφτηκε."
#: libraries/tracking.lib.php:1289
#, php-format
@ -14503,16 +14497,14 @@ msgid "Tracking of %s is activated."
msgstr "Παρακολούθηση του %s ενεργοποιήθηκε."
#: tbl_tracking.php:100
#, fuzzy
#| msgid "The selected users have been deleted successfully."
msgid "Tracking versions deleted successfully."
msgstr "Οι επιλεγμένοι χρήστες διεγράφησαν επιτυχώς."
msgstr "Οι παρακολουθούμενες εκδόσεις διεγράφησαν επιτυχώς."
#: tbl_tracking.php:105
#, fuzzy
#| msgid "No rows selected"
msgid "No versions selected."
msgstr "Δεν επιλέχθηκαν γραμμές"
msgstr "Δεν επιλέχθηκαν εκδόσεις."
#: tbl_tracking.php:132
msgid "SQL statements executed."

54
po/nl.po
View File

@ -4,16 +4,16 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2014-11-26 08:29-0500\n"
"PO-Revision-Date: 2014-11-14 13:42+0200\n"
"PO-Revision-Date: 2014-11-27 15:39+0200\n"
"Last-Translator: Dieter Adriaenssens <ruleant@users.sourceforge.net>\n"
"Language-Team: Dutch <https://hosted.weblate.org/projects/phpmyadmin/master/"
"nl/>\n"
"Language-Team: Dutch "
"<https://hosted.weblate.org/projects/phpmyadmin/master/nl/>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2.0\n"
"X-Generator: Weblate 2.1-dev\n"
#: changelog.php:36 license.php:28
#, php-format
@ -328,23 +328,23 @@ msgid "Access denied!"
msgstr "Toegang geweigerd!"
#: db_tracking.php:38 db_tracking.php:63
#, fuzzy
#| msgid "Tracking data definition successfully deleted"
msgid "Tracking data deleted successfully."
msgstr "Tracking-gegevensdefinitie succesvol verwijderd"
msgstr "Tracking-gegevens succesvol verwijderd."
#: db_tracking.php:47
#, fuzzy, php-format
#, php-format
#| msgid "Version %1$s was created, tracking for %2$s is active."
msgid ""
"Version %1$s was created for selected tables, tracking is active for them."
msgstr "Versie %1$s is aangemaakt, tracking van %2$s is ingeschakeld."
msgstr ""
"Versie %1$s is aangemaakt voor de geselecteerde tabellen, waarvoor tracking "
"is ingeschakeld."
#: db_tracking.php:78
#, fuzzy
#| msgid "No databases selected."
msgid "No tables selected."
msgstr "Er zijn geen databanken geselecteerd."
msgstr "Er zijn geen tabellen geselecteerd."
#: db_tracking.php:112
msgid "Tracked tables"
@ -391,10 +391,9 @@ msgid "Delete tracking data for this table"
msgstr "Verwijder tracking data voor deze tabel"
#: db_tracking.php:145 db_tracking.php:207
#, fuzzy
#| msgid "Deleting tracking data"
msgid "Delete tracking"
msgstr "Tracking data voor deze tabel wordt verwijderd"
msgstr "Verwijder tracking"
#: db_tracking.php:183
msgid "Versions"
@ -949,28 +948,24 @@ msgid "You are about to TRUNCATE a complete table!"
msgstr "U staat op het punt een volledige databank LEEG te maken!"
#: js/messages.php:40
#, fuzzy
#| msgid "Delete tracking data for this table"
msgid "Delete tracking data for this table?"
msgstr "Verwijder tracking data voor deze tabel"
msgstr "Verwijder tracking data voor deze tabel?"
#: js/messages.php:41
#, fuzzy
#| msgid "Delete tracking data for this table"
msgid "Delete tracking data for these tables?"
msgstr "Verwijder tracking data voor deze tabel"
msgstr "Verwijder tracking data voor deze tabellen?"
#: js/messages.php:42
#, fuzzy
#| msgid "Delete tracking data for this table"
msgid "Delete tracking data for this version?"
msgstr "Verwijder tracking data voor deze tabel"
msgstr "Verwijder tracking data voor deze versie?"
#: js/messages.php:43
#, fuzzy
#| msgid "Delete tracking data for this table"
msgid "Delete tracking data for these versions?"
msgstr "Verwijder tracking data voor deze tabel"
msgstr "Verwijder tracking data voor deze versies?"
#: js/messages.php:44
msgid "Deleting tracking data"
@ -13954,10 +13949,10 @@ msgid "Create version %1$s of %2$s"
msgstr "Versie %1$s van %2$s aanmaken"
#: libraries/tracking.lib.php:73
#, fuzzy, php-format
#, php-format
#| msgid "Create version"
msgid "Create version %1$s"
msgstr "Versie aanmaken"
msgstr "Versie %1$s aanmaken"
#: libraries/tracking.lib.php:78
msgid "Track these data definition statements:"
@ -13990,10 +13985,9 @@ msgid "Deactivate now"
msgstr "Nu uitschakelen"
#: libraries/tracking.lib.php:258 libraries/tracking.lib.php:312
#, fuzzy
#| msgid "Create version"
msgid "Delete version"
msgstr "Versie aanmaken"
msgstr "Versie verwijderen"
#: libraries/tracking.lib.php:377 libraries/tracking.lib.php:1386
msgid "active"
@ -14109,10 +14103,10 @@ msgid "Tracking for %1$s was deactivated at version %2$s."
msgstr "Tracking van %1$s is uitgeschakeld op versie %2$s."
#: libraries/tracking.lib.php:1258
#, fuzzy, php-format
#, php-format
#| msgid "Create version %1$s of %2$s"
msgid "Version %1$s of %2$s was deleted."
msgstr "Versie %1$s van %2$s aanmaken"
msgstr "Versie %1$s van %2$s werd verwijderd."
#: libraries/tracking.lib.php:1289
#, php-format
@ -14479,16 +14473,14 @@ msgid "Tracking of %s is activated."
msgstr "Tracking van %s is ingeschakeld."
#: tbl_tracking.php:100
#, fuzzy
#| msgid "The selected users have been deleted successfully."
msgid "Tracking versions deleted successfully."
msgstr "De geselecteerde gebruikers zijn met succes verwijderd."
msgstr "Tracking versies zijn met succes verwijderd."
#: tbl_tracking.php:105
#, fuzzy
#| msgid "No rows selected"
msgid "No versions selected."
msgstr "Geen rijen geselecteerd"
msgstr "Geen versies geselecteerd."
#: tbl_tracking.php:132
msgid "SQL statements executed."

2
test/classes/PMA_DisplayResults_test.php
View File

@ -1619,7 +1619,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
. '<input type="hidden" name="pos" value="0" />'
. '<input type="hidden" name="session_max_rows" value="all" />'
. '<input type="hidden" name="goto" value="tbl_structure.php" />'
. '<input type="checkbox" name="navig" class="showAllRows" value="all" />'
. '<input type="checkbox" name="navig" id="navig" class="showAllRows" value="all" />'
. '<label for="navig">Show all</label></form></td>'
)
);