From d52a900bc369aa8d2919608305824abcfb4dae7c Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Wed, 25 Mar 2020 11:59:10 +0000 Subject: [PATCH 1/4] Translated using Weblate (Turkish) Currently translated at 100.0% (3334 of 3334 strings) [CI skip] Translation: phpMyAdmin/5.0 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/tr/ Signed-off-by: Burak Yavuz --- po/tr.po | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/po/tr.po b/po/tr.po index 7941d6653a..cb59916bab 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.0.3-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2020-03-24 23:04+0100\n" -"PO-Revision-Date: 2020-03-23 20:52+0000\n" +"PO-Revision-Date: 2020-03-25 18:20+0000\n" "Last-Translator: Burak Yavuz \n" "Language-Team: Turkish \n" @@ -10627,18 +10627,6 @@ msgstr "" "ayarlamanız gerekir." #: libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php:31 -#, fuzzy -#| msgid "" -#| "LINUX ONLY: Launches an external application and feeds it the column data " -#| "via standard input. Returns the standard output of the application. The " -#| "default is Tidy, to pretty-print HTML code. For security reasons, you " -#| "have to manually edit the file libraries/classes/Plugins/Transformations/" -#| "Output/Text_Plain_External.php and list the tools you want to make " -#| "available. The first option is then the number of the program you want to " -#| "use and the second option is the parameters for the program. The third " -#| "option, if set to 1, will convert the output using htmlspecialchars() " -#| "(Default 1). The fourth option, if set to 1, will prevent wrapping and " -#| "ensure that the output appears all on one line (Default 1)." msgid "" "LINUX ONLY: Launches an external application and feeds it the column data " "via standard input. Returns the standard output of the application. The " @@ -10654,13 +10642,13 @@ msgstr "" "SADECE LINUX: Harici bir uygulama çalıştırır ve sütun verisini standart " "girdi yoluyla besler. Uygulamanın standart çıktısı döner. Düzgün HTML kodu " "baskısı için varsayılan düzenlidir. Güvenlik nedeniyle libraries/classes/" -"Plugins/Transformations/Output/Text_Plain_External.php dosyasını elle " -"düzenlemeli ve olmasını istediğiniz araçları listelemelisiniz. İlk seçenek " -"kullanmak istediğiniz program sayısı ve ikinci seçenek program için " -"parametrelerdir. Üçüncü seçenek, eğer 1'e ayarlanırsa, htmlspecialchars() " -"işlevi kullanılarak çıktıyı dönüştürecektir (Varsayılan 1). Dördüncü " -"seçenek, eğer 1'e ayarlanırsa, sözcük kaydırma korunacak ve tüm çıktı tek " -"bir satırda görünecektir (Varsayılan 1)." +"Plugins/Transformations/Abs/ExternalTransformationsPlugin.php dosyasını elle " +"düzenlemeli ve olmasını istediğiniz araçları listelemelisiniz. İlk seçenek, " +"daha sonra kullanmak istediğiniz programın sayısıdır. İkinci seçenek, " +"geçmişteki nedenlerden dolayı boş olmalıdır. Üçüncü seçenek, eğer 1 olarak " +"ayarlanırsa, htmlspecialchars() işlevi kullanılarak çıktıyı dönüştürecektir (" +"Varsayılan 1). Dördüncü seçenek, eğer 1 olarak ayarlanırsa, sözcük kaydırma " +"korunacak ve tüm çıktı tek bir satırda görünecektir (Varsayılan 1)." #: libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php:117 #, php-format @@ -10669,6 +10657,9 @@ msgid "" "has been deprecated for security reasons. Add all command line options " "directly to the definition in %s." msgstr "" +"Güvenlik nedenleriyle kullanım dışı bırakılmış, dönüşüm komut satırı " +"seçenekleri alanını kullanıyorsunuz. Tüm komut satırı seçeneklerini doğrudan " +"%s içindeki tanıma ekleyin." #: libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php:31 msgid "" @@ -13428,10 +13419,8 @@ msgstr "Geçersiz tablo adı" #. l10n: In case a SQL query did not pass a security check #: tbl_get_field.php:62 -#, fuzzy -#| msgid "There are too many joins without indexes." msgid "There is an issue with your request." -msgstr "İndeksler olmaksızın çok fazla birleştirme var." +msgstr "İsteğinizle ilgili bir sorun var." #: tbl_replace.php:266 #, php-format From 4465fd20b8d7131f0c03d2c05481728996b38e61 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Wed, 25 Mar 2020 15:32:33 +0000 Subject: [PATCH 2/4] Translated using Weblate (French) Currently translated at 100.0% (3334 of 3334 strings) [CI skip] Translation: phpMyAdmin/5.0 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/fr/ Signed-off-by: Olivier Humbert --- po/fr.po | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/po/fr.po b/po/fr.po index 773559ca66..9debc3d98d 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: 2020-03-24 23:04+0100\n" -"PO-Revision-Date: 2020-02-13 14:50+0000\n" +"PO-Revision-Date: 2020-03-25 18:20+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.11-dev\n" +"X-Generator: Weblate 4.0-dev\n" #: ajax.php:35 ajax.php:73 export.php:214 libraries/classes/Export.php:1219 msgid "Bad type!" @@ -10749,18 +10749,6 @@ msgstr "" "utilisée, merci de laisser la première option vide." #: libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php:31 -#, fuzzy -#| msgid "" -#| "LINUX ONLY: Launches an external application and feeds it the column data " -#| "via standard input. Returns the standard output of the application. The " -#| "default is Tidy, to pretty-print HTML code. For security reasons, you " -#| "have to manually edit the file libraries/classes/Plugins/Transformations/" -#| "Output/Text_Plain_External.php and list the tools you want to make " -#| "available. The first option is then the number of the program you want to " -#| "use and the second option is the parameters for the program. The third " -#| "option, if set to 1, will convert the output using htmlspecialchars() " -#| "(Default 1). The fourth option, if set to 1, will prevent wrapping and " -#| "ensure that the output appears all on one line (Default 1)." msgid "" "LINUX ONLY: Launches an external application and feeds it the column data " "via standard input. Returns the standard output of the application. The " @@ -10776,14 +10764,15 @@ msgstr "" "(Linux seulement) Exécute un programme externe et lui envoie le contenu de " "la colonne via l'entrée standard. Puis capture la sortie standard de ce " "programme externe. Le programme par défaut est Tidy, pour un affichage " -"embelli du code HTML. Pour des raisons de sécurité, il faut éditer le " -"script /classes/Plugins/Transformations/Output/Text_Plain_External.php et y " -"insérer les noms de programmes externes à rendre disponibles. La première " -"option est le numéro du programme à utiliser, la seconde contient les " -"paramètres pour ce programme. En 3ème option, une valeur de 1 va convertir " -"le résultat avec la fonction htmlspecialchars() (par défaut, 1). En option " -"4, une valeur de 1 va interdire tout retour à la ligne pour afficher sur une " -"seule ligne (par défaut, 1)." +"embelli du code HTML. Pour des raisons de sécurité, il faut éditer le script " +"libraries/classes/Plugins/Transformations/Abs/" +"ExternalTransformationsPlugin.php et y insérer les noms de programmes " +"externes à rendre disponibles. La première option est le numéro du programme " +"à utiliser. La seconde option devrait être vide pour raisons historiques. En " +"3ème option, si paramétré à 1, va convertir le résultat avec la fonction " +"htmlspecialchars() (par défaut, 1). La 4ème option, si paramétrée à 1 va " +"interdire tout retour à la ligne pour afficher sur une seule ligne (par " +"défaut, 1)." #: libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php:117 #, php-format @@ -10792,6 +10781,9 @@ msgid "" "has been deprecated for security reasons. Add all command line options " "directly to the definition in %s." msgstr "" +"Vous utilisez le champ d'options de la ligne de commande de transformation " +"externe, qui a été déprécié pour des raisons de sécurité. Ajoutez toutes les " +"options de la ligne de commande directement à la définition en %s." #: libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php:31 msgid "" @@ -13602,10 +13594,8 @@ msgstr "Nom de table invalide" #. l10n: In case a SQL query did not pass a security check #: tbl_get_field.php:62 -#, fuzzy -#| msgid "There are too many joins without indexes." msgid "There is an issue with your request." -msgstr "Il y a trop de jointures sans index." +msgstr "Il y a un problème avec votre demande." #: tbl_replace.php:266 #, php-format From 728a55b6687a552f2c096af7d917c06b1d18c197 Mon Sep 17 00:00:00 2001 From: Domen Date: Thu, 26 Mar 2020 21:43:42 +0000 Subject: [PATCH 3/4] Translated using Weblate (Slovenian) Currently translated at 100.0% (3334 of 3334 strings) [CI skip] Translation: phpMyAdmin/5.0 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/sl/ Signed-off-by: Domen --- po/sl.po | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/po/sl.po b/po/sl.po index 94761c9a77..7be1ee422d 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.0.3-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2020-03-24 23:04+0100\n" -"PO-Revision-Date: 2020-01-29 20:50+0000\n" +"PO-Revision-Date: 2020-03-27 22:46+0000\n" "Last-Translator: Domen \n" "Language-Team: Slovenian \n" @@ -12,9 +12,9 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3;\n" -"X-Generator: Weblate 3.11-dev\n" +"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3;\n" +"X-Generator: Weblate 4.0-dev\n" #: ajax.php:35 ajax.php:73 export.php:214 libraries/classes/Export.php:1219 msgid "Bad type!" @@ -10596,18 +10596,6 @@ msgstr "" "možnost prazna." #: libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php:31 -#, fuzzy -#| msgid "" -#| "LINUX ONLY: Launches an external application and feeds it the column data " -#| "via standard input. Returns the standard output of the application. The " -#| "default is Tidy, to pretty-print HTML code. For security reasons, you " -#| "have to manually edit the file libraries/classes/Plugins/Transformations/" -#| "Output/Text_Plain_External.php and list the tools you want to make " -#| "available. The first option is then the number of the program you want to " -#| "use and the second option is the parameters for the program. The third " -#| "option, if set to 1, will convert the output using htmlspecialchars() " -#| "(Default 1). The fourth option, if set to 1, will prevent wrapping and " -#| "ensure that the output appears all on one line (Default 1)." msgid "" "LINUX ONLY: Launches an external application and feeds it the column data " "via standard input. Returns the standard output of the application. The " @@ -10620,16 +10608,16 @@ msgid "" "(Default 1). The fourth option, if set to 1, will prevent wrapping and " "ensure that the output appears all on one line (Default 1)." msgstr "" -"SAMO ZA LINUX: Zažene zunanjo aplikacijo in podaja podatke stopcev prek " +"SAMO ZA LINUX: Zažene zunanjo aplikacijo in poda podatke stopcev prek " "standardnega vhoda. Vrne standardni izhod aplikacije. Privzeto je Tidy, za " "lep izpis kode HTML. Zaradi varnostnih razlogov morate ročno urediti " -"datoteko libraries/classes/Plugins/Transformations/Output/" -"Text_Plain_External.php in navesti orodja, ki jih želite omogočiti. Prva " -"možnost je številka programa, ki ga želite uporabiti, druga možnost pa so " -"parametri programa. Če tretji parameter nastavite na 1, bo s pomočjo " -"htmlspecialchars() pretvoril izhod (Privzeto 1). Če nastavite četrti " -"parameter na 1, bo preprečil prelamljanje in zagotovil, da se celotni izhod " -"prikaže v eni vrstici (Privzeto 1)." +"datoteko libraries/classes/Plugins/Transformations/Abs/" +"ExternalTransformationsPlugin.php in navesti orodja, ki jih želite " +"omogočiti. Prva možnost je številka programa, ki ga želite uporabiti. Druga " +"možnost naj bo prazna, iz zgodovinskih razlogov. Če tretji parameter " +"nastavite na 1, bo s pomočjo htmlspecialchars() pretvoril izhod (Privzeto 1)" +". Če nastavite četrti parameter na 1, bo preprečil prelamljanje in " +"zagotovil, da se celotni izhod prikaže v eni vrstici (Privzeto 1)." #: libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php:117 #, php-format @@ -10638,6 +10626,9 @@ msgid "" "has been deprecated for security reasons. Add all command line options " "directly to the definition in %s." msgstr "" +"Uporabljate polje za možnosti ukazne vrstice za zunanji ukaz za pretvorbo, " +"ki je iz varnostih razlogov opuščen. Dodajte vse možnosti ukazne vrstice v " +"opredelitev v %s." #: libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php:31 msgid "" @@ -13394,10 +13385,8 @@ msgstr "Neveljavno ime tabele" #. l10n: In case a SQL query did not pass a security check #: tbl_get_field.php:62 -#, fuzzy -#| msgid "There are too many joins without indexes." msgid "There is an issue with your request." -msgstr "Obstaja preveč stikov brez indeksov." +msgstr "Prišlo je do težave z vašo zahtevo." #: tbl_replace.php:266 #, php-format From 22ee68b163081d49f9282c04dea870f26993d55e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 25 Mar 2020 17:30:03 -0300 Subject: [PATCH 4/4] Fix Display\ResultsTest test on Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cherry-picked-from: b2d1615176c7c9533dded6fdd961c987595cb66c Signed-off-by: Maurício Meneghini Fauth --- test/classes/Display/ResultsTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/classes/Display/ResultsTest.php b/test/classes/Display/ResultsTest.php index ec98a37b8b..1a8ea014d0 100644 --- a/test/classes/Display/ResultsTest.php +++ b/test/classes/Display/ResultsTest.php @@ -1578,8 +1578,8 @@ class ResultsTest extends PmaTestCase [], 0, 'binary', - 'class="disableAjax">[BLOB - 4 B]' . PHP_EOL - . '' . PHP_EOL, + 'class="disableAjax">[BLOB - 4 B]' . "\n" + . '' . "\n", ], [ 'noblob',