From 71a9114d04e7857ea7f23bf5d208161d016853bb Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Mon, 31 Mar 2014 14:10:28 +0200 Subject: [PATCH 1/3] Translated using Weblate (Dutch) Currently translated at 100.0% (2750 of 2750) --- po/nl.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/po/nl.po b/po/nl.po index 1f42a5a05e..9873cabc9b 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.13-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-03-27 13:53+0100\n" -"PO-Revision-Date: 2014-02-20 12:51+0200\n" +"PO-Revision-Date: 2014-03-31 14:10+0200\n" "Last-Translator: Dieter Adriaenssens \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -1651,7 +1651,7 @@ msgstr "Indexen tonen" #: js/messages.php:256 libraries/mult_submits.lib.php:419 msgid "Foreign key check:" -msgstr "Controle op vreemde sleutels:" +msgstr "Controle op externe sleutels:" #: js/messages.php:257 libraries/mult_submits.lib.php:432 msgid "(Enabled)" @@ -1871,7 +1871,7 @@ msgstr "Selecteer de gerefereerde sleutel" #: js/messages.php:343 msgid "Select Foreign Key" -msgstr "Selecteer vreemde sleutel" +msgstr "Selecteer externe sleutel" #: js/messages.php:344 msgid "Please select the primary key or a unique key" @@ -3429,7 +3429,7 @@ msgstr "Maximum aantal af te drukken regels" #: libraries/TableSearch.class.php:931 libraries/TableSearch.class.php:1250 #: libraries/sql.lib.php:377 tbl_change.php:144 msgid "Browse foreign values" -msgstr "Bekijk vreemde waarden" +msgstr "Bekijk externe waarden" #: libraries/TableSearch.class.php:1030 msgid "Additional search criteria" @@ -4843,7 +4843,7 @@ msgstr "Gebruik vertraagde inserts" #: libraries/config/messages.inc.php:124 #: libraries/plugins/export/ExportSql.class.php:142 msgid "Disable foreign key checks" -msgstr "Controle op vreemde sleutels uitschakelen" +msgstr "Controle op externe sleutels uitschakelen" #: libraries/config/messages.inc.php:125 #: libraries/plugins/export/ExportSql.class.php:155 @@ -4906,7 +4906,7 @@ msgstr "" #: libraries/config/messages.inc.php:151 msgid "Foreign key dropdown order" -msgstr "Vreemdesleutel-afrolmenu sortering" +msgstr "Externe sleutel-afrolmenu sortering" #: libraries/config/messages.inc.php:152 msgid "A dropdown will be used if fewer items are present" @@ -4914,7 +4914,7 @@ msgstr "Een afrolmenu wordt gebruikt indien er minder items beschikbaar zijn" #: libraries/config/messages.inc.php:153 msgid "Foreign key limit" -msgstr "Vreemdesleutel limiet" +msgstr "Externe sleutel limiet" #: libraries/config/messages.inc.php:154 msgid "Browse mode" @@ -8454,7 +8454,7 @@ msgstr "Labelsleutel:" #: libraries/plugins/export/ExportOdt.class.php:103 #: libraries/plugins/export/ExportSql.class.php:115 msgid "Display foreign key relationships" -msgstr "Toon vreemde sleutel relaties" +msgstr "Toon externe sleutel relaties" #: libraries/plugins/export/ExportLatex.class.php:142 #: libraries/plugins/export/ExportOdt.class.php:108 @@ -12385,7 +12385,7 @@ msgstr "" #: libraries/tbl_relation.lib.php:433 msgid "Foreign key constraint" -msgstr "Beperking voor vreemde sleutel" +msgstr "Beperking voor externe sleutel" #: libraries/tbl_relation.lib.php:553 msgid "Constraint name" @@ -12399,7 +12399,7 @@ msgstr "Geen index gedefinieerd! Maak hieronder er een aan" #, php-format msgid "Error creating foreign key on %1$s (check data types)" msgstr "" -"Fout bij het maken van vreemde sleutel naar %1$s (controleer gegevenstypen)" +"Fout bij het maken van externe sleutel naar %1$s (controleer gegevenstypen)" #: libraries/tbl_tracking.lib.php:60 #, php-format From d2739935d143549c605d8b155d930641e801ec98 Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Mon, 31 Mar 2014 11:40:14 +0200 Subject: [PATCH 2/3] Translated using Weblate (Interlingua) Currently translated at 43.0% (1183 of 2750) --- po/ia.po | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/po/ia.po b/po/ia.po index d11b1dbc6f..f20ea132f3 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.13-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-03-27 13:53+0100\n" -"PO-Revision-Date: 2014-03-28 14:41+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2014-03-31 11:40+0200\n" +"Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua " "\n" "Language: ia\n" @@ -8360,11 +8360,11 @@ msgstr "Declarationes INSERT IGNORE" #: libraries/plugins/export/ExportSql.class.php:351 msgid "Function to use when dumping data:" -msgstr "Function de usar quando on discarga (dumping) datos:" +msgstr "Function de usar quando on face discargamento (dumping) de datos:" #: libraries/plugins/export/ExportSql.class.php:364 msgid "Syntax to use when inserting data:" -msgstr "Le syntaxe quando on inserta datos:" +msgstr "Le syntaxe de usar quando on inserta datos:" #: libraries/plugins/export/ExportSql.class.php:372 msgid "" @@ -11643,7 +11643,7 @@ msgstr "" #: libraries/tbl_columns_definition_form.lib.php:160 msgid "Table name" -msgstr "" +msgstr "Nomine de tabella" #: libraries/tbl_columns_definition_form.lib.php:281 msgid "" @@ -11661,11 +11661,11 @@ msgstr "" #: libraries/tbl_columns_definition_form.lib.php:310 msgid "Move column" -msgstr "" +msgstr "Move columna" #: libraries/tbl_columns_definition_form.lib.php:320 msgid "Transformation options" -msgstr "" +msgstr "Optiones de transformation" #: libraries/tbl_columns_definition_form.lib.php:323 msgid "" @@ -11677,12 +11677,12 @@ msgstr "" #: libraries/tbl_columns_definition_form.lib.php:742 msgid "first" -msgstr "" +msgstr "prime" #: libraries/tbl_columns_definition_form.lib.php:751 #, php-format msgid "after %s" -msgstr "" +msgstr "post %s" #: libraries/tbl_columns_definition_form.lib.php:1039 msgid "ENUM or SET data too long?" @@ -11712,15 +11712,15 @@ msgstr "" #: libraries/tbl_gis_visualization.lib.php:205 msgid "Label column" -msgstr "" +msgstr "Etiquetta columna" #: libraries/tbl_gis_visualization.lib.php:205 msgid "Spatial column" -msgstr "" +msgstr "Columna spatial" #: libraries/tbl_gis_visualization.lib.php:212 msgid "-- None --" -msgstr "" +msgstr "-- Necun --" #: libraries/tbl_gis_visualization.lib.php:269 msgid "Display GIS Visualization" @@ -11732,12 +11732,12 @@ msgstr "" #: libraries/tbl_gis_visualization.lib.php:308 msgid "File name" -msgstr "" +msgstr "Nomine de file" #: libraries/tbl_gis_visualization.lib.php:324 setup/frames/config.inc.php:41 #: setup/frames/index.inc.php:273 msgid "Download" -msgstr "" +msgstr "Discarga" #: libraries/tbl_indexes.lib.php:114 msgid "The name of the primary key must be \"PRIMARY\"!" @@ -11753,7 +11753,7 @@ msgstr "" #: libraries/tbl_indexes.lib.php:260 msgid "Index name:" -msgstr "" +msgstr "Nomine de indice:" #: libraries/tbl_indexes.lib.php:264 msgid "" @@ -11762,15 +11762,15 @@ msgstr "" #: libraries/tbl_indexes.lib.php:283 msgid "Comment:" -msgstr "" +msgstr "Commento:" #: libraries/tbl_indexes.lib.php:298 msgid "Index type:" -msgstr "" +msgstr "Typo de indice:" #: libraries/tbl_printview.lib.php:30 msgid "Showing tables:" -msgstr "Monstra tabulas:" +msgstr "Monstra tabellas:" #: libraries/tbl_printview.lib.php:174 msgid "Row Statistics:" From f4daebee245015406e43127194a1fd454172511a Mon Sep 17 00:00:00 2001 From: "Ann + J.M" Date: Wed, 2 Apr 2014 11:22:02 +0200 Subject: [PATCH 3/3] Revert fix for #4345 Signed-off-by: Ann + J.M --- ChangeLog | 9 ++++----- libraries/server_privileges.lib.php | 11 +++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8469829b63..733d4f947d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,6 @@ phpMyAdmin - ChangeLog 4.1.13.0 (not yet released) - bug #4279 CTRL + up or down moves 2 fields - bug #4336 List server css style wrong -- bug #4345 Privileges editor shows databases with underscore backslash-escaped - bug Missing value on the Status > Server page - bug #4347 Fixed PHP Parse error in Advisor @@ -15,7 +14,7 @@ phpMyAdmin - ChangeLog - bug #4326 Cannot find the import plugins which start with uppercase 'I' 4.1.11.0 (2014-03-23) -- bug #4335 reCaptcha problem (4.1.10 regression) +- bug #4335 reCaptcha problem (4.1.10 regression) 4.1.10.0 (2014-03-22) - bug #4301 Grid edit: "SELECT" query is replaced by "UPDATE" query after edit @@ -23,11 +22,11 @@ phpMyAdmin - ChangeLog - bug #4324 Datepicker not showing up on insert page - bug #3991 Problem selecting item in select boxes with the ENTER keystroke in some browsers - bug #4323 QueryWindow ignores CodeMirror -- bug None of the live charts shown on "Status -> Monitor" (Chrome) +- bug None of the live charts shown on "Status -> Monitor" (Chrome) 4.1.9.0 (2014-03-06) - bug #4279 CTRL + up or down moves two fields (part one) -- bug #4294 output as text radio clickable for "OpenDocument Text" export +- bug #4294 output as text radio clickable for "OpenDocument Text" export - bug #4297 DROP DATABASE tick box in export no longer works - bug #4291 Unable to export comments in OpenDocument text format - bug #4299 Deletion even when the user says "No" to the confirmation message @@ -53,7 +52,7 @@ phpMyAdmin - ChangeLog - Fixed altering table to DOUBLE/FLOAT field - bug #4292 Success message and failure message being shown together - bug #4293 opening new tab (using selflink) for import.php based actions - results in error and logout + results in error and logout 4.1.7.0 (2014-02-09) - bug #4245 initial Browse query does not match sorting order diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index a0eaae9092..aa72a282fc 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -2485,7 +2485,7 @@ function PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename) ) ) . '">' - . htmlspecialchars(stripslashes($dbname)) . ': ' + . htmlspecialchars($dbname) . ': ' . PMA_Util::getTitleForTarget( $GLOBALS['cfg']['DefaultTabDatabase'] ) @@ -2640,7 +2640,7 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $dbname, $html_output .= '' . "\n" . '' . htmlspecialchars( - (! strlen($dbname)) ? stripslashes($row['Db']) : $row['Table_name'] + (! strlen($dbname)) ? $row['Db'] : $row['Table_name'] ) . '' . "\n" . '' . "\n" @@ -2742,7 +2742,7 @@ function PMA_getTableForDisplayAllTableSpecificRights( // table body // get data - // we also want privileges for this user not in table `db` but in other table + // we also want privielgs for this user not in table `db` but in other table $tables = $GLOBALS['dbi']->fetchResult('SHOW TABLES FROM `mysql`;'); /** @@ -3726,14 +3726,13 @@ function PMA_getHtmlHeaderForDisplayUserProperties( 'tablename' => '', ) ) - . '">' . htmlspecialchars(stripslashes($dbname)) + . '">' . htmlspecialchars($dbname) . ''; $html_output .= ' - ' . __('Table') . ' ' . htmlspecialchars($tablename) . ''; } else { - $html_output .= ' ' . htmlspecialchars(stripslashes($dbname)) - . ''; + $html_output .= ' ' . htmlspecialchars($dbname) . ''; } } else {