From 46503465cadcb89dd22fa8913d17081d54839bd0 Mon Sep 17 00:00:00 2001 From: tmtisfree Date: Tue, 9 Oct 2018 19:31:31 +0000 Subject: [PATCH 1/4] 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: tmtisfree --- po/fr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index da7a56aad1..8baf031a2f 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-09-24 16:25+0000\n" +"PO-Revision-Date: 2018-10-10 20:26+0000\n" "Last-Translator: tmtisfree \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.2-dev\n" +"X-Generator: Weblate 3.2.1\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1101 msgid "Bad type!" @@ -13220,17 +13220,17 @@ msgstr "Il y a des problèmes avec les index de la table « %s »" #: libraries/classes/SqlQueryForm.php:140 #, php-format msgid "Run SQL query/queries on server “%s”" -msgstr "Exécuter une ou des requêtes SQL sur le serveur “%s”" +msgstr "Exécuter une ou des requêtes SQL sur le serveur « %s »" #: libraries/classes/SqlQueryForm.php:157 #, php-format msgid "Run SQL query/queries on database %s" -msgstr "Exécuter une ou des requêtes SQL sur la base « %s » " +msgstr "Exécuter une ou des requêtes SQL sur la base de données « %s »" #: libraries/classes/SqlQueryForm.php:178 #, php-format msgid "Run SQL query/queries on table %s" -msgstr "Exécuter une ou des requêtes SQL sur la table « %s » " +msgstr "Exécuter une ou des requêtes SQL sur la table « %s »" #: libraries/classes/SqlQueryForm.php:248 setup/frames/index.inc.php:254 #: templates/console/display.twig:7 From c6ae2ec38589ec4755fdde9d51fe4011a962da2e Mon Sep 17 00:00:00 2001 From: yeezy69 Date: Thu, 11 Oct 2018 04:21:49 +0200 Subject: [PATCH 2/4] Update Table.php (#14461) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #14447 - Error while copying database (pma__column_info) Signed-off-by: Daniel (cherry picked from commit aed0fede4dccfe046589fb82a512a55e802e140b) Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php index b0878c1308..976cf31cee 100644 --- a/libraries/classes/Table.php +++ b/libraries/classes/Table.php @@ -1251,7 +1251,7 @@ class Table . ') ' . ' VALUES(' . '\'' . $GLOBALS['dbi']->escapeString($target_db) . '\',\'' . $GLOBALS['dbi']->escapeString($target_table) . '\',\'' . $GLOBALS['dbi']->escapeString($comments_copy_row['column_name']) - . '\',\'' . $GLOBALS['dbi']->escapeString($target_table) . '\',\'' + . '\',\'' . $GLOBALS['dbi']->escapeString($comments_copy_row['comment']) . '\'' . ($GLOBALS['cfgRelation']['mimework'] From a849e8e2fe65eb6c5cc26f3366ac9e0e7e3aaec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 10 Oct 2018 23:32:21 -0300 Subject: [PATCH 3/4] Add ChangeLog entry for #14447 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 d04b40642d..908da3e9e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - issue #13267 Ensure that database names with '.' are handled properly when DisableIS is true - issue #14438 Invisible Icon "Show Full Queries" - issue #14133 CSS issue in Designer +- issue #14447 Error while copying database (pma__column_info) 4.8.3 (2018-08-22) - issue #14314 Error when naming a database '0' From 11b9e5e2ce42b5c60e72306105baadadd7c9876e Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Wed, 10 Oct 2018 13:11:57 +0000 Subject: [PATCH 4/4] Translated using Weblate (Hebrew) Currently translated at 49.4% (1628 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 | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/po/he.po b/po/he.po index 5a490e68a5..d6bf2862ff 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-09-17 16:24+0000\n" +"PO-Revision-Date: 2018-10-11 02:33+0000\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \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-dev\n" +"X-Generator: Weblate 3.2.1\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1101 msgid "Bad type!" @@ -7541,16 +7541,13 @@ msgid "Or" msgstr "או" #: libraries/classes/InsertEdit.php:1501 -#, fuzzy msgid "web server upload directory:" -msgstr "שמירת שרת בתוך תיקיית %s" +msgstr "תיקיית העלאת השירות המקוון:" #: libraries/classes/InsertEdit.php:1706 #: templates/table/search/input_box.twig:39 -#, fuzzy -#| msgid "Insert" msgid "Edit/Insert" -msgstr "הכנסה" +msgstr "עריכה/הוספה" #: libraries/classes/InsertEdit.php:1773 msgid "and then" @@ -7741,16 +7738,12 @@ msgstr "" #: libraries/classes/Menu.php:542 libraries/classes/Util.php:3991 #: templates/database/structure/check_all_tables.twig:32 -#, fuzzy -#| msgid "Add/Delete Field Columns" msgid "Central columns" -msgstr "הוספת/מחיקת עמודות שדה" +msgstr "עמודות מרכזיות" #: libraries/classes/Menu.php:600 -#, fuzzy -#| msgid "User" msgid "User accounts" -msgstr "משתמש" +msgstr "חשבונות משתמשים" #: libraries/classes/Menu.php:627 libraries/classes/Server/Status/Data.php:121 #: libraries/classes/Util.php:3970 templates/server/sub_page_header.twig:2