From b4ee99975d5cbaa424b2614d09068e15f80acb8a Mon Sep 17 00:00:00 2001 From: Petr Duda Date: Tue, 2 Mar 2021 17:11:28 +0000 Subject: [PATCH 01/13] Translated using Weblate (Czech) 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/cs/ Signed-off-by: Petr Duda --- po/cs.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/po/cs.po b/po/cs.po index a5cedae393..c73485b41f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.0.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2020-12-12 17:45+0100\n" -"PO-Revision-Date: 2021-01-05 22:29+0000\n" +"PO-Revision-Date: 2021-03-02 18:02+0000\n" "Last-Translator: Petr Duda \n" "Language-Team: Czech " "\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 4.4.1-dev\n" +"X-Generator: Weblate 4.5\n" #: ajax.php:35 ajax.php:73 export.php:214 libraries/classes/Export.php:1219 msgid "Bad type!" @@ -10996,7 +10996,7 @@ msgstr "Neznámá chyba" #: libraries/classes/ReplicationGui.php:504 #, php-format msgid "Unable to connect to master %s." -msgstr "Nepodařilo se připojit k nadřízenému %s." +msgstr "Nepodařilo se připojit k nadřízenému serveru %s." #: libraries/classes/ReplicationGui.php:515 msgid "" @@ -11007,12 +11007,12 @@ msgstr "" #: libraries/classes/ReplicationGui.php:533 msgid "Unable to change master!" -msgstr "Nepodařilo se změnit nadřízeného!" +msgstr "Nepodařilo se změnit nadřízený server!" #: libraries/classes/ReplicationGui.php:537 #, php-format msgid "Master server changed successfully to %s." -msgstr "Nadřízený server bych úspěšně změněn na %s." +msgstr "Nadřízený server byl úspěšně změněn na %s." #: libraries/classes/Rte/Events.php:173 libraries/classes/Rte/Events.php:182 #: libraries/classes/Rte/Events.php:213 libraries/classes/Rte/Routines.php:294 @@ -12185,7 +12185,7 @@ msgstr "Zobrazit podřízené servery" #: libraries/classes/Server/Status/Data.php:168 #: templates/server/replication/master_replication.twig:8 msgid "Show master status" -msgstr "Zobrazit stav nadřízeného" +msgstr "Zobrazit stav nadřízeného serveru" #: libraries/classes/Server/Status/Data.php:174 msgid "Show slave status" @@ -15053,12 +15053,12 @@ msgstr "Žádná oprávnění k vytváření databází" #: templates/server/replication/index.twig:14 #: templates/server/replication/master_replication.twig:3 msgid "Master replication" -msgstr "Replikace nadřízeného" +msgstr "Replikace nadřízeného serveru" #: templates/server/databases/index.twig:157 #: templates/server/replication/slave_configuration.twig:2 msgid "Slave replication" -msgstr "Replikace podřízeného" +msgstr "Replikace podřízeného serveru" #: templates/server/databases/index.twig:179 #, php-format @@ -15239,7 +15239,7 @@ msgstr "Vytvořit heslo:" #: templates/server/replication/master_configuration.twig:2 msgid "Master configuration" -msgstr "Nastavení nadřízeného" +msgstr "Nastavení nadřízeného serveru" #: templates/server/replication/master_configuration.twig:4 msgid "" @@ -15375,7 +15375,7 @@ msgstr "" #: templates/server/replication/status_table.twig:6 msgid "Master status" -msgstr "Stav nadřízeného" +msgstr "Stav nadřízeného serveru" #: templates/server/replication/status_table.twig:8 msgid "Slave status" From a875e8bd91dd188ab9749cdecdec1350f7fb6ff7 Mon Sep 17 00:00:00 2001 From: Masahiro Fujimoto Date: Sun, 7 Mar 2021 02:30:40 +0000 Subject: [PATCH 02/13] Translated using Weblate (Japanese) 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/ja/ Signed-off-by: Masahiro Fujimoto --- po/ja.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ja.po b/po/ja.po index 7f565dd2c8..04a973b8de 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.0.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2020-12-12 17:45+0100\n" -"PO-Revision-Date: 2021-02-12 17:50+0000\n" +"PO-Revision-Date: 2021-03-08 13:15+0000\n" "Last-Translator: Masahiro Fujimoto \n" "Language-Team: Japanese \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.5-dev\n" +"X-Generator: Weblate 4.5.1\n" #: ajax.php:35 ajax.php:73 export.php:214 libraries/classes/Export.php:1219 msgid "Bad type!" @@ -13410,7 +13410,7 @@ msgstr "入力変換機能" #: templates/columns_definitions/table_fields_definitions.twig:93 msgid "Input transformation options" -msgstr "入力変換機能オプション" +msgstr "入力変換オプション" #: templates/console/bookmark_content.twig:7 templates/console/display.twig:31 #: templates/console/display.twig:84 templates/console/display.twig:175 From 3a8afac3da9044eb3fa957b5443a2f3a7b7eee05 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sat, 6 Mar 2021 18:20:49 +0000 Subject: [PATCH 03/13] 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 | 64 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/po/tr.po b/po/tr.po index 885b5b07c9..ea03721696 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.0.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2020-12-12 17:45+0100\n" -"PO-Revision-Date: 2020-11-08 11:26+0000\n" +"PO-Revision-Date: 2021-03-08 13:16+0000\n" "Last-Translator: Burak Yavuz \n" "Language-Team: Turkish \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 4.3.2\n" +"X-Generator: Weblate 4.5.1\n" #: ajax.php:35 ajax.php:73 export.php:214 libraries/classes/Export.php:1219 msgid "Bad type!" @@ -216,11 +216,11 @@ msgstr "" #: import.php:396 import.php:602 msgid "Showing bookmark" -msgstr "Gösterilen yer imi" +msgstr "Gösterilen yer işareti" #: import.php:417 import.php:598 msgid "The bookmark has been deleted." -msgstr "Yer imi silindi." +msgstr "Yer işareti silindi." #: import.php:510 msgid "" @@ -239,7 +239,7 @@ msgstr "İçe aktarma eklentileri yüklenemedi, lütfen kurulumunuzu denetleyin! #: import.php:605 libraries/classes/Sql.php:709 libraries/classes/Sql.php:1537 #, php-format msgid "Bookmark %s has been created." -msgstr "Yer imi %s oluşturuldu." +msgstr "Yer işareti %s oluşturuldu." #: import.php:615 #, php-format @@ -2227,7 +2227,7 @@ msgstr "Bu sorgu tekrar çalıştırılsın mı?" #: js/messages.php:738 msgid "Do you really want to delete this bookmark?" -msgstr "Bu yer imini silmek istediğinize emin misiniz?" +msgstr "Bu yer işaretini silmek istediğinize emin misiniz?" #: js/messages.php:740 msgid "Some error occurred while getting SQL debug info." @@ -4923,12 +4923,12 @@ msgid "" "Leave blank for no [doc@bookmarks@]bookmark[/doc] support, suggested: " "[kbd]pma__bookmark[/kbd]" msgstr "" -"[doc@bookmarks@]Yer imi[/doc] desteği olmaması için boş bırakın, önerilen: " -"[kbd]pma__bookmark[/kbd]" +"[doc@bookmarks@]Yer işareti[/doc] desteği olmaması için boş bırakın, " +"önerilen: [kbd]pma__bookmark[/kbd]" #: libraries/classes/Config/Descriptions.php:614 msgid "Bookmark table" -msgstr "Yer imi tablosu" +msgstr "Yer işareti tablosu" #: libraries/classes/Config/Descriptions.php:616 msgid "" @@ -5127,8 +5127,8 @@ msgid "" "tables]pmadb[/doc] for complete information. Leave blank for no support. " "Suggested: [kbd]phpmyadmin[/kbd]." msgstr "" -"İlişkiler, yer imleri ve PDF özellikleri için kullanılan veritabanı. Tam " -"bilgi için [doc@linked-tables]pmadb[/doc]'ye bakın. Destek istenmiyorsa boş " +"İlişkiler, yer işaretleri ve PDF özellikleri için kullanılan veritabanı. Tam " +"bilgi için [doc@linked-tables]pmadb[/doc]'ye bakın. Destek olmaması için boş " "bırakın. Önerilen: [kbd]phpmyadmin[/kbd]." #: libraries/classes/Config/Descriptions.php:689 @@ -6271,12 +6271,12 @@ msgstr "Yanlış IP adresi: %s" #, php-format msgid "Showing %1$d bookmark (both private and shared)" msgid_plural "Showing %1$d bookmarks (both private and shared)" -msgstr[0] "%1$d yer imi gösteriliyor (hem özel hem de paylaşılan)" -msgstr[1] "%1$d yer imi gösteriliyor (hem özel hem de paylaşılan)" +msgstr[0] "%1$d yer işareti gösteriliyor (hem özel hem de paylaşılan)" +msgstr[1] "%1$d yer işareti gösteriliyor (hem özel hem de paylaşılan)" #: libraries/classes/Console.php:109 msgid "No bookmarks" -msgstr "Yer imleri yok" +msgstr "Yer işaretleri yok" #: libraries/classes/Console.php:143 msgid "SQL Query Console" @@ -7683,23 +7683,23 @@ msgstr "Sorguyu Gönder" #: libraries/classes/Database/Qbe.php:1843 msgid "Saved bookmarked search:" -msgstr "Kaydedilen işaretli arama:" +msgstr "Kaydedilen yer işaretli arama:" #: libraries/classes/Database/Qbe.php:1845 msgid "New bookmark" -msgstr "Yeni yer imi" +msgstr "Yeni yer işareti" #: libraries/classes/Database/Qbe.php:1871 msgid "Create bookmark" -msgstr "Yer imi oluştur" +msgstr "Yer işareti oluştur" #: libraries/classes/Database/Qbe.php:1874 msgid "Update bookmark" -msgstr "Yer imini güncelle" +msgstr "Yer işaretini güncelle" #: libraries/classes/Database/Qbe.php:1876 msgid "Delete bookmark" -msgstr "Yer imini sil" +msgstr "Yer işaretini sil" #: libraries/classes/Database/Search.php:109 msgid "at least one of the words" @@ -10940,7 +10940,7 @@ msgstr "" #: libraries/classes/Relation.php:241 libraries/classes/SqlQueryForm.php:415 msgid "Bookmarked SQL query" -msgstr "İşaretlenmiş SQL sorgusu" +msgstr "Yer işaretli SQL sorgusu" #: libraries/classes/Relation.php:252 msgid "SQL history" @@ -11553,11 +11553,11 @@ msgstr "Görüntülemek için olaylar yok." #: libraries/classes/SavedSearches.php:265 msgid "Please provide a name for this bookmarked search." -msgstr "Lütfen bu işaretli arama için bir isim verin." +msgstr "Lütfen bu yer işaretli arama için bir ad verin." #: libraries/classes/SavedSearches.php:280 msgid "Missing information to save the bookmarked search." -msgstr "İşaretli aramayı kaydetmek için eksik bilgi." +msgstr "Yer işaretli aramayı kaydetmek için eksik bilgi." #: libraries/classes/SavedSearches.php:302 #: libraries/classes/SavedSearches.php:339 @@ -12391,12 +12391,12 @@ msgstr "Daha yeni sağlam sürüm mevcut değil" #: libraries/classes/Sql.php:713 msgid "Bookmark not created!" -msgstr "Yer imi oluşturulmadı!" +msgstr "Yer işareti oluşturulmadı!" #: libraries/classes/Sql.php:832 #, php-format msgid "Using bookmark \"%s\" as default browse query." -msgstr "Varsayılan gözatma sorgusu olarak \"%s\" yer imi kullanılıyor." +msgstr "Varsayılan gözatma sorgusu olarak \"%s\" yer işareti kullanılıyor." #: libraries/classes/Sql.php:1340 msgid "Showing as PHP code" @@ -12455,15 +12455,15 @@ msgstr "Parametreleri bağla" #: libraries/classes/SqlQueryForm.php:324 msgid "Bookmark this SQL query:" -msgstr "Bu SQL sorgusunu işaretle:" +msgstr "Bu SQL sorgusunun yerini işaretle:" #: libraries/classes/SqlQueryForm.php:332 templates/sql/bookmark.twig:22 msgid "Let every user access this bookmark" -msgstr "Her kullanıcının bu yer imine erişmesine izin ver" +msgstr "Her kullanıcının bu yer işaretine erişmesine izin ver" #: libraries/classes/SqlQueryForm.php:338 msgid "Replace existing bookmark of same name" -msgstr "Aynı ismin mevcut yer imini değiştir" +msgstr "Aynı adlı varolan yer işaretini değiştir" #: libraries/classes/SqlQueryForm.php:352 msgid "Delimiter" @@ -13671,7 +13671,7 @@ msgstr "Geçmiş" #: templates/console/display.twig:11 templates/console/display.twig:99 msgid "Bookmarks" -msgstr "Yer imleri" +msgstr "Yer işaretleri" #: templates/console/display.twig:20 msgid "Press Ctrl+Enter to execute query" @@ -13687,7 +13687,7 @@ msgstr "Açıkla" #: templates/console/display.twig:40 templates/console/display.twig:184 msgid "Bookmark" -msgstr "Yer imi" +msgstr "Yer işareti" #: templates/console/display.twig:40 templates/console/display.twig:184 msgid "Query failed" @@ -13744,7 +13744,7 @@ msgstr "İzi gizle" #: templates/console/display.twig:112 msgid "Add bookmark" -msgstr "Yer imi ekle" +msgstr "Yer işareti ekle" #: templates/console/display.twig:121 msgid "Label" @@ -13756,7 +13756,7 @@ msgstr "Hedef veritabanı" #: templates/console/display.twig:127 msgid "Share this bookmark" -msgstr "Bu yer imini paylaş" +msgstr "Bu yer işaretini paylaş" #: templates/console/display.twig:140 msgid "Set default" @@ -15983,7 +15983,7 @@ msgstr "Yeni sunucu ekle" #: templates/sql/bookmark.twig:11 templates/sql/bookmark.twig:29 msgid "Bookmark this SQL query" -msgstr "Bu SQL sorgusunu işaretle" +msgstr "Bu SQL sorgusu yerini işaretle" #: templates/sql/bookmark.twig:15 msgid "Label:" From 822495ae6fd4baa89ecbf128812bfb092fb744ba Mon Sep 17 00:00:00 2001 From: HelaBasa Date: Thu, 11 Mar 2021 06:30:54 +0000 Subject: [PATCH 04/13] Translated using Weblate (Sinhala) Currently translated at 55.6% (1854 of 3334 strings) [CI skip] Translation: phpMyAdmin/5.0 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/si/ Signed-off-by: HelaBasa --- po/si.po | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/po/si.po b/po/si.po index 53eee4bc22..390cb33e35 100644 --- a/po/si.po +++ b/po/si.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.0.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2020-12-12 17:45+0100\n" -"PO-Revision-Date: 2021-01-22 03:17+0000\n" -"Last-Translator: William Desportes \n" +"PO-Revision-Date: 2021-03-12 07:02+0000\n" +"Last-Translator: HelaBasa \n" "Language-Team: Sinhala \n" "Language: si\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 4.5-dev\n" +"X-Generator: Weblate 4.5.2-dev\n" #: ajax.php:35 ajax.php:73 export.php:214 libraries/classes/Export.php:1219 msgid "Bad type!" @@ -427,10 +427,8 @@ msgid "" msgstr "" #: js/messages.php:116 -#, fuzzy -#| msgid "Save as file" msgid "Save & close" -msgstr "ගොනුවක් ලෙස තෝරන්න" +msgstr "සුරකින්න සහ වසන්න" #: js/messages.php:117 libraries/classes/InsertEdit.php:1929 #: templates/config/form_display/fieldset_bottom.twig:9 @@ -456,10 +454,8 @@ msgid "Select at least one of the options!" msgstr "අවම වශයෙන් එක් වචනයක්වත්" #: js/messages.php:123 -#, fuzzy -#| msgid "Not a valid port number" msgid "Please enter a valid number!" -msgstr "වලංගු පොර්ට් අංකයක් නොවේ" +msgstr "වලංගු අංකයක් යොදන්න" #: js/messages.php:124 #, fuzzy From 16b193b923587623e1e5d90ea6cea9130f5b57c9 Mon Sep 17 00:00:00 2001 From: popcorner Date: Wed, 10 Mar 2021 18:16:37 +0000 Subject: [PATCH 05/13] Translated using Weblate (Chinese (Simplified)) 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/zh_Hans/ Signed-off-by: popcorner --- po/zh_CN.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index c0e49ac0d7..417224a4f1 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.0.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2020-12-12 17:45+0100\n" -"PO-Revision-Date: 2021-02-24 01:28+0000\n" +"PO-Revision-Date: 2021-03-12 07:02+0000\n" "Last-Translator: popcorner \n" "Language-Team: Chinese (Simplified) \n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.5\n" +"X-Generator: Weblate 4.5.2-dev\n" #: ajax.php:35 ajax.php:73 export.php:214 libraries/classes/Export.php:1219 msgid "Bad type!" @@ -2055,7 +2055,7 @@ msgstr "没有在历史记录中找到所请求的页面，页面可能已过期 msgid "" "A newer version of phpMyAdmin is available and you should consider " "upgrading. The newest version is %s, released on %s." -msgstr "phpMyAdmin 有新版本了，请您考虑升级。最新的版本是 %s，于 %s 发布。" +msgstr "phpMyAdmin 的新版本已出，您应当考虑升级了。最新的版本是 %s，于 %s 发布。" #. l10n: Latest available phpMyAdmin version #: js/messages.php:683 @@ -2064,7 +2064,7 @@ msgstr "，最新稳定版本：" #: js/messages.php:684 msgid "up to date" -msgstr "已更新" +msgstr "已是最新" #: js/messages.php:686 libraries/classes/Display/Results.php:4802 #: templates/view_create.twig:11 @@ -11781,7 +11781,7 @@ msgstr "" #: libraries/classes/Setup/Index.php:193 msgid "No newer stable version is available" -msgstr "没有更新的可用版本" +msgstr "没有新的稳定版本可用" #: libraries/classes/Sql.php:713 msgid "Bookmark not created!" From 937062912ff8701ba66fe387c7492ff152211af6 Mon Sep 17 00:00:00 2001 From: Kristijan Fremen Velkovski Date: Fri, 19 Mar 2021 08:51:25 +0000 Subject: [PATCH 06/13] Translated using Weblate (Macedonian) Currently translated at 15.0% (502 of 3334 strings) [CI skip] Translation: phpMyAdmin/5.0 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/mk/ Signed-off-by: Kristijan Fremen Velkovski --- po/mk.po | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/po/mk.po b/po/mk.po index be35aea113..5be4de7555 100644 --- a/po/mk.po +++ b/po/mk.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 5.0.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2020-12-12 17:45+0100\n" -"PO-Revision-Date: 2016-11-17 19:24+0000\n" -"Last-Translator: Nebojsa Tausanov \n" +"PO-Revision-Date: 2021-03-20 09:18+0000\n" +"Last-Translator: Kristijan Fremen Velkovski \n" "Language-Team: Macedonian \n" +"5-0/mk/>\n" "Language: mk\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%10==1 ? 0 : 1;\n" -"X-Generator: Weblate 2.10-dev\n" +"X-Generator: Weblate 4.5.2-dev\n" #: ajax.php:35 ajax.php:73 export.php:214 libraries/classes/Export.php:1219 msgid "Bad type!" @@ -17557,11 +17557,12 @@ msgstr "Базата на податоци не постои" #: libraries/advisory_rules_generic.txt:49 msgid "Uptime below one day" -msgstr "" +msgstr "Работно време под еден ден" #: libraries/advisory_rules_generic.txt:52 msgid "Uptime is less than 1 day, performance tuning may not be accurate." msgstr "" +"Работно време под еден ден, тунирање на перформанса може да не биде точно." #: libraries/advisory_rules_generic.txt:53 msgid "" @@ -17572,7 +17573,7 @@ msgstr "" #: libraries/advisory_rules_generic.txt:54 #, php-format msgid "The uptime is only %s" -msgstr "" +msgstr "Работно време е само %s" #: libraries/advisory_rules_generic.txt:56 #, fuzzy @@ -17584,6 +17585,8 @@ msgid "" "Fewer than 1,000 questions have been run against this server. The " "recommendations may not be accurate." msgstr "" +"Помалку од 1000 обработки на податоци се поднесни на овој сервер. Овие " +"препорачувања може да не се точни." #: libraries/advisory_rules_generic.txt:60 msgid "" From c2618d0998ec48dbae7b557eacfc8e527965218d Mon Sep 17 00:00:00 2001 From: Oleg Andreyev Date: Sat, 20 Mar 2021 19:21:41 +0200 Subject: [PATCH 07/13] added 8.1 and experimental=true Signed-off-by: Oleg Andreyev --- .github/workflows/tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d45ee20c18..2ebfebdfaf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,10 +13,14 @@ jobs: name: Test on php ${{ matrix.php-version }} and ${{ matrix.os }} if: "!contains(github.event.head_commit.message, '[ci skip]')" runs-on: ${{ matrix.os }} + continue-on-error: ${{ matrix.experimental }} strategy: matrix: php-version: ["7.1", "7.2", "7.3", "7.4", "8.0"] + experimental: [false] os: [ubuntu-latest] + include: + - { php-version: '8.1', dependencies: '--ignore-platform-req=php', experimental: true, os: ubuntu-latest } steps: - uses: actions/checkout@v2 - name: Install gettext From 8a4c87f19c584e5401f0eae0d87ce1917857b8f8 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sat, 20 Mar 2021 19:45:17 +0100 Subject: [PATCH 08/13] Add "composer-options" matrix option to the composer install command Signed-off-by: William Desportes --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2ebfebdfaf..3400c8c82c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,7 +20,7 @@ jobs: experimental: [false] os: [ubuntu-latest] include: - - { php-version: '8.1', dependencies: '--ignore-platform-req=php', experimental: true, os: ubuntu-latest } + - { php-version: '8.1', composer-options: '--ignore-platform-req=php', experimental: true, os: ubuntu-latest } steps: - uses: actions/checkout@v2 - name: Install gettext @@ -39,7 +39,7 @@ jobs: path: ~/.composer/cache/ key: composer-cache - name: Install dependencies - run: composer install --no-interaction + run: composer install --no-interaction ${{ matrix.composer-options }} - name: Run php tests run: composer run phpunit -- --exclude-group selenium - name: Send coverage From 33ba47229a8bbfb9b343e509a8b96f954161a1db Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sat, 20 Mar 2021 20:46:59 +0100 Subject: [PATCH 09/13] Fix #14555 - JavaScript error when auto completion is open (upgrade CodeMirror to 5.60.0) Closes: https://github.com/codemirror/CodeMirror/issues/6174 Fixes: #14555 --- js/vendor/codemirror/addon/hint/show-hint.js | 2 +- js/vendor/codemirror/lib/codemirror.css | 2 +- js/vendor/codemirror/lib/codemirror.js | 17 +++++++++-------- .../codemirror/mode/javascript/javascript.js | 7 ++++--- package.json | 2 +- yarn.lock | 10 +++++----- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/js/vendor/codemirror/addon/hint/show-hint.js b/js/vendor/codemirror/addon/hint/show-hint.js index a9f2ded18c..bfe7d3a353 100644 --- a/js/vendor/codemirror/addon/hint/show-hint.js +++ b/js/vendor/codemirror/addon/hint/show-hint.js @@ -360,7 +360,7 @@ close: function() { if (this.completion.widget != this) return; this.completion.widget = null; - this.hints.parentNode.removeChild(this.hints); + if (this.hints.parentNode) this.hints.parentNode.removeChild(this.hints); this.completion.cm.removeKeyMap(this.keyMap); var cm = this.completion.cm; diff --git a/js/vendor/codemirror/lib/codemirror.css b/js/vendor/codemirror/lib/codemirror.css index 5ea2d2be2a..a64f97c777 100644 --- a/js/vendor/codemirror/lib/codemirror.css +++ b/js/vendor/codemirror/lib/codemirror.css @@ -19,7 +19,7 @@ } .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler { - background-color: transparent; /* The little square between H and V scrollbars */ + background-color: white; /* The little square between H and V scrollbars */ } /* GUTTER */ diff --git a/js/vendor/codemirror/lib/codemirror.js b/js/vendor/codemirror/lib/codemirror.js index 9aa6da5df5..055963b048 100644 --- a/js/vendor/codemirror/lib/codemirror.js +++ b/js/vendor/codemirror/lib/codemirror.js @@ -4798,19 +4798,19 @@ }); } - function History(startGen) { + function History(prev) { // Arrays of change events and selections. Doing something adds an // event to done and clears undo. Undoing moves events from done // to undone, redoing moves them in the other direction. this.done = []; this.undone = []; - this.undoDepth = Infinity; + this.undoDepth = prev ? prev.undoDepth : Infinity; // Used to track when changes can be merged into a single undo // event this.lastModTime = this.lastSelTime = 0; this.lastOp = this.lastSelOp = null; this.lastOrigin = this.lastSelOrigin = null; // Used by the isClean() method - this.generation = this.maxGeneration = startGen || 1; + this.generation = this.maxGeneration = prev ? prev.maxGeneration : 1; } // Create a history change event from an updateDoc-style change @@ -6181,7 +6181,7 @@ var out = []; for (var i = 0; i < ranges.length; i++) { out[i] = new Range(clipPos(this, ranges[i].anchor), - clipPos(this, ranges[i].head)); } + clipPos(this, ranges[i].head || ranges[i].anchor)); } if (primary == null) { primary = Math.min(ranges.length - 1, this.sel.primIndex); } setSelection(this, normalizeSelection(this.cm, out, primary), options); }), @@ -6244,7 +6244,7 @@ clearHistory: function() { var this$1 = this; - this.history = new History(this.history.maxGeneration); + this.history = new History(this.history); linkedDocs(this, function (doc) { return doc.history = this$1.history; }, true); }, @@ -6265,7 +6265,7 @@ undone: copyHistoryArray(this.history.undone)} }, setHistory: function(histData) { - var hist = this.history = new History(this.history.maxGeneration); + var hist = this.history = new History(this.history); hist.done = copyHistoryArray(histData.done.slice(0), null, true); hist.undone = copyHistoryArray(histData.undone.slice(0), null, true); }, @@ -7708,7 +7708,7 @@ for (var i = newBreaks.length - 1; i >= 0; i--) { replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length)); } }); - option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b-\u200c\u200e\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, function (cm, val, old) { + option("specialChars", /[\u0000-\u001f\u007f-\u009f\u00ad\u061c\u200b\u200e\u200f\u2028\u2029\ufeff\ufff9-\ufffc]/g, function (cm, val, old) { cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g"); if (old != Init) { cm.refresh(); } }); @@ -8766,6 +8766,7 @@ var input = this, cm = input.cm; var div = input.div = display.lineDiv; + div.contentEditable = true; disableBrowserMagic(div, cm.options.spellcheck, cm.options.autocorrect, cm.options.autocapitalize); function belongsToInput(e) { @@ -9793,7 +9794,7 @@ addLegacyProps(CodeMirror); - CodeMirror.version = "5.59.2"; + CodeMirror.version = "5.60.0"; return CodeMirror; diff --git a/js/vendor/codemirror/mode/javascript/javascript.js b/js/vendor/codemirror/mode/javascript/javascript.js index 047395622e..a42f23d07f 100644 --- a/js/vendor/codemirror/mode/javascript/javascript.js +++ b/js/vendor/codemirror/mode/javascript/javascript.js @@ -218,7 +218,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) { // Parser - var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true, "this": true, "jsonld-keyword": true}; + var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, + "regexp": true, "this": true, "import": true, "jsonld-keyword": true}; function JSLexical(indented, column, type, align, prev, info) { this.indented = indented; @@ -441,7 +442,6 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) { if (type == "{") return contCommasep(objprop, "}", null, maybeop); if (type == "quasi") return pass(quasi, maybeop); if (type == "new") return cont(maybeTarget(noComma)); - if (type == "import") return cont(expression); return cont(); } function maybeexpression(type) { @@ -605,7 +605,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) { } } function typeexpr(type, value) { - if (value == "keyof" || value == "typeof" || value == "infer") { + if (value == "keyof" || value == "typeof" || value == "infer" || value == "readonly") { cx.marked = "keyword" return cont(value == "typeof" ? expressionNoComma : typeexpr) } @@ -802,6 +802,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) { function afterImport(type) { if (type == "string") return cont(); if (type == "(") return pass(expression); + if (type == ".") return pass(maybeoperatorComma); return pass(importSpec, maybeMoreImports, maybeFrom); } function importSpec(type, value) { diff --git a/package.json b/package.json index d0fd050e95..c1fd818e7a 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@babel/preset-env": "^7.12.11", "blueimp-md5": "^2.18.0", "bootstrap": "4.5.3", - "codemirror": "5.59.2", + "codemirror": "5.60.0", "jquery": "3.5.1", "jquery-debounce-throttle": "^1.0.6-rc.0", "jquery-fullscreen-plugin": "^1.1.5", diff --git a/yarn.lock b/yarn.lock index 47c81b2021..8f8785cdc3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1256,7 +1256,7 @@ terminal-link "^2.0.0" v8-to-istanbul "^7.0.0" optionalDependencies: - node-notifier "^8.0.1" + node-notifier "^8.0.0" "@jest/source-map@^26.6.2": version "26.6.2" @@ -2192,10 +2192,10 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= -codemirror@5.59.2: - version "5.59.2" - resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.59.2.tgz#ee674d3a4a8d241af38d52afc482625ba7393922" - integrity sha512-/D5PcsKyzthtSy2NNKCyJi3b+htRkoKv3idswR/tR6UAvMNKA7SrmyZy6fOONJxSRs1JlUWEDAbxqfdArbK8iA== +codemirror@5.60.0: + version "5.60.0" + resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.60.0.tgz#00a8cfd287d5d8737ceb73987f04aee2fe5860da" + integrity sha512-AEL7LhFOlxPlCL8IdTcJDblJm8yrAGib7I+DErJPdZd4l6imx8IMgKK3RblVgBQqz3TZJR4oknQ03bz+uNjBYA== collect-v8-coverage@^1.0.0: version "1.0.1" From f92fe2f5b924e33942b8499fc88171c93d8bc236 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sat, 20 Mar 2021 20:48:06 +0100 Subject: [PATCH 10/13] Add a ChangeLog entry for #14555 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index ed12c1fe6e..5cfa4c859f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ phpMyAdmin - ChangeLog - issue Fixed a PHP notice "Undefined index: pred_username" - issue #16744 Fixed "Uncaught TypeError: XMLWriter::writeAttribute()" on Designer SVG export - issue Fixed an PHP undefined index notice on export +- issue #14555 Fixed JavaScript error when auto completion is open (upgraded CodeMirror to 5.60.0) 5.1.0 (2021-02-24) - issue #15350 Change Media (MIME) type references to Media type From fa8eaa0248d5441da2f50a3bb05d16faad2a991f Mon Sep 17 00:00:00 2001 From: Simon Picot Date: Sat, 20 Mar 2021 14:12:30 +0000 Subject: [PATCH 11/13] Translated using Weblate (French) Currently translated at 100.0% (3379 of 3379 strings) [ci skip] Translation: phpMyAdmin/5.1 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-1/fr/ Signed-off-by: Simon Picot --- po/fr.po | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/po/fr.po b/po/fr.po index 9d9873ca86..5a1170bb99 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: 2021-03-06 15:47+0100\n" -"PO-Revision-Date: 2021-03-08 13:15+0000\n" -"Last-Translator: William Desportes \n" +"PO-Revision-Date: 2021-03-21 14:29+0000\n" +"Last-Translator: Simon Picot \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 4.5.1\n" +"X-Generator: Weblate 4.5.2-dev\n" #: libraries/advisory_rules_generic.php:9 msgid "Uptime below one day" @@ -2377,8 +2377,8 @@ msgid "" "An alternate host to hold the configuration storage; leave blank to use the " "already defined host." msgstr "" -"Un serveur alternatif pour le stockage des configurations; laisser vide pour " -"utiliser le serveur déjà défini." +"Un serveur alternatif pour le stockage des configurations ; laisser vide " +"pour utiliser le serveur déjà défini." #: libraries/classes/Config/Descriptions.php:362 msgid "" @@ -2556,7 +2556,7 @@ msgid "" "Leave blank for no SQL query tracking support, suggested: " "[kbd]pma__tracking[/kbd]." msgstr "" -"Laisser vide pour désactiver le suivi des changements SQL; suggestion : " +"Laisser vide pour désactiver le suivi des changements SQL ; suggestion : " "[kbd]pma__tracking[/kbd]." #: libraries/classes/Config/Descriptions.php:451 @@ -5398,7 +5398,7 @@ msgid "" "weakness by changing the password for controluser 'pma'." msgstr "" "Votre serveur est lancé avec les valeurs par défaut pour le controluser et " -"le mot de passe (controlpass) et est ouvert aux intrusions; vous devriez " +"le mot de passe (controlpass) et est ouvert aux intrusions ; vous devriez " "vraiment corriger cette faiblesse de sécurité en changeant le mot de passe " "pour controluser 'pma'." @@ -10685,7 +10685,7 @@ msgid "" "Do you have any column which can be split into more than one column? For " "example: address can be split into street, city, country and zip." msgstr "" -"Y-a-t-il une colonne qui peut être scindée en plusieurs colonnes? Par " +"Y-a-t-il une colonne qui peut être scindée en plusieurs colonnes ? Par " "exemple : l'adresse peut être divisée en rue, ville, pays et code postal." #: libraries/classes/Normalization.php:241 @@ -10748,7 +10748,7 @@ msgid "" "first_name and last_name gives full_name which is redundant." msgstr "" "Y-a-t-il un groupe de colonnes qui, lorsque combinées, correspond à une " -"colonne existante? Par exemple, avec prénom, nom et nom_complet et en " +"colonne existante ? Par exemple, avec prénom, nom et nom_complet et en " "combinant prénom et nom on obtient nom_complet qui est redondant." #: libraries/classes/Normalization.php:341 @@ -11407,7 +11407,7 @@ msgstr "Généré le :" #: libraries/classes/Plugins/Export/ExportXml.php:258 #: templates/home/index.twig:129 msgid "Server version:" -msgstr "Version du serveur : " +msgstr "Version du serveur :" #: libraries/classes/Plugins/Export/ExportLatex.php:223 #: libraries/classes/Plugins/Export/ExportSql.php:762 @@ -12173,10 +12173,10 @@ msgid "" "option is the string to append and/or prepend when truncation occurs " "(Default: \"…\")." msgstr "" -"N'affiche qu'une partie du champ. En première option, la position de départ " -"(par défaut, 0). En seconde option, le nombre de caractères à afficher (par " +"N'affiche qu'une partie du champ. En première option, la position de départ (" +"par défaut, 0). En seconde option, le nombre de caractères à afficher (par " "défaut, le reste). En troisième option, des caractères à afficher à la fin " -"du texte (par défaut: « … »)." +"du texte (par défaut : « … »)." #: libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php:28 msgid "" @@ -15779,11 +15779,11 @@ msgstr "SRID :" #: templates/gis_data_editor_form.twig:53 #, php-format msgid "Geometry %d:" -msgstr "Géométrie %d : " +msgstr "Géométrie %d :" #: templates/gis_data_editor_form.twig:73 msgid "Point:" -msgstr "Point : " +msgstr "Point :" #: templates/gis_data_editor_form.twig:93 #: templates/gis_data_editor_form.twig:134 @@ -15795,18 +15795,18 @@ msgstr "Point %d :" #: templates/gis_data_editor_form.twig:113 #, php-format msgid "Linestring %d:" -msgstr "Ligne %d : " +msgstr "Ligne %d :" #: templates/gis_data_editor_form.twig:115 #: templates/gis_data_editor_form.twig:170 msgid "Outer ring:" -msgstr "Anneau extérieur : " +msgstr "Anneau extérieur :" #: templates/gis_data_editor_form.twig:117 #: templates/gis_data_editor_form.twig:172 #, php-format msgid "Inner ring %d:" -msgstr "Anneau intérieur %d : " +msgstr "Anneau intérieur %d :" #: templates/gis_data_editor_form.twig:144 msgid "Add a linestring" @@ -15815,7 +15815,7 @@ msgstr "Ajouter une ligne" #: templates/gis_data_editor_form.twig:157 #, php-format msgid "Polygon %d:" -msgstr "Polygone %d : " +msgstr "Polygone %d :" #: templates/gis_data_editor_form.twig:199 msgid "Add a polygon" @@ -15902,11 +15902,11 @@ msgstr "Serveur de base de données" #: templates/home/index.twig:117 templates/login/form.twig:37 #: templates/menu/breadcrumbs.twig:7 msgid "Server:" -msgstr "Serveur : " +msgstr "Serveur :" #: templates/home/index.twig:121 msgid "Server type:" -msgstr "Type de serveur : " +msgstr "Type de serveur :" #: templates/home/index.twig:125 msgid "Server connection:" @@ -15914,7 +15914,7 @@ msgstr "Connexion au serveur :" #: templates/home/index.twig:133 msgid "Protocol version:" -msgstr "Version du protocole : " +msgstr "Version du protocole :" #: templates/home/index.twig:137 msgid "User:" From b8678feb40fa4aa3bc4ea2463ac7ce10e264a03f Mon Sep 17 00:00:00 2001 From: Simon Picot Date: Sat, 20 Mar 2021 14:12:30 +0000 Subject: [PATCH 12/13] 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: Simon Picot --- po/fr.po | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/po/fr.po b/po/fr.po index c69c9e5b38..9c4c94139a 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: 2020-12-12 17:45+0100\n" -"PO-Revision-Date: 2021-01-14 11:32+0000\n" -"Last-Translator: Deleted User \n" +"PO-Revision-Date: 2021-03-21 14:29+0000\n" +"Last-Translator: Simon Picot \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 4.4.1-dev\n" +"X-Generator: Weblate 4.5.2-dev\n" #: ajax.php:35 ajax.php:73 export.php:214 libraries/classes/Export.php:1219 msgid "Bad type!" @@ -5018,8 +5018,8 @@ msgid "" "An alternate host to hold the configuration storage; leave blank to use the " "already defined host." msgstr "" -"Un serveur alternatif pour le stockage des configurations; laisser vide pour " -"utiliser le serveur déjà défini." +"Un serveur alternatif pour le stockage des configurations ; laisser vide " +"pour utiliser le serveur déjà défini." #: libraries/classes/Config/Descriptions.php:632 msgid "Control host" @@ -5349,7 +5349,7 @@ msgid "" "Leave blank for no SQL query tracking support, suggested: " "[kbd]pma__tracking[/kbd]." msgstr "" -"Laisser vide pour désactiver le suivi des changements SQL; suggestion : " +"Laisser vide pour désactiver le suivi des changements SQL ; suggestion : " "[kbd]pma__tracking[/kbd]." #: libraries/classes/Config/Descriptions.php:751 @@ -6461,7 +6461,7 @@ msgid "" "weakness by changing the password for controluser 'pma'." msgstr "" "Votre serveur est lancé avec les valeurs par défaut pour le controluser et " -"le mot de passe (controlpass) et est ouvert aux intrusions; vous devriez " +"le mot de passe (controlpass) et est ouvert aux intrusions ; vous devriez " "vraiment corriger cette faiblesse de sécurité en changeant le mot de passe " "pour controluser 'pma'." @@ -9237,7 +9237,7 @@ msgid "" "Do you have any column which can be split into more than one column? For " "example: address can be split into street, city, country and zip." msgstr "" -"Y-a-t-il une colonne qui peut être scindée en plusieurs colonnes? Par " +"Y-a-t-il une colonne qui peut être scindée en plusieurs colonnes ? Par " "exemple : l'adresse peut être divisée en rue, ville, pays et code postal." #: libraries/classes/Normalization.php:228 @@ -9314,7 +9314,7 @@ msgid "" "first_name and last_name gives full_name which is redundant." msgstr "" "Y-a-t-il un groupe de colonnes qui, lorsque combinées, correspond à une " -"colonne existante? Par exemple, avec prénom, nom et nom_complet et en " +"colonne existante ? Par exemple, avec prénom, nom et nom_complet et en " "combinant prénom et nom on obtient nom_complet qui est redondant." #: libraries/classes/Normalization.php:326 @@ -9849,7 +9849,7 @@ msgstr "" #: libraries/classes/Plugins/Auth/AuthenticationCookie.php:205 #: templates/home/index.twig:97 msgid "Server:" -msgstr "Serveur : " +msgstr "Serveur :" #: libraries/classes/Plugins/Auth/AuthenticationCookie.php:217 msgid "Username:" @@ -10137,7 +10137,7 @@ msgstr "Généré le :" #: libraries/classes/Plugins/Export/ExportXml.php:251 #: templates/home/index.twig:109 msgid "Server version:" -msgstr "Version du serveur : " +msgstr "Version du serveur :" #: libraries/classes/Plugins/Export/ExportLatex.php:229 #: libraries/classes/Plugins/Export/ExportSql.php:730 @@ -10873,10 +10873,10 @@ msgid "" "option is the string to append and/or prepend when truncation occurs " "(Default: \"…\")." msgstr "" -"N'affiche qu'une partie du champ. En première option, la position de départ " -"(par défaut, 0). En seconde option, le nombre de caractères à afficher (par " +"N'affiche qu'une partie du champ. En première option, la position de départ (" +"par défaut, 0). En seconde option, le nombre de caractères à afficher (par " "défaut, le reste). En troisième option, des caractères à afficher à la fin " -"du texte (par défaut: « … »)." +"du texte (par défaut : « … »)." #: libraries/classes/Plugins/Transformations/Abs/TextFileUploadTransformationsPlugin.php:33 msgid "" @@ -14893,11 +14893,11 @@ msgstr "SRID :" #: templates/gis_data_editor_form.twig:53 #, php-format msgid "Geometry %d:" -msgstr "Géométrie %d : " +msgstr "Géométrie %d :" #: templates/gis_data_editor_form.twig:73 msgid "Point:" -msgstr "Point : " +msgstr "Point :" #: templates/gis_data_editor_form.twig:93 #: templates/gis_data_editor_form.twig:134 @@ -14909,18 +14909,18 @@ msgstr "Point %d :" #: templates/gis_data_editor_form.twig:113 #, php-format msgid "Linestring %d:" -msgstr "Ligne %d : " +msgstr "Ligne %d :" #: templates/gis_data_editor_form.twig:115 #: templates/gis_data_editor_form.twig:170 msgid "Outer ring:" -msgstr "Anneau extérieur : " +msgstr "Anneau extérieur :" #: templates/gis_data_editor_form.twig:117 #: templates/gis_data_editor_form.twig:172 #, php-format msgid "Inner ring %d:" -msgstr "Anneau intérieur %d : " +msgstr "Anneau intérieur %d :" #: templates/gis_data_editor_form.twig:144 msgid "Add a linestring" @@ -14929,7 +14929,7 @@ msgstr "Ajouter une ligne" #: templates/gis_data_editor_form.twig:157 #, php-format msgid "Polygon %d:" -msgstr "Polygone %d : " +msgstr "Polygone %d :" #: templates/gis_data_editor_form.twig:199 msgid "Add a polygon" @@ -14977,7 +14977,7 @@ msgstr "Serveur de base de données" #: templates/home/index.twig:101 msgid "Server type:" -msgstr "Type de serveur : " +msgstr "Type de serveur :" #: templates/home/index.twig:105 msgid "Server connection:" @@ -14985,7 +14985,7 @@ msgstr "Connexion au serveur :" #: templates/home/index.twig:113 msgid "Protocol version:" -msgstr "Version du protocole : " +msgstr "Version du protocole :" #: templates/home/index.twig:117 msgid "User:" From 436ef581bd0809544c4c02475ee4adb504dc6455 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 21 Mar 2021 01:52:10 +0100 Subject: [PATCH 13/13] Add some bottom space between logout error and demo server message [ci skip] Signed-off-by: William Desportes --- templates/login/form.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/login/form.twig b/templates/login/form.twig index 64a040c9fd..4eadd6c254 100644 --- a/templates/login/form.twig +++ b/templates/login/form.twig @@ -1,7 +1,7 @@ {{ login_header|raw }} {% if is_demo %} -
+
{% trans 'phpMyAdmin Demo Server' %} {% apply format('demo.phpmyadmin.net')|raw %} {% trans %}