From 2ec6f25737fb37cc37e237dc4af3b92bf773fc26 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Fri, 26 Oct 2018 10:08:56 +0000 Subject: [PATCH 1/5] Translated using Weblate (Hebrew) Currently translated at 49.6% (1637 of 3294 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/ Signed-off-by: Yaron Shahrabani --- po/he.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/po/he.po b/po/he.po index f17f22cc52..f45c5d5d9c 100644 --- a/po/he.po +++ b/po/he.po @@ -4,8 +4,8 @@ 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-10-26 10:08+0000\n" -"Last-Translator: Natanel \n" +"PO-Revision-Date: 2018-10-27 02:33+0000\n" +"Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \n" "Language: he\n" @@ -6781,11 +6781,11 @@ msgstr "לא ניתן לייצא תוספים, נא לבדוק את ההתקנה #: libraries/classes/Display/GitRevision.php:65 #, php-format msgid "%1$s from %2$s branch" -msgstr "" +msgstr "%1$s מהענף %2$s" #: libraries/classes/Display/GitRevision.php:67 msgid "no branch" -msgstr "" +msgstr "אין ענף" #: libraries/classes/Display/GitRevision.php:73 msgid "Git revision:" @@ -9485,6 +9485,7 @@ msgid "" msgstr "" #: libraries/classes/Plugins/Transformations/Abs/ExternalTransformationsPlugin.php:28 +#, 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 " @@ -9497,15 +9498,15 @@ msgid "" "option, if set to 1, will prevent wrapping and ensure that the output " "appears all on one line (Default 1)." msgstr "" -"Linux בלבד: מפעיל תכנית חיצונית ומזין בה את המידע באמצעות קלט סטנדרטי. מחזיר " -"פלט סטנדרטי מן התכנית. ברירת המחדל הוא פלט נקי, אשר מדפיס \"בצורה יפה\" קוד " -"HTML. בשל סיבות אבטחה, עליך לערוך באופן ידני את הקובץ libraries/classes/" +"לינוקס בלבד: מפעיל תכנית חיצונית ומזין בה את המידע באמצעות קלט סטנדרטי. " +"מחזיר פלט סטנדרטי מן התכנית. בררת המחדל היא פלט נקי, אשר מדפיס \"בצורה יפה\" " +"קוד HTML. בשל סיבות אבטחה, עליך לערוך באופן ידני את הקובץ libraries/classes/" "Plugins/Transformations/Output/Text_Plain_External.php ולמנות ברשימה את " "הכלים שברצונך להפוך לזמינים. האופציה הראשונה היא מספר התוכנה שברצונך לעשות " "שימוש והאפשרות השניה היא פרמטרים עבור התוכנה. האפשרות השלישית, אם ערכה הוא " "1, תמיר את הפלט באמצעות htmlspecialchars (ברירת המחדל היא 1). האופציה " "הרביעית, אם ערכה גם כן שווה ל-1, תמנע כריכת הטקסט ותוודא כי הפלט מוצג כולו " -"בשורה אחת (ברירת המחדל היא 1)." +"בשורה אחת (בררת המחדל היא 1)." #: libraries/classes/Plugins/Transformations/Abs/FormattedTransformationsPlugin.php:28 msgid "" From 0b2f6c7edefd7bdd785f536f96b2fb96b3f328f1 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 28 Oct 2018 14:41:56 +0000 Subject: [PATCH 2/5] 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: William Desportes --- po/fr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index 8baf031a2f..1e6cc71935 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-10-10 20:26+0000\n" -"Last-Translator: tmtisfree \n" +"PO-Revision-Date: 2018-10-29 15:23+0000\n" +"Last-Translator: William Desportes \n" "Language-Team: French \n" "Language: fr\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.2.1\n" +"X-Generator: Weblate 3.3-dev\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1101 msgid "Bad type!" @@ -8442,7 +8442,7 @@ msgstr "Se déconnecter" #: libraries/classes/Navigation/NavigationHeader.php:175 msgid "Empty session data" -msgstr "Données de session vides" +msgstr "Vider les données de session" #: libraries/classes/Navigation/NavigationHeader.php:193 msgid "phpMyAdmin documentation" From fd3dde47a634e23fec7eed09e42fc9c54d858ebc Mon Sep 17 00:00:00 2001 From: Alessandro Dolci Date: Wed, 31 Oct 2018 01:05:33 +0100 Subject: [PATCH 3/5] Fixed condition on the emptiness of enum type criteriaValues array (#14648) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The if condition has a call to the empty function on the criteriaValues array, but in the considered case that array only contains a '0', so this makes it look empty to the function. I added a control on the first element of the array, to avoid this specific situation. It's my first contribution, so I hope I did well with the branches. Let me know if there's something missing or to do, I'm happy to help. Signed-off-by: Alessandro Dolci (cherry picked from commit 3f5fff3f4d474fd9dd67f54ff2366d2a466e0c07) Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Controllers/Table/TableSearchController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/classes/Controllers/Table/TableSearchController.php b/libraries/classes/Controllers/Table/TableSearchController.php index 9b79d46753..248bee0d66 100644 --- a/libraries/classes/Controllers/Table/TableSearchController.php +++ b/libraries/classes/Controllers/Table/TableSearchController.php @@ -1082,8 +1082,7 @@ class TableSearchController extends TableController $where = ''; if ($unaryFlag) { $where = $backquoted_name . ' ' . $func_type; - - } elseif (strncasecmp($types, 'enum', 4) == 0 && ! empty($criteriaValues)) { + } elseif (strncasecmp($types, 'enum', 4) == 0 && (! empty($criteriaValues) || $criteriaValues[0] === '0')) { $where = $backquoted_name; $where .= $this->_getEnumWhereClause($criteriaValues, $func_type); From 77f64df057ae76fc78a090e95c100ffd90dea8e5 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Tue, 30 Oct 2018 06:08:04 +0000 Subject: [PATCH 4/5] Translated using Weblate (Hebrew) Currently translated at 49.9% (1644 of 3294 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/he/ Signed-off-by: Yaron Shahrabani --- po/he.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/po/he.po b/po/he.po index f45c5d5d9c..ad7771ec84 100644 --- a/po/he.po +++ b/po/he.po @@ -4,7 +4,7 @@ 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-10-27 02:33+0000\n" +"PO-Revision-Date: 2018-10-31 00:10+0000\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \n" @@ -6789,17 +6789,17 @@ msgstr "אין ענף" #: libraries/classes/Display/GitRevision.php:73 msgid "Git revision:" -msgstr "" +msgstr "מהדורה ב־Git:" #: libraries/classes/Display/GitRevision.php:76 #, php-format msgid "committed on %1$s by %2$s" -msgstr "הוגש ב־%1$s ע״י %2$s" +msgstr "הוגשה ב־%1$s ע״י %2$s" #: libraries/classes/Display/GitRevision.php:86 #, php-format msgid "authored on %1$s by %2$s" -msgstr "נוצר ב־%1$s ע״י %2$s" +msgstr "נוצרה ב־%1$s ע״י %2$s" #: libraries/classes/Display/Results.php:911 msgid "Save edited data" @@ -6833,11 +6833,11 @@ msgstr "סיום" #: libraries/classes/Display/Results.php:1114 msgid "All" -msgstr "הכל" +msgstr "הכול" #: libraries/classes/Display/Results.php:1414 msgid "Sort by key" -msgstr "" +msgstr "סידור לפי מפתח" #: libraries/classes/Display/Results.php:1727 #: templates/display/results/options_block.twig:14 @@ -6882,7 +6882,7 @@ msgstr "השורה נמחקה." #: libraries/classes/Display/Results.php:4679 #: libraries/classes/Server/Status/Processes.php:279 msgid "Kill" -msgstr "" +msgstr "חיסול" #: libraries/classes/Display/Results.php:4120 msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]." @@ -6896,7 +6896,7 @@ msgstr "מוצגות שורות %1s‏ - %2s" #: libraries/classes/Display/Results.php:4568 #, php-format msgid "%1$d total, %2$d in query" -msgstr "" +msgstr "%1$d סה״כ, %2$d בשאילתה" #: libraries/classes/Display/Results.php:4573 #, php-format @@ -6930,11 +6930,11 @@ msgstr "סימון הכול" #: libraries/classes/Display/Results.php:4866 msgid "Copy to clipboard" -msgstr "" +msgstr "העתקה ללוח הגזירים" #: libraries/classes/Display/Results.php:4917 msgid "Query results operations" -msgstr "" +msgstr "פעולות תוצאות שאילתה" #: libraries/classes/Display/Results.php:5001 #: templates/table/chart/tbl_chart.twig:10 @@ -6943,7 +6943,7 @@ msgstr "הצגת תרשים" #: libraries/classes/Display/Results.php:5023 msgid "Visualize GIS data" -msgstr "" +msgstr "הגשה חזותית של נתוני GIS" #: libraries/classes/Display/Results.php:5206 msgid "Link not found!" @@ -6951,7 +6951,7 @@ msgstr "קישור לא נמצא!" #: libraries/classes/Engines/Bdb.php:28 msgid "Version information" -msgstr "מידע גרסאות" +msgstr "פרטי גרסה" #: libraries/classes/Engines/Innodb.php:29 msgid "Data home directory" @@ -6963,7 +6963,7 @@ msgstr "" #: libraries/classes/Engines/Innodb.php:36 msgid "Data files" -msgstr "קבצי נתונים" +msgstr "קובצי נתונים" #: libraries/classes/Engines/Innodb.php:39 msgid "Autoextend increment" From 894439b0d63109563bae83eb082d8db4befaeb21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Tue, 30 Oct 2018 21:13:08 -0300 Subject: [PATCH 5/5] Add ChangeLog entry for #14630 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [CI skip] Signed-off-by: Maurício Meneghini Fauth --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index a1acfcf14d..4c621a48b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog - issue #14447 Error while copying database (pma__column_info) - issue #14571 "No database selected" - DROP a view - issue #14636 Move operation causes SELECT * FROM `undefined` +- issue #14630 Enum '0' produces incorrect search SQL 4.8.3 (2018-08-22) - issue #14314 Error when naming a database '0'