From 9a15dd457cb5023908cedb7163c8326e3ca81689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 17 Feb 2016 12:16:56 +0100 Subject: [PATCH 1/6] Translated using Weblate (Czech) Currently translated at 94.4% (3032 of 3211 strings) [CI skip] --- po/cs.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/cs.po b/po/cs.po index 4c63be4eaa..bb0647b7f6 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,10 +6,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-alpha1\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-02-17 11:55+0100\n" -"PO-Revision-Date: 2016-02-16 10:08+0000\n" +"PO-Revision-Date: 2016-02-17 12:16+0000\n" "Last-Translator: Michal Čihař \n" -"Language-Team: Czech \n" +"Language-Team: Czech " +"\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -13946,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" From 053f9bf3b319e9cbe0a04091a87630c43e820a0f Mon Sep 17 00:00:00 2001 From: dingo thirteen Date: Wed, 17 Feb 2016 16:26:46 +0100 Subject: [PATCH 2/6] Translated using Weblate (Dutch) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] --- po/nl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/nl.po b/po/nl.po index bf267538a4..cc84d34920 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-alpha1\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-02-17 11:55+0100\n" -"PO-Revision-Date: 2016-02-17 16:24+0000\n" +"PO-Revision-Date: 2016-02-17 16:26+0000\n" "Last-Translator: dingo thirteen \n" "Language-Team: Dutch " "\n" @@ -3235,7 +3235,7 @@ msgstr "Wissel naar donker thema" #: libraries/DatabaseInterface.php:1528 msgid "Failed to set configured collation connection!" -msgstr "Instellen van de configuratie voor vergelijkingen is mislukt!" +msgstr "Instellen van geconfigureerde vergelijking verbinding mislukt!" #: libraries/DatabaseInterface.php:2139 msgid "" From 28119247c19edd863bab20528970ff91e33c2d00 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Thevenet Date: Wed, 17 Feb 2016 12:53:07 +0100 Subject: [PATCH 3/6] Translated using Weblate (French) Currently translated at 99.9% (3208 of 3211 strings) [CI skip] --- po/fr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index 133a1160b5..01d9cd1562 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-02-17 11:55+0100\n" -"PO-Revision-Date: 2016-02-08 13:33+0000\n" +"PO-Revision-Date: 2016-02-17 12:53+0000\n" "Last-Translator: Marc-Antoine Thevenet \n" -"Language-Team: French \n" +"Language-Team: French " +"\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -599,8 +599,8 @@ msgstr "Signet %s créé." #| msgid "Import has been successfully finished, %d queries executed." msgid "Import has been successfully finished, %d query executed." msgid_plural "Import has been successfully finished, %d queries executed." -msgstr[0] "L'importation s'est terminée avec succès, %d requêtes exécutées." -msgstr[1] "L'importation s'est terminée avec succès, %d requêtes exécutées." +msgstr[0] "L'importation a réussi, %d requête exécutée." +msgstr[1] "L'importation a réussi, %d requêtes exécutées." #: import.php:711 #, php-format From e6ca1ee5d266238d32c2a438a191c3ff3ec73dc6 Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Wed, 17 Feb 2016 13:24:46 +0100 Subject: [PATCH 4/6] Translated using Weblate (Interlingua) Currently translated at 73.5% (2364 of 3213 strings) [CI skip] --- po/ia.po | 74 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/po/ia.po b/po/ia.po index f2d21f1160..23a35cad45 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-alpha1\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-02-17 11:55+0100\n" -"PO-Revision-Date: 2016-02-08 15:27+0000\n" +"PO-Revision-Date: 2016-02-17 13:24+0000\n" "Last-Translator: Giovanni Sora \n" -"Language-Team: Interlingua \n" +"Language-Team: Interlingua " +"\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -597,11 +597,11 @@ msgid "Bookmark %s has been created." msgstr "Marcator de libro %s create." #: import.php:680 -#, fuzzy, php-format +#, php-format #| msgid "Import has been successfully finished, %d queries executed." msgid "Import has been successfully finished, %d query executed." msgid_plural "Import has been successfully finished, %d queries executed." -msgstr[0] "Importation executate con successo, %d demandas executate." +msgstr[0] "Importation executate con successo, %d demanda executate." msgstr[1] "Importation executate con successo, %d demandas executate." #: import.php:711 @@ -781,6 +781,9 @@ msgid "" "The curl extension was not found and allow_url_fopen is disabled. Due to " "this some features such as error reporting or version check are disabled." msgstr "" +"Le extension de curl non esseva trovate e allow_url_fopen es dishabilitate. " +"Debite a isto alcun characteristicas tal como reporto de error o controlo de " +"version es dishabilitate." #: index.php:499 msgid "" @@ -2595,6 +2598,13 @@ msgid "" "cause such a problem, clearing your \"Offline Website Data\" might help. In " "Safari, such problem is commonly caused by \"Private Mode Browsing\"." msgstr "" +"Il habeva un problema quando on accede a tu immagazinage de navigator, alcun " +"characteristicas poterea non functionar propriemente per te. Probabilemente " +"il ha que le navigator non supporta immagazinage o le limite de quota ha " +"essite attingite. In Firefox, immagazinage corrupte anque pote causar un tal " +"problema, nettar tu \"Datos de sito Web foras de linea - i.e. Offline " +"Website Data\" pote adjutar. In Safari, tal problema es solitemente causate " +"per \"Navigation de Modo Private - i.e. Private Mode Browsing\"." #: js/messages.php:711 msgid "Copy tables to" @@ -2610,7 +2620,7 @@ msgstr "Reimplacia tabella con prefixo" #: js/messages.php:714 templates/database/structure/check_all_tables.phtml:29 msgid "Copy table with prefix" -msgstr "" +msgstr "Copia tabella con prefixo" #: js/messages.php:743 msgctxt "Previous month" @@ -3852,7 +3862,7 @@ msgstr "Numero pagina:" #: libraries/LanguageManager.php:778 msgid "Ignoring unsupported language code." -msgstr "" +msgstr "Ignorante codice de linguage non supportate." #: libraries/Linter.php:99 msgid "" @@ -7945,7 +7955,7 @@ msgstr "incognite" #: libraries/controllers/server/ServerBinlogController.php:151 msgid "Log name" -msgstr "" +msgstr "Nomine de registro log" #: libraries/controllers/server/ServerBinlogController.php:152 msgid "Position" @@ -7959,11 +7969,11 @@ msgstr "Typo de evento" #: libraries/controllers/server/ServerBinlogController.php:154 #: libraries/replication_gui.lib.php:618 msgid "Server ID" -msgstr "" +msgstr "ID de servitor" #: libraries/controllers/server/ServerBinlogController.php:155 msgid "Original position" -msgstr "" +msgstr "Position original" #: libraries/controllers/server/ServerBinlogController.php:156 #: templates/table/structure/display_table_stats.phtml:4 @@ -7973,12 +7983,12 @@ msgstr "Information" #: libraries/controllers/server/ServerBinlogController.php:206 #: libraries/server_status_processes.lib.php:177 msgid "Truncate Shown Queries" -msgstr "" +msgstr "Trunca Queries monstrate" #: libraries/controllers/server/ServerBinlogController.php:210 #: libraries/server_status_processes.lib.php:182 msgid "Show Full Queries" -msgstr "" +msgstr "Monstra queries complete" #: libraries/controllers/server/ServerDatabasesController.php:119 msgid "No databases" @@ -10167,6 +10177,8 @@ msgstr "Accesso (Log in)" #: libraries/plugins/auth/AuthenticationCookie.php:178 msgid "You can enter hostname/IP address and port separated by space." msgstr "" +"Tu pote insertar nomine de hospite/Adresse de IP e le porto separate per " +"spatio." #: libraries/plugins/auth/AuthenticationCookie.php:183 msgid "Username:" @@ -10178,11 +10190,11 @@ msgstr "Selection de servitor:" #: libraries/plugins/auth/AuthenticationCookie.php:356 msgid "Entered captcha is wrong, try again!" -msgstr "" +msgstr "Le captcha insertate es errate, essaya de novo!" #: libraries/plugins/auth/AuthenticationCookie.php:360 msgid "Please enter correct captcha!" -msgstr "" +msgstr "Pro favor inserta le captcha correcte!" #: libraries/plugins/auth/AuthenticationCookie.php:386 msgid "You are not allowed to log in to this MySQL server!" @@ -10191,49 +10203,49 @@ msgstr "" #: libraries/plugins/auth/AuthenticationHttp.php:99 msgid "Wrong username/password. Access denied." -msgstr "" +msgstr "Nomine de usator/contrasigno errate. Accesso refusate." #: libraries/plugins/auth/AuthenticationSignon.php:92 msgid "Can not find signon authentication script:" -msgstr "" +msgstr "Il non pote trovar le script per le authentication de signon:" #: libraries/plugins/auth/swekey/swekey.auth.lib.php:145 #, php-format msgid "File %s does not contain any key id" -msgstr "" +msgstr "File %s 1 non contine alcun clave id" #: libraries/plugins/auth/swekey/swekey.auth.lib.php:193 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:214 msgid "Hardware authentication failed!" -msgstr "" +msgstr "Authentication hardware falleva!" #: libraries/plugins/auth/swekey/swekey.auth.lib.php:201 msgid "No valid authentication key plugged" -msgstr "" +msgstr "Necun valide clave de authentication insertate" #: libraries/plugins/auth/swekey/swekey.auth.lib.php:234 msgid "Authenticating…" -msgstr "" +msgstr "Authentication…" #: libraries/plugins/export/ExportCsv.php:62 #: libraries/plugins/import/AbstractImportCsv.php:58 msgid "Columns separated with:" -msgstr "" +msgstr "Columnas separate per:" #: libraries/plugins/export/ExportCsv.php:67 #: libraries/plugins/import/AbstractImportCsv.php:64 msgid "Columns enclosed with:" -msgstr "" +msgstr "Columnas limitate per:" #: libraries/plugins/export/ExportCsv.php:72 #: libraries/plugins/import/AbstractImportCsv.php:71 msgid "Columns escaped with:" -msgstr "" +msgstr "Columnas prefixate con:" #: libraries/plugins/export/ExportCsv.php:77 #: libraries/plugins/import/AbstractImportCsv.php:78 msgid "Lines terminated with:" -msgstr "" +msgstr "Rangos terminate per:" #: libraries/plugins/export/ExportCsv.php:82 #: libraries/plugins/export/ExportExcel.php:52 @@ -10243,16 +10255,16 @@ msgstr "" #: libraries/plugins/export/ExportOdt.php:131 #: libraries/plugins/export/ExportTexytext.php:87 msgid "Replace NULL with:" -msgstr "" +msgstr "Reimplacia NULL con:" #: libraries/plugins/export/ExportCsv.php:87 #: libraries/plugins/export/ExportExcel.php:57 msgid "Remove carriage return/line feed characters within columns" -msgstr "" +msgstr "Remove characteres de carriage return/line feed (CR/LF) intra columnas" #: libraries/plugins/export/ExportExcel.php:67 msgid "Excel edition:" -msgstr "" +msgstr "Edition de Excel:" #: libraries/plugins/export/ExportHtmlword.php:77 #: libraries/plugins/export/ExportLatex.php:159 @@ -10260,14 +10272,14 @@ msgstr "" #: libraries/plugins/export/ExportTexytext.php:76 #: libraries/plugins/export/ExportXml.php:135 msgid "Data dump options" -msgstr "" +msgstr "Optiones del dump del datos" #: libraries/plugins/export/ExportHtmlword.php:207 #: libraries/plugins/export/ExportOdt.php:270 #: libraries/plugins/export/ExportSql.php:2319 #: libraries/plugins/export/ExportTexytext.php:190 msgid "Dumping data for table" -msgstr "" +msgstr "Dump del datos per le tabella" #: libraries/plugins/export/ExportHtmlword.php:487 #: libraries/plugins/export/ExportOdt.php:608 @@ -10291,14 +10303,14 @@ msgstr "Definition" #: libraries/plugins/export/ExportSql.php:1976 #: libraries/plugins/export/ExportTexytext.php:513 msgid "Table structure for table" -msgstr "" +msgstr "Structura de tabella" #: libraries/plugins/export/ExportHtmlword.php:585 #: libraries/plugins/export/ExportOdt.php:723 #: libraries/plugins/export/ExportSql.php:2046 #: libraries/plugins/export/ExportTexytext.php:538 msgid "Structure for view" -msgstr "" +msgstr "Structura per le vista" #: libraries/plugins/export/ExportHtmlword.php:599 #: libraries/plugins/export/ExportOdt.php:744 From 8428cd714a941e26373aabb68adb0a8ab64b8c5e Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 19 Feb 2016 19:36:58 +1100 Subject: [PATCH 5/6] Fix SQL syntax highlighting in database search page Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + js/db_search.js | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0bc9b27f2f..c45fb47b00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ phpMyAdmin - ChangeLog - issue #11972 Missing documentation for $cfg['Servers'][$i]['favorite'] and $cfg['NumFavoriteTables'] - issue #11907 Avoid displaying UPDATE query twice - issue #11850 Fixed CSV import +- issue Fix SQL syntax highlighting in database search page 4.5.5.0 (not yet released) - issue Undefined index: is_ajax_request diff --git a/js/db_search.js b/js/db_search.js index 5ee07b8dd3..945b081f27 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -57,6 +57,7 @@ function loadResult(result_path, table_name, link) PMA_makegrid(this, true, true, true, true); }); $('#browse-results').show(); + PMA_highlightSQL($('#browse-results')); } else { PMA_ajaxShowMessage(data.error, false); } From 26c79f76077ee68874ccd2534cb686a84b5bc1c4 Mon Sep 17 00:00:00 2001 From: Adam Magnier Date: Thu, 18 Feb 2016 12:28:44 +0100 Subject: [PATCH 6/6] Translated using Weblate (French) Currently translated at 99.9% (3209 of 3211 strings) [CI skip] --- po/fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 01d9cd1562..60e374fe42 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-02-17 11:55+0100\n" -"PO-Revision-Date: 2016-02-17 12:53+0000\n" -"Last-Translator: Marc-Antoine Thevenet \n" +"PO-Revision-Date: 2016-02-18 12:28+0000\n" +"Last-Translator: Adam Magnier \n" "Language-Team: French " "\n" "Language: fr\n" @@ -595,7 +595,7 @@ msgid "Bookmark %s has been created." msgstr "Signet %s créé." #: import.php:680 -#, fuzzy, php-format +#, php-format #| msgid "Import has been successfully finished, %d queries executed." msgid "Import has been successfully finished, %d query executed." msgid_plural "Import has been successfully finished, %d queries executed."