From 0e084c3486af54a0c4061fae1077a5876e5a254a Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Tue, 12 Apr 2016 11:56:33 +0200 Subject: [PATCH 1/7] Translated using Weblate (Interlingua) Currently translated at 73.5% (2364 of 3213 strings) [CI skip] --- po/ia.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ia.po b/po/ia.po index 23a35cad45..fff5b4eb96 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,7 +8,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 13:24+0000\n" +"PO-Revision-Date: 2016-04-12 11:56+0000\n" "Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua " "\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.6-dev\n" #: changelog.php:37 license.php:33 #, php-format @@ -3235,7 +3235,7 @@ msgstr "Monstra chronologia de query al initio" #: libraries/Console.php:367 msgid "Show current browsing query" -msgstr "Monstra query currente que on naviga" +msgstr "Monstra query currente de cerca" #: libraries/Console.php:370 msgid "" From 17690918481b8f34f056558f5adaa4bc75644b3f Mon Sep 17 00:00:00 2001 From: Stefano Martinelli Date: Tue, 12 Apr 2016 12:02:34 +0200 Subject: [PATCH 2/7] Translated using Weblate (Italian) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] --- po/it.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/it.po b/po/it.po index 6ef9ea977e..d289747a50 100644 --- a/po/it.po +++ b/po/it.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-22 22:09+0000\n" +"PO-Revision-Date: 2016-04-12 12:02+0000\n" "Last-Translator: Stefano Martinelli \n" "Language-Team: Italian " "\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.6-dev\n" #: changelog.php:37 license.php:33 #, php-format @@ -3240,7 +3240,7 @@ msgstr "Mostra la cronologia delle query all'inizio" #: libraries/Console.php:367 msgid "Show current browsing query" -msgstr "Mostra navigazione della query corrente" +msgstr "Mostra la query in corso di navigazione" #: libraries/Console.php:370 msgid "" From ac0ff3ab2081d02f5c82dfad0a710df7f1cef438 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Wed, 13 Apr 2016 17:49:02 +0200 Subject: [PATCH 3/7] Translated using Weblate (Turkish) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] --- po/tr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/tr.po b/po/tr.po index a700b252ed..580827e230 100644 --- a/po/tr.po +++ b/po/tr.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-04-09 19:40+0000\n" +"PO-Revision-Date: 2016-04-13 17:48+0000\n" "Last-Translator: Burak Yavuz \n" "Language-Team: Turkish " "\n" @@ -3201,7 +3201,7 @@ msgstr "Başlangıçta sorgu geçmişini göster" #: libraries/Console.php:367 msgid "Show current browsing query" -msgstr "Şu anki gözatılan sorguyu göster" +msgstr "Şu an gözatılan sorguyu göster" #: libraries/Console.php:370 msgid "" From 23d507af54a074d42323ab35d9adaea13537da6d Mon Sep 17 00:00:00 2001 From: Guilherme Date: Wed, 13 Apr 2016 19:13:01 +0200 Subject: [PATCH 4/7] Translated using Weblate (Portuguese (Brazil)) Currently translated at 92.4% (2967 of 3211 strings) [CI skip] --- po/pt_BR.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 3108ddc8e8..f9c034fba0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ 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-03-29 18:28+0000\n" -"Last-Translator: Ricardo Crivelli \n" +"PO-Revision-Date: 2016-04-13 19:12+0000\n" +"Last-Translator: Guilherme \n" "Language-Team: Portuguese (Brazil) " "\n" "Language: pt_BR\n" @@ -7951,6 +7951,8 @@ msgid "" "Queries are executed by pressing Enter (instead of Ctrl+Enter). New lines " "will be inserted with Shift+Enter." msgstr "" +"Queries são executadas pressionando Enter (no lugar de Ctrl + enter). Nova " +"linhas serão inseridas com Shift + Enter." #: libraries/config/messages.inc.php:1000 #, fuzzy @@ -10191,7 +10193,7 @@ msgstr "Reparar" #: libraries/operations.lib.php:1584 #: templates/table/structure/display_structure.phtml:176 msgid "Truncate" -msgstr "" +msgstr "Truncar" #: libraries/operations.lib.php:1594 #, fuzzy @@ -10838,7 +10840,7 @@ msgstr "Estrutura da view %s exportado como tabela" #: libraries/plugins/export/ExportSql.php:2094 msgid "(See below for the actual view)" -msgstr "" +msgstr "(Veja abaixo para a visão atual)" #: libraries/plugins/export/ExportSql.php:2180 msgid "Error reading data:" From 5480e57c4d9070658f4f17fabedbba922982927a Mon Sep 17 00:00:00 2001 From: Petr Kadlec Date: Thu, 14 Apr 2016 10:16:18 +0200 Subject: [PATCH 5/7] Translated using Weblate (Czech) Currently translated at 94.4% (3033 of 3211 strings) [CI skip] --- po/cs.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/cs.po b/po/cs.po index bb0647b7f6..a8a59290a7 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,8 +6,8 @@ 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 12:16+0000\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2016-04-14 10:16+0000\n" +"Last-Translator: Petr Kadlec \n" "Language-Team: Czech " "\n" "Language: cs\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.6-dev\n" #: changelog.php:37 license.php:33 #, php-format @@ -586,12 +586,12 @@ msgid "Bookmark %s has been created." msgstr "Byl vytvořen oblíbený dotaz %s." #: 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] "Import byl úspěšně dokončen, bylo provedeno %d dotazů." -msgstr[1] "Import byl úspěšně dokončen, bylo provedeno %d dotazů." +msgstr[0] "Import byl úspěšně dokončen, byl proveden %d dotaz." +msgstr[1] "Import byl úspěšně dokončen, byly provedeny %d dotazy." msgstr[2] "Import byl úspěšně dokončen, bylo provedeno %d dotazů." #: import.php:711 From 1867c094d731a2b3675f740d971c16514a0453e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sz=C3=A1sz=20Attila?= Date: Fri, 15 Apr 2016 16:48:03 +0200 Subject: [PATCH 6/7] Translated using Weblate (Hungarian) Currently translated at 95.9% (3081 of 3212 strings) [CI skip] --- po/hu.po | 55 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/po/hu.po b/po/hu.po index 2b90d78a88..f373320752 100644 --- a/po/hu.po +++ b/po/hu.po @@ -4,8 +4,8 @@ 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-03-31 11:24+0000\n" -"Last-Translator: Krisztián Patai \n" +"PO-Revision-Date: 2016-04-15 16:48+0000\n" +"Last-Translator: Szász Attila \n" "Language-Team: Hungarian " "\n" "Language: hu\n" @@ -639,7 +639,6 @@ msgstr "" "a root, debian-sys-maint és pma felhasználókon. További információ: %s." #: index.php:161 -#, fuzzy #| msgid "General Settings" msgid "General settings" msgstr "Általános beállítások" @@ -655,7 +654,6 @@ msgid "Server connection collation" msgstr "Kiszolgálókapcsolat illesztése" #: index.php:230 -#, fuzzy #| msgid "Appearance Settings" msgid "Appearance settings" msgstr "Megjelenési beállítások" @@ -1021,7 +1019,6 @@ msgstr "" "alakítani az adatokat?" #: js/messages.php:111 -#, fuzzy #| msgid "Save & Close" msgid "Save & close" msgstr "Mentés és bezárás" @@ -1032,7 +1029,6 @@ msgid "Reset" msgstr "Visszaállítás" #: js/messages.php:113 -#, fuzzy #| msgid "Reset All" msgid "Reset all" msgstr "Összes visszaállítása" @@ -2643,6 +2639,12 @@ msgid "" "cause such a problem, clearing your \"Offline Website Data\" might help. In " "Safari, such problem is commonly caused by \"Private Mode Browsing\"." msgstr "" +"Probléma adódott, amikor a böngészője tárolóját próbáltuk elérni, néhány " +"megoldás nem fog tökéletesen működni az ön számára. Úgy tűnik, hogy a " +"böngésző nem támogatja a helyi tárolást, vagy elérte a kvóta felső határát. " +"Firefox esetében a sérült tároló okozhat ilyen problémát: az \"Offline " +"adatok törlése\" segíthet. Safari böngészőnél ezt a hibát általában a privát " +"módú böngészés okozza." #: js/messages.php:711 #, fuzzy @@ -3093,8 +3095,8 @@ msgstr "Adatbázis" #, php-format msgid "Showing %1$d bookmark (both private and shared)" msgid_plural "Showing %1$d bookmarks (both private and shared)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%1$d könyvjelző megjelenítése (privát és megosztott egyaránt)" +msgstr[1] "%1$d könyvjelző megjelenítése (privát és megosztott egyaránt)" #: libraries/Console.php:107 msgid "No bookmarks" @@ -3921,6 +3923,8 @@ msgstr "Nem támogatott nyelvi kód mellőzése." msgid "" "Linting is disabled for this query because it exceeds the maximum length." msgstr "" +"A kódtisztítás ki van kapcsolva erre a lekérésre, mivel meghaladja a " +"maximális hosszt." #: libraries/Linter.php:165 #, php-format @@ -4682,6 +4686,8 @@ msgid "" "Stores and enables efficient access to data in JSON (JavaScript Object " "Notation) documents" msgstr "" +"Eltárolja és bekapcsolja a hatékony hozzáférést a JSON (JavaScript Object " +"Notation) dokumentumok adataihoz" #: libraries/TypesMySQL.php:479 msgctxt "numeric types" @@ -5568,6 +5574,8 @@ msgid "" "Find any errors in the query before executing it. Requires CodeMirror to be " "enabled." msgstr "" +"Megkeresi a lekérés hibáit a végrehajtás előtt. Bekapcsolt CodeMirror " +"szükséges a működéshez." #: libraries/config/messages.inc.php:67 #, fuzzy @@ -5700,6 +5708,8 @@ msgstr "Tábla megjegyzéseinek megjelenítése" #: libraries/config/messages.inc.php:119 msgid "Whether column comments should be shown in table structure view" msgstr "" +"Meghatározza, hogy az oszlop megjegyzéseket megjelenítse-e a táblázat " +"struktúra nézetben" #: libraries/config/messages.inc.php:120 msgid "Hide table structure actions" @@ -5943,6 +5953,8 @@ msgid "" "Add IF NOT EXISTS (less efficient as indexes will be generated during table " "creation)" msgstr "" +"IF NOT EXISTS hozzáadása (kevésbé hatékony, mivel a tábla létrehozása idején " +"indexeket generálunk)" #: libraries/config/messages.inc.php:214 msgid "Use ignore inserts" @@ -8254,6 +8266,8 @@ msgid "" "connection that encrypts the password using RSA'; while connecting to " "the server." msgstr "" +"Ez a módszer SSL kapcsolatot vagy RSA-val kódolt jelszót előállító " +"nem kódolt kapcsolatot igényel a szerverhez kapcsolódás közben." #: libraries/display_export.lib.php:170 msgid "Exporting databases from the current server" @@ -9504,7 +9518,7 @@ msgstr[1] "%s eredmény található" #: libraries/navigation/NavigationTree.php:1364 #: libraries/navigation/NavigationTree.php:1401 msgid "Type to filter these, Enter to search all" -msgstr "" +msgstr "Gépeljen ezen elemek szűréséhez, vagy Enterrel keressen mindegyikre" #: libraries/navigation/NavigationTree.php:1366 #: libraries/navigation/NavigationTree.php:1402 @@ -10544,6 +10558,7 @@ msgstr "%s utasítások hozzáadása" #: libraries/plugins/export/ExportSql.php:278 msgid "(less efficient as indexes will be generated during table creation)" msgstr "" +"(kevésbé hatékony, mivel az indexek a tábla létrehozása közben generálódnak)" #: libraries/plugins/export/ExportSql.php:286 #, fuzzy, php-format @@ -10736,7 +10751,7 @@ msgstr "%s nézet struktúrája táblaként exportálva" #: libraries/plugins/export/ExportSql.php:2094 msgid "(See below for the actual view)" -msgstr "" +msgstr "(Lásd alább az aktuális nézetet)" #: libraries/plugins/export/ExportSql.php:2180 msgid "Error reading data:" @@ -11284,7 +11299,7 @@ msgstr "Engedélyezett" #: libraries/relation.lib.php:101 msgid "Configuration of pmadb…" -msgstr "A pmadb beállítása… " +msgstr "A pmadb beállítása…" #: libraries/relation.lib.php:105 libraries/relation.lib.php:141 msgid "General relation features" @@ -13948,12 +13963,12 @@ msgstr "%1$d értékek voltak elvárva, de %2$d található." #: libraries/sql-parser/src/Components/Array2d.php:115 msgid "An opening bracket followed by a set of values was expected." -msgstr "" +msgstr "Nyitó kapcsos zárójelet és az azt követő értékeket vártuk." #: libraries/sql-parser/src/Components/ArrayObj.php:119 #: libraries/sql-parser/src/Components/CreateDefinition.php:207 msgid "An opening bracket was expected." -msgstr "" +msgstr "Nyitó kapcsos zárójelet vártunk." #: libraries/sql-parser/src/Components/CreateDefinition.php:251 #, fuzzy @@ -13963,7 +13978,7 @@ msgstr "Nincsenek táblák kiválasztva." #: libraries/sql-parser/src/Components/CreateDefinition.php:267 msgid "A closing bracket was expected." -msgstr "" +msgstr "Záró kapcsos zárójelet vártunk." #: libraries/sql-parser/src/Components/DataType.php:128 msgid "Unrecognized data type." @@ -13995,7 +14010,7 @@ msgstr "Nincsenek verziók kijelölve." #: libraries/sql-parser/src/Components/Limit.php:91 #: libraries/sql-parser/src/Components/Limit.php:113 msgid "An offset was expected." -msgstr "" +msgstr "Offsetet vártunk." #: libraries/sql-parser/src/Components/OptionsArray.php:147 #, php-format @@ -14010,7 +14025,7 @@ msgstr "A megnyitott táblák száma." #: libraries/sql-parser/src/Components/RenameOperation.php:112 msgid "Keyword \"TO\" was expected." -msgstr "" +msgstr "\"TO\" kulcsszavat vártunk." #: libraries/sql-parser/src/Components/RenameOperation.php:128 #, fuzzy @@ -14030,12 +14045,12 @@ msgstr "Váratlan karakter." #: libraries/sql-parser/src/Lexer.php:304 msgid "Expected whitespace(s) before delimiter." -msgstr "" +msgstr "A határoló előtt szóközö(ke)t vártunk." #: libraries/sql-parser/src/Lexer.php:322 #: libraries/sql-parser/src/Lexer.php:338 msgid "Expected delimiter." -msgstr "" +msgstr "Határolót vártunk." #: libraries/sql-parser/src/Lexer.php:784 #, fuzzy, php-format @@ -14098,7 +14113,7 @@ msgstr "A sablon törölve lett." #: libraries/sql-parser/src/Statements/CreateStatement.php:480 msgid "A \"RETURNS\" keyword was expected." -msgstr "" +msgstr "\"RETURNS\" kulcsszavat vártunk." #: libraries/sql.lib.php:231 msgid "Detailed profile" @@ -14566,6 +14581,8 @@ msgid "" "Username and hostname didn't change. If you only want to change the " "password, 'Change password' tab should be used." msgstr "" +"A felhasználónév és a kiszolgálónév nem változott. Ha csak a jelszót óhajtja " +"cserélni, használja a \"Jelszócsere\" fület." #: server_status.php:35 #, fuzzy From fdec3afe1b4ce4c41fa565ab819209ed5a0391c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 18 Apr 2016 11:12:48 +0200 Subject: [PATCH 7/7] Fix disabling SSL client verification MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue #12146 Signed-off-by: Michal Čihař --- libraries/dbi/DBIMysqli.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libraries/dbi/DBIMysqli.php b/libraries/dbi/DBIMysqli.php index 438ebe158d..eebdfb61a6 100644 --- a/libraries/dbi/DBIMysqli.php +++ b/libraries/dbi/DBIMysqli.php @@ -165,11 +165,14 @@ class DBIMysqli implements DBIExtension * @link https://bugs.php.net/bug.php?id=68344 * @link https://github.com/phpmyadmin/phpmyadmin/pull/11838 */ - mysqli_options( - $link, - MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, - $cfg['Server']['ssl_verify'] - ); + if (! $cfg['Server']['ssl_verify']) { + mysqli_options( + $link, + MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, + $cfg['Server']['ssl_verify'] + ); + $client_flags |= MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT; + } } if (! $server) {