From c1e845784b46aad11f2e14a0e940d97ee58cb652 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Sun, 23 Jun 2019 09:49:59 +0000 Subject: [PATCH 1/8] Translated using Weblate (Turkish) Currently translated at 100.0% (3301 of 3301 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/tr/ Signed-off-by: Burak Yavuz --- po/tr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index a1561306ba..2d66d7a56c 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.9.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-06-22 11:54+0200\n" -"PO-Revision-Date: 2019-06-20 22:00+0000\n" +"PO-Revision-Date: 2019-06-24 14:00+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 3.7\n" +"X-Generator: Weblate 3.7.1-dev\n" #: ajax.php:21 ajax.php:50 export.php:196 libraries/classes/Export.php:1095 msgid "Bad type!" @@ -13961,7 +13961,7 @@ msgstr "yukarıdakinin hiçbiri" #: libraries/db_common.inc.php:151 tbl_operations.php:224 msgid "No collation provided." -msgstr "" +msgstr "Sağlanan karşılaştırma yok." #: libraries/mult_submits.inc.php:337 msgid "Success!" From d266cd9f3c010844f27ac713f999e56fca5fb9f7 Mon Sep 17 00:00:00 2001 From: WWWesten Date: Sat, 22 Jun 2019 19:18:28 +0000 Subject: [PATCH 2/8] Translated using Weblate (Russian) Currently translated at 100.0% (3301 of 3301 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/ru/ Signed-off-by: WWWesten --- po/ru.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/ru.po b/po/ru.po index 07a62b43f0..655d1e139b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.9.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-06-22 11:54+0200\n" -"PO-Revision-Date: 2019-06-20 22:00+0000\n" +"PO-Revision-Date: 2019-06-24 14:00+0000\n" "Last-Translator: WWWesten \n" "Language-Team: Russian \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=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 3.7\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" +"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 3.7.1-dev\n" #: ajax.php:21 ajax.php:50 export.php:196 libraries/classes/Export.php:1095 msgid "Bad type!" @@ -13977,7 +13977,7 @@ msgstr "иначе, чем в вариантах выше" #: libraries/db_common.inc.php:151 tbl_operations.php:224 msgid "No collation provided." -msgstr "" +msgstr "Не предоставлено сопоставление." #: libraries/mult_submits.inc.php:337 msgid "Success!" From 0b5fdb0ffef6ad4380a769f839a5d76dbfcaea6b Mon Sep 17 00:00:00 2001 From: Joshua PowellNishiyama Date: Sat, 22 Jun 2019 11:09:27 +0000 Subject: [PATCH 3/8] Translated using Weblate (Japanese) Currently translated at 100.0% (3301 of 3301 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/ja/ Signed-off-by: Joshua PowellNishiyama --- po/ja.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ja.po b/po/ja.po index 1c20a848f1..bb6bfe7839 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.9.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-04-27 18:51+0200\n" -"PO-Revision-Date: 2019-06-22 09:58+0000\n" +"PO-Revision-Date: 2019-06-24 14:00+0000\n" "Last-Translator: Joshua PowellNishiyama \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 3.7\n" +"X-Generator: Weblate 3.7.1-dev\n" #: ajax.php:21 ajax.php:50 export.php:196 libraries/classes/Export.php:1095 msgid "Bad type!" @@ -6116,7 +6116,7 @@ msgstr "正の値ではありません!" #: libraries/classes/Config/FormDisplay.php:100 #: libraries/classes/Config/Validator.php:550 msgid "Not a non-negative number!" -msgstr "負の値ではありません!" +msgstr "負でない値ではありません!" #: libraries/classes/Config/FormDisplay.php:101 #: libraries/classes/Config/Validator.php:506 @@ -13766,7 +13766,7 @@ msgstr "上のどちらでもない" #: libraries/db_common.inc.php:151 tbl_operations.php:224 msgid "No collation provided." -msgstr "" +msgstr "照合順序が提供されていません。" #: libraries/mult_submits.inc.php:337 msgid "Success!" From 307bd13114a027377b212fe36122b637fc0abf1a Mon Sep 17 00:00:00 2001 From: ssantos Date: Sat, 22 Jun 2019 11:24:42 +0000 Subject: [PATCH 4/8] Translated using Weblate (Portuguese) Currently translated at 100.0% (3301 of 3301 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/pt/ Signed-off-by: ssantos --- po/pt.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/pt.po b/po/pt.po index 8e6757decf..080a8f4a9b 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.9.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-06-19 13:37-0300\n" -"PO-Revision-Date: 2019-06-22 09:58+0000\n" +"PO-Revision-Date: 2019-06-24 14:00+0000\n" "Last-Translator: ssantos \n" -"Language-Team: Portuguese \n" +"Language-Team: Portuguese \n" "Language: pt\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" -"X-Generator: Weblate 3.7\n" +"X-Generator: Weblate 3.7.1-dev\n" #: ajax.php:21 ajax.php:50 export.php:196 libraries/classes/Export.php:1095 msgid "Bad type!" @@ -14037,7 +14037,7 @@ msgstr "nenhuma das acima" #: libraries/db_common.inc.php:151 tbl_operations.php:224 msgid "No collation provided." -msgstr "" +msgstr "Nenhuma colação fornecida." #: libraries/mult_submits.inc.php:337 msgid "Success!" From 32a1d961baef5c80bcf4b864ae5a25a416fa2d02 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Sat, 22 Jun 2019 14:05:27 +0000 Subject: [PATCH 5/8] Translated using Weblate (French) Currently translated at 100.0% (3301 of 3301 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/fr/ Signed-off-by: Olivier Humbert --- po/fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index a8b2ce9f86..7ef2cd4048 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: 2019-06-19 13:37-0300\n" -"PO-Revision-Date: 2019-06-22 09:58+0000\n" +"PO-Revision-Date: 2019-06-24 14:00+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.7\n" +"X-Generator: Weblate 3.7.1-dev\n" #: ajax.php:21 ajax.php:50 export.php:196 libraries/classes/Export.php:1095 msgid "Bad type!" @@ -14140,7 +14140,7 @@ msgstr "aucun des deux ci-dessus" #: libraries/db_common.inc.php:151 tbl_operations.php:224 msgid "No collation provided." -msgstr "" +msgstr "Aucune collation n'est fournie." #: libraries/mult_submits.inc.php:337 msgid "Success!" From 99ebb854ce4f0a9f46f4399edd6c607a84e17a15 Mon Sep 17 00:00:00 2001 From: WWWesten Date: Sat, 22 Jun 2019 19:20:53 +0000 Subject: [PATCH 6/8] Translated using Weblate (Kazakh) Currently translated at 100.0% (3301 of 3301 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/kk/ Signed-off-by: WWWesten --- po/kk.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/kk.po b/po/kk.po index 474cae7331..fca94f8849 100644 --- a/po/kk.po +++ b/po/kk.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.9.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-06-22 11:54+0200\n" -"PO-Revision-Date: 2019-06-20 22:00+0000\n" +"PO-Revision-Date: 2019-06-24 14:00+0000\n" "Last-Translator: WWWesten \n" "Language-Team: Kazakh \n" @@ -17,7 +17,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.7\n" +"X-Generator: Weblate 3.7.1-dev\n" #: ajax.php:21 ajax.php:50 export.php:196 libraries/classes/Export.php:1095 msgid "Bad type!" @@ -13938,7 +13938,7 @@ msgstr "joǵarydaǵy bireýi de joq" #: libraries/db_common.inc.php:151 tbl_operations.php:224 msgid "No collation provided." -msgstr "" +msgstr "Kolasıa jetkizilmedi." #: libraries/mult_submits.inc.php:337 msgid "Success!" From 46f0ad927caa1d9532c7149ee7502ac9db739337 Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 23 Jun 2019 13:39:01 +0000 Subject: [PATCH 7/8] Translated using Weblate (Slovenian) Currently translated at 99.9% (3300 of 3301 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/sl/ Signed-off-by: Domen --- po/sl.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/sl.po b/po/sl.po index ebee6422a4..f3ede0040f 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,17 +4,17 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.9.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-06-22 11:54+0200\n" -"PO-Revision-Date: 2019-04-30 22:58+0000\n" +"PO-Revision-Date: 2019-06-24 14:00+0000\n" "Last-Translator: Domen \n" -"Language-Team: Slovenian \n" "Language: sl\n" "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.6.1\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.7.1-dev\n" #: ajax.php:21 ajax.php:50 export.php:196 libraries/classes/Export.php:1095 msgid "Bad type!" @@ -13938,7 +13938,7 @@ msgstr "nič od zgoraj" #: libraries/db_common.inc.php:151 tbl_operations.php:224 msgid "No collation provided." -msgstr "" +msgstr "Pravilo za razvrščanje znakov ni podano." #: libraries/mult_submits.inc.php:337 msgid "Success!" From ecad5995abf64b5f2a3e7e240bb16cd8ed3be587 Mon Sep 17 00:00:00 2001 From: johnkershaw Date: Sun, 23 Jun 2019 18:38:09 +0100 Subject: [PATCH 8/8] country_code is defined as NOT NULL Without a country_code for 'Marc' the second step will fail (cannot relate country_code in REL_persons to country_code in REL_countries if the REL_persons record has no value for country_code). Since this is the whole point of this example it's going to trip people up who're trying to set up relations in phpMyAdmin (like me!) Co-authored-by: William Desportes Signed-off-by: John Kershaw Signed-off-by: William Desportes --- doc/faq.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/faq.rst b/doc/faq.rst index 87c35a91e0..47506e13a1 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -1473,7 +1473,7 @@ create the example tables: country_code char(1) NOT NULL default '', description varchar(10) NOT NULL default '', PRIMARY KEY (country_code) - ) TYPE=MyISAM; + ) ENGINE=MyISAM; INSERT INTO REL_countries VALUES ('C', 'Canada'); @@ -1483,16 +1483,16 @@ create the example tables: town_code varchar(5) default '0', country_code char(1) NOT NULL default '', PRIMARY KEY (id) - ) TYPE=MyISAM; + ) ENGINE=MyISAM; - INSERT INTO REL_persons VALUES (11, 'Marc', 'S', ''); + INSERT INTO REL_persons VALUES (11, 'Marc', 'S', 'C'); INSERT INTO REL_persons VALUES (15, 'Paul', 'S', 'C'); CREATE TABLE REL_towns ( town_code varchar(5) NOT NULL default '0', description varchar(30) NOT NULL default '', PRIMARY KEY (town_code) - ) TYPE=MyISAM; + ) ENGINE=MyISAM; INSERT INTO REL_towns VALUES ('S', 'Sherbrooke'); INSERT INTO REL_towns VALUES ('M', 'Montréal');