From ce556fe98b4ee8ee24935e494658401fec829cfa Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani Date: Thu, 14 Jun 2018 13:00:52 +0000 Subject: [PATCH 1/6] Translated using Weblate (Hebrew) Currently translated at 48.7% (1604 of 3288 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 | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/po/he.po b/po/he.po index 0747744d28..0ccf3d2e6d 100644 --- a/po/he.po +++ b/po/he.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-06-12 20:38+0000\n" +"PO-Revision-Date: 2018-06-15 13:38+0000\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \n" @@ -8414,10 +8414,8 @@ msgid "Table %s has been flushed." msgstr "הטבלה %s אופסה." #: libraries/classes/Operations.php:1437 -#, fuzzy -#| msgid "Flush the table (\"FLUSH\")" msgid "Flush the table (FLUSH)" -msgstr "ריקון טבלה (\"FLUSH\")" +msgstr "פינוי הטבלה (FLUSH)" #: libraries/classes/Operations.php:1451 #: templates/database/structure/check_all_tables.twig:22 @@ -8433,10 +8431,8 @@ msgstr "תיקון טבלה" #: libraries/classes/Operations.php:1512 #: templates/database/structure/check_all_tables.twig:14 #: view_operations.php:136 -#, fuzzy -#| msgid "Dumping data for table" msgid "Delete data or table" -msgstr "הוצאת מידע עבור טבלה" +msgstr "מחיקת נתונים או טבלה" #: libraries/classes/Operations.php:1520 msgid "Empty the table (TRUNCATE)" @@ -8453,9 +8449,8 @@ msgstr "" #: libraries/classes/Operations.php:1569 #: templates/table/structure/display_structure.twig:179 -#, fuzzy msgid "Check" -msgstr "צ'יכית" +msgstr "בדיקה" #: libraries/classes/Operations.php:1570 #: templates/table/structure/display_structure.twig:179 @@ -8469,9 +8464,8 @@ msgstr "" #: libraries/classes/Operations.php:1572 #: templates/table/structure/display_structure.twig:179 -#, fuzzy msgid "Repair" -msgstr "תיקון טבלה" +msgstr "תיקון" #: libraries/classes/Operations.php:1573 #: templates/table/structure/display_structure.twig:179 @@ -8479,15 +8473,12 @@ msgid "Truncate" msgstr "" #: libraries/classes/Operations.php:1587 -#, fuzzy -#| msgid "Close" msgid "Coalesce" -msgstr "סגירה" +msgstr "ליכוד" #: libraries/classes/Operations.php:1596 -#, fuzzy msgid "Partition maintenance" -msgstr "אחזקת טבלה" +msgstr "אחזקת מחיצות" #: libraries/classes/Operations.php:1613 #, php-format @@ -8504,35 +8495,32 @@ msgid "Check referential integrity:" msgstr "" #: libraries/classes/Operations.php:2043 -#, fuzzy msgid "Can't move table to same one!" -msgstr "לא ניתן להעתיק טבלה אל אותה אחת!" +msgstr "לא ניתן להעתיק טבלה לאותה אחת!" #: libraries/classes/Operations.php:2045 msgid "Can't copy table to same one!" msgstr "לא ניתן להעתיק טבלה אל אותה אחת!" #: libraries/classes/Operations.php:2069 -#, fuzzy, php-format -#| msgid "Table %s has been moved to %s." +#, php-format msgid "Table %s has been moved to %s. Privileges have been adjusted." -msgstr "הטבלה %s הועברה ל- %s." +msgstr "הטבלה %s הועברה ל־%s. ההרשאות עברו התאמה." #: libraries/classes/Operations.php:2076 -#, fuzzy, php-format -#| msgid "Table %s has been copied to %s." +#, php-format msgid "Table %s has been copied to %s. Privileges have been adjusted." -msgstr "טבלה %s הועתקה אל %s." +msgstr "הטבלה %s הועתקה ל־%s. ההרשאות עברו התאמה." #: libraries/classes/Operations.php:2085 #, php-format msgid "Table %s has been moved to %s." -msgstr "הטבלה %s הועברה ל- %s." +msgstr "הטבלה %s הועברה ל־%s." #: libraries/classes/Operations.php:2089 #, php-format msgid "Table %s has been copied to %s." -msgstr "טבלה %s הועתקה אל %s." +msgstr "הטבלה %s הועתקה ל־%s." #: libraries/classes/Operations.php:2117 msgid "The table name is empty!" From 85bff866d4ffbe9b7a4d4f42a0fa41e83a881d14 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Mon, 11 Jun 2018 00:03:58 +0200 Subject: [PATCH 2/6] Closes #14225 - missing index icon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: #14225 Signed-off-by: William Desportes (cherry picked from commit 5815c1570e32506595040d955f4eed9dbc520f92) Signed-off-by: Maurício Meneghini Fauth --- templates/table/structure/display_structure.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/table/structure/display_structure.twig b/templates/table/structure/display_structure.twig index 54595957d6..873c2be091 100644 --- a/templates/table/structure/display_structure.twig +++ b/templates/table/structure/display_structure.twig @@ -64,7 +64,7 @@ {% endif %} {% if field_name in columns_with_index %} {% set displayed_field_name = displayed_field_name ~ Util_getImage( - 'b_key', 'Index'|trans + 'bd_primary', 'Index'|trans ) %} {% endif %} From 167f6a72230c8fd156b1d5ffa00db1bf4a8de0e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Fri, 15 Jun 2018 15:31:09 -0300 Subject: [PATCH 3/6] Add ChangeLog entry for #14225 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 f07fe7c815..44b829b143 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.8.2 (not yet released) - issue #14370 WHERE 0 causes Fatal error +- issue #14225 Fix missing index icon 4.8.1 (2018-05-24) - issue #12772 Fix case where the central columns attributes don't get filled in From a6b5207a970eaee1c218d1963648359efe556db0 Mon Sep 17 00:00:00 2001 From: Plajer Date: Thu, 14 Jun 2018 20:34:26 +0000 Subject: [PATCH 4/6] Translated using Weblate (Polish) Currently translated at 94.4% (3105 of 3288 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/pl/ Signed-off-by: Plajer --- po/pl.po | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/po/pl.po b/po/pl.po index f9d2bbdd06..d7ad08d18f 100644 --- a/po/pl.po +++ b/po/pl.po @@ -4,17 +4,17 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.8.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" -"PO-Revision-Date: 2018-02-27 21:31+0000\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Polish " -"\n" +"PO-Revision-Date: 2018-06-15 18:33+0000\n" +"Last-Translator: Plajer \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 2.20-dev\n" +"X-Generator: Weblate 3.0.1\n" #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100 msgid "Bad type!" @@ -1880,8 +1880,7 @@ msgstr "Eksport" #: js/messages.php:401 msgid "No routine is exportable. Required privileges may be lacking." msgstr "" -"Nie można eksportować żadnej procedury. Wymagane uprawnienia mogą być " -"niewystarczające." +"Brak procedury eksportowania. Możliwe, że brakuje odpowiednich uprawnień." #: js/messages.php:404 libraries/classes/Rte/Routines.php:760 msgid "ENUM/SET editor" @@ -1997,7 +1996,7 @@ msgstr "Zobacz więcej" #: js/messages.php:434 msgid "Are you sure?" -msgstr "Jesteś pewny?" +msgstr "Czy jesteś pewny?" #: js/messages.php:436 msgid "" @@ -7223,7 +7222,7 @@ msgstr "Serwer nie odpowiada." #: libraries/classes/DatabaseInterface.php:2131 msgid "Logout and try as another user." -msgstr "" +msgstr "Wyloguj się i spróbuj jako inny użytkownik." #: libraries/classes/DatabaseInterface.php:2137 msgid "Please check privileges of directory containing database." @@ -10351,7 +10350,7 @@ msgstr "Zarejestruj się na uwierzytelnianiu" #: libraries/classes/Plugins/TwoFactor/Simple.php:62 msgid "For testing purposes only!" -msgstr "" +msgstr "Tylko do celów testowych!" #: libraries/classes/Plugins/TwoFactorPlugin.php:70 #, fuzzy, php-format @@ -16017,7 +16016,7 @@ msgstr "Brakuje tabel przechowujących konfigurację phpMyAdmin" #: templates/prefs_twofactor.twig:33 msgid "You have enabled two factor authentication." -msgstr "" +msgstr "Aktywowałeś podwójną weryfikację." #: templates/prefs_twofactor.twig:43 templates/prefs_twofactor.twig:54 #: templates/prefs_twofactor_configure.twig:2 From 6acb3a928b7a05eb317570f8c412918543770a74 Mon Sep 17 00:00:00 2001 From: Sebastian Weremczuk Date: Thu, 14 Jun 2018 20:35:28 +0000 Subject: [PATCH 5/6] Translated using Weblate (Polish) Currently translated at 94.4% (3105 of 3288 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/pl/ Signed-off-by: Sebastian Weremczuk --- po/pl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/pl.po b/po/pl.po index d7ad08d18f..7e4d73945f 100644 --- a/po/pl.po +++ b/po/pl.po @@ -5,7 +5,7 @@ msgstr "" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" "PO-Revision-Date: 2018-06-15 18:33+0000\n" -"Last-Translator: Plajer \n" +"Last-Translator: Sebastian Weremczuk \n" "Language-Team: Polish \n" "Language: pl\n" @@ -2077,8 +2077,8 @@ msgid "" "Sit tight! It may take few seconds depending on data size and column count " "of the table." msgstr "" -"Nie ruszać się z miejsca! Może to potrwać kilka sekund w zależności od " -"rozmiaru danych i liczby kolumn w tabeli." +"Poczekaj chwilę! To może zająć chwilę w zależności od wielkości bazy i " +"ilości tabel." #: js/messages.php:465 msgid "Step" From 2baee169f59c7988c4ce63a2e18290b78afc54d4 Mon Sep 17 00:00:00 2001 From: Kuba Niewiarowski Date: Thu, 14 Jun 2018 20:35:56 +0000 Subject: [PATCH 6/6] Translated using Weblate (Polish) Currently translated at 94.4% (3105 of 3288 strings) [CI skip] Translation: phpMyAdmin/4.8 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-8/pl/ Signed-off-by: Kuba Niewiarowski --- po/pl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/pl.po b/po/pl.po index 7e4d73945f..5ccbc99e79 100644 --- a/po/pl.po +++ b/po/pl.po @@ -5,7 +5,7 @@ msgstr "" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2018-02-12 16:30+0100\n" "PO-Revision-Date: 2018-06-15 18:33+0000\n" -"Last-Translator: Sebastian Weremczuk \n" +"Last-Translator: Kuba Niewiarowski \n" "Language-Team: Polish \n" "Language: pl\n" @@ -2086,12 +2086,12 @@ msgstr "Krok" #: js/messages.php:467 msgid "The following actions will be performed:" -msgstr "Zostaną wykonane następujące działania:" +msgstr "Zostaną wykonane następujące operacje:" #: js/messages.php:468 #, php-format msgid "DROP columns %s from the table %s" -msgstr "DROP kolumny %s z tabeli %s" +msgstr "Usuń kolumny %s z tabeli %s (DROP)" #: js/messages.php:469 msgid "Create the following table"