From f7c782b227786adce45470c5498e32178dc4a3f4 Mon Sep 17 00:00:00 2001 From: BO41 Date: Sun, 26 Aug 2018 18:08:29 +0000 Subject: [PATCH 1/8] Translated using Weblate (German) Currently translated at 100.0% (3294 of 3294 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/de/ Signed-off-by: BO41 --- po/de.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index ef42bbe590..41d028b22e 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-08-26 19:06+0200\n" -"PO-Revision-Date: 2018-08-15 04:10+0000\n" +"PO-Revision-Date: 2018-08-26 18:10+0000\n" "Last-Translator: BO41 \n" "Language-Team: German \n" @@ -950,6 +950,9 @@ msgid "" "You are trying to reduce the number of rows, but have already entered data " "in those rows which will be lost. Do you wish to continue?" msgstr "" +"Sie versuchen, die Anzahl der Zeilen zu reduzieren, haben aber bereits Daten " +"in den Zeilen eingegeben, die verloren gehen werden. Möchten Sie " +"weitermachen?" #: js/messages.php:75 msgid "Do you really want to revoke the selected user(s) ?" @@ -2320,7 +2323,7 @@ msgstr "" #: js/messages.php:562 msgid "value/subQuery is empty" -msgstr "" +msgstr "Wert/Unterabfrage ist leer" #: js/messages.php:563 templates/database/designer/side_menu.twig:34 #: templates/database/designer/side_menu.twig:37 @@ -10256,6 +10259,8 @@ msgid "" "The gd PHP extension was not found. The QRcode can not be displayed without " "the gd PHP extension." msgstr "" +"Die gd PHP-Erweiterung wurde nicht gefunden. Der QRcode kann ohne die gd PHP-" +"Erweiterung nicht angezeigt werden." #: libraries/classes/Plugins/TwoFactor/Application.php:146 msgid "Authentication Application (2FA)" @@ -14638,10 +14643,6 @@ msgstr "" "Authentifizierungscode ein." #: templates/login/twofactor/application_configure.twig:11 -#, fuzzy -#| msgid "" -#| "Please scan following QR code into the two-factor authentication app on " -#| "your device and enter authentication code it generates." msgid "" "Please enter following secret/key into the two-factor authentication app on " "your device and enter authentication code it generates." @@ -14652,11 +14653,11 @@ msgstr "" #: templates/login/twofactor/application_configure.twig:14 msgid "OTP url:" -msgstr "" +msgstr "OTP-URL:" #: templates/login/twofactor/application_configure.twig:18 msgid "Secret/key:" -msgstr "" +msgstr "Geheimnis/Schlüssel:" #: templates/login/twofactor/application_configure.twig:21 #: templates/login/twofactor/application.twig:2 From 74a8939bbb425017cff423f7509961e5987e5db1 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Sun, 26 Aug 2018 19:29:30 +0000 Subject: [PATCH 2/8] Translated using Weblate (French) Currently translated at 100.0% (3294 of 3294 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/fr/ Signed-off-by: Olivier Humbert --- po/fr.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/po/fr.po b/po/fr.po index 1dae0d9816..e0e3158bc9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-08-26 19:06+0200\n" -"PO-Revision-Date: 2018-07-08 23:37+0000\n" +"PO-Revision-Date: 2018-08-26 19:30+0000\n" "Last-Translator: Olivier Humbert \n" "Language-Team: French \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 3.1-dev\n" +"X-Generator: Weblate 3.2-dev\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1101 msgid "Bad type!" @@ -951,6 +951,9 @@ msgid "" "You are trying to reduce the number of rows, but have already entered data " "in those rows which will be lost. Do you wish to continue?" msgstr "" +"Vous êtes en train d'essayer de réduire le nombre de rangées, mais vous avez " +"déjà entré des données dans ces rangées qui seront perdues. Souhaitez-vous " +"continuer ?" #: js/messages.php:75 msgid "Do you really want to revoke the selected user(s) ?" @@ -2312,7 +2315,7 @@ msgstr "" #: js/messages.php:562 msgid "value/subQuery is empty" -msgstr "" +msgstr "value/subQuery est vide" #: js/messages.php:563 templates/database/designer/side_menu.twig:34 #: templates/database/designer/side_menu.twig:37 @@ -10236,6 +10239,8 @@ msgid "" "The gd PHP extension was not found. The QRcode can not be displayed without " "the gd PHP extension." msgstr "" +"L'extension PHP gd est introuvable. Le QRcode ne peut pas être affiché sans " +"l'extension PHP gd." #: libraries/classes/Plugins/TwoFactor/Application.php:146 msgid "Authentication Application (2FA)" @@ -14613,25 +14618,21 @@ msgstr "" "généré." #: templates/login/twofactor/application_configure.twig:11 -#, fuzzy -#| msgid "" -#| "Please scan following QR code into the two-factor authentication app on " -#| "your device and enter authentication code it generates." msgid "" "Please enter following secret/key into the two-factor authentication app on " "your device and enter authentication code it generates." msgstr "" -"Merci de capturer le code QR suivant dans l'application d'authentification à " -"deux facteurs sur votre appareil et de saisir le code d'authentification " -"généré." +"Veuillez entre le/la secret/clef suivant dans l'application " +"d'authentification à deux facteurs sur votre appareil et de saisir le code " +"d'authentification généré." #: templates/login/twofactor/application_configure.twig:14 msgid "OTP url:" -msgstr "" +msgstr "url OTP :" #: templates/login/twofactor/application_configure.twig:18 msgid "Secret/key:" -msgstr "" +msgstr "Secret/clef :" #: templates/login/twofactor/application_configure.twig:21 #: templates/login/twofactor/application.twig:2 From ac1eb203ab9eeacb61f58950ec2a8a77aa332967 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Aug 2018 12:46:45 +0000 Subject: [PATCH 3/8] Translated using Weblate (French) Currently translated at 100.0% (3294 of 3294 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/fr/ Signed-off-by: Marc Delisle --- po/fr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index e0e3158bc9..b14fbc7733 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: 2018-08-26 19:06+0200\n" -"PO-Revision-Date: 2018-08-26 19:30+0000\n" -"Last-Translator: Olivier Humbert \n" +"PO-Revision-Date: 2018-08-27 12:52+0000\n" +"Last-Translator: Marc Delisle \n" "Language-Team: French \n" "Language: fr\n" @@ -14622,8 +14622,8 @@ msgid "" "Please enter following secret/key into the two-factor authentication app on " "your device and enter authentication code it generates." msgstr "" -"Veuillez entre le/la secret/clef suivant dans l'application " -"d'authentification à deux facteurs sur votre appareil et de saisir le code " +"Veuillez entrer ce secret ou cette clef dans l'application " +"d'authentification à deux facteurs de votre appareil et saisir le code " "d'authentification généré." #: templates/login/twofactor/application_configure.twig:14 From 04231ad041a05046a0451be2743eba1d9ab70774 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Mon, 27 Aug 2018 12:49:28 +0000 Subject: [PATCH 4/8] Translated using Weblate (French) Currently translated at 100.0% (3294 of 3294 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/fr/ Signed-off-by: Isaac Bennetch --- po/fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index b14fbc7733..5ecbb730cd 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-08-26 19:06+0200\n" "PO-Revision-Date: 2018-08-27 12:52+0000\n" -"Last-Translator: Marc Delisle \n" +"Last-Translator: Isaac Bennetch \n" "Language-Team: French \n" "Language: fr\n" @@ -15456,8 +15456,8 @@ msgid "" "configuration to indicate HTTPS properly." msgstr "" "Il y a une discordance entre le HTTPS indiqué sur le serveur et le client. " -"Cela peut mené à un phpMyAdmin non fonctionnel ou à un risque de sécurité. " -"S'il-vous-plait corriger la configuration de votre serveur pour indiqué " +"Cela peut mener à un phpMyAdmin non fonctionnel ou à un risque de sécurité. S" +"'il-vous-plait corrigez la configuration de votre serveur pour indiquer " "HTTPS correctement." #: templates/table/search/options_zoom.twig:6 From 563989b4c39028b1e9d1a4a685f3d8fbefcea90e Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Sun, 26 Aug 2018 19:48:36 +0000 Subject: [PATCH 5/8] Translated using Weblate (Interlingua) Currently translated at 75.3% (2481 of 3294 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/ia/ Signed-off-by: Giovanni Sora --- po/ia.po | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/po/ia.po b/po/ia.po index 188cf4dbd4..b88d826fca 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.4-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-08-26 19:06+0200\n" -"PO-Revision-Date: 2018-04-30 17:37+0000\n" +"PO-Revision-Date: 2018-08-27 20:39+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" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.0-dev\n" +"X-Generator: Weblate 3.2-dev\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1101 msgid "Bad type!" @@ -949,6 +949,8 @@ msgid "" "You are trying to reduce the number of rows, but have already entered data " "in those rows which will be lost. Do you wish to continue?" msgstr "" +"Tu es essayante a reducer le numero de rangos, ma tu ja ha insertate datos " +"in ille rangos que essera perdite. Tu vole continuar?" #: js/messages.php:75 msgid "Do you really want to revoke the selected user(s) ?" @@ -2311,7 +2313,7 @@ msgstr "" #: js/messages.php:562 msgid "value/subQuery is empty" -msgstr "" +msgstr "valor/subQuery es vacue" #: js/messages.php:563 templates/database/designer/side_menu.twig:34 #: templates/database/designer/side_menu.twig:37 From c8dce83e44b480606f672dae73e2f47d350774cf Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Mon, 27 Aug 2018 07:42:35 +0000 Subject: [PATCH 6/8] Translated using Weblate (Turkish) Currently translated at 100.0% (3288 of 3288 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/tr/ Signed-off-by: Burak Yavuz --- po/tr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/tr.po b/po/tr.po index 865b5d5f2c..2a6597c273 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.4-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-08-26 19:06+0200\n" -"PO-Revision-Date: 2018-01-26 09:42+0000\n" +"PO-Revision-Date: 2018-08-28 07:44+0000\n" "Last-Translator: Burak Yavuz \n" -"Language-Team: Turkish \n" +"Language-Team: Turkish \n" "Language: tr\n" "MIME-Version: 1.0\n" "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.19-dev\n" +"X-Generator: Weblate 3.2-dev\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1101 msgid "Bad type!" @@ -7070,7 +7070,7 @@ msgstr "Eksik bağlantı parametreleri!" #: libraries/classes/DatabaseInterface.php:2490 msgid "Connection for controluser as defined in your configuration failed." msgstr "" -"Yapılandırma dosyanız içinde tanımlanmış denetim kullanıcıları için bağlantı " +"Yapılandırma dosyanız içinde tanımlanmış denetim kullanıcısı için bağlantı " "başarısız oldu." #: libraries/classes/DatabaseInterface.php:3006 From a2cdf7f2176959fd3d010c787d413f9934fe75cb Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 3 Jun 2018 14:13:54 +0200 Subject: [PATCH 7/8] Fix for #14295 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: #14295 Signed-off-by: William Desportes (cherry picked from commit a87bf74eed88b7e4b403cebad3a6c43321f03c68) Signed-off-by: Maurício Meneghini Fauth --- index.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/index.php b/index.php index 0ac91de52f..30ec98c32d 100644 --- a/index.php +++ b/index.php @@ -19,6 +19,7 @@ use PhpMyAdmin\Server\Select; use PhpMyAdmin\ThemeManager; use PhpMyAdmin\Url; use PhpMyAdmin\Util; +use PhpMyAdmin\UserPreferences; /** * Gets some core libraries and displays a top message if required @@ -82,6 +83,12 @@ if (isset($_POST['set_theme'])) { $tmanager = ThemeManager::getInstance(); $tmanager->setActiveTheme($_POST['set_theme']); $tmanager->setThemeCookie(); + + $userPreferences = new UserPreferences(); + $prefs = $userPreferences->load(); + $prefs["config_data"]["ThemeDefault"] = $_POST['set_theme']; + $userPreferences->save($prefs["config_data"]); + header('Location: index.php' . Url::getCommonRaw()); exit(); } From 42e7fb3a85e6cf4a674584d889e1ef35ba5ca3b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Tue, 28 Aug 2018 05:02:59 -0300 Subject: [PATCH 8/8] Add ChangeLog entry for #14295 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 224118ca78..dc051d3cf8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.8.4 (not yet released) - issue #14452 Remove hash param in edit query URL +- issue #14295 Issue in Changing theme 4.8.3 (2018-08-22) - issue #14314 Error when naming a database '0'