From 4d61c2c5e0397f670d06e072252f9ccacca47a02 Mon Sep 17 00:00:00 2001
From: AndhikaWB <karagasnoelan@gmail.com>
Date: Fri, 26 Oct 2018 00:04:36 +0700
Subject: [PATCH 1/3] Fix spelling in of country names in settings

- [x] I carefully read the [contribution guidelines](https://github.com/TeamNewPipe/NewPipe/blob/HEAD/.github/CONTRIBUTING.md) and agree to them.

Closes TeamNewPipe/NewPipe#1504
---
 app/src/main/res/values/settings_keys.xml | 90 +++++++++++------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 54cc8b45b..cd3eb625a 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -374,8 +374,8 @@
         <item>Andorra</item>
         <item>Angola</item>
         <item>Anguilla</item>
-        <item>Antarctica</item>
-        <item>Antiguaand Barbuda</item>
+        <item>Antartica</item>
+        <item>Antigua and Barbuda</item>
         <item>Argentina</item>
         <item>Armenia</item>
         <item>Aruba</item>
@@ -393,9 +393,9 @@
         <item>Bermuda</item>
         <item>Bhutan</item>
         <item>Bolivia</item>
-        <item>Bosniaand Herzegovina</item>
+        <item>Bosnia and Herzegovina</item>
         <item>Botswana</item>
-        <item>BouvetIsland</item>
+        <item>Bouvet Island</item>
         <item>Brazil</item>
         <item>British Virgin Islands</item>
         <item>British Indian Ocean Territory</item>
@@ -406,23 +406,23 @@
         <item>Cambodia</item>
         <item>Cameroon</item>
         <item>Canada</item>
-        <item>CapeVerde</item>
+        <item>Cape Verde</item>
         <item>Cayman Islands</item>
         <item>Central African Republic</item>
         <item>Chad</item>
         <item>Chile</item>
         <item>China</item>
-        <item>HongKong, China</item>
-        <item>Macao,China</item>
+        <item>Hong Kong (China)</item>
+        <item>Macao (China)</item>
         <item>Christmas Island</item>
-        <item>Cocos(Keeling) Islands</item>
+        <item>Cocos (Keeling) Islands</item>
         <item>Colombia</item>
         <item>Comoros</item>
-        <item>Congo(Brazzaville)</item>
-        <item>Congo, (Kinshasa)</item>
+        <item>Brazzaville (Congo)</item>
+        <item>Kinshasa (Congo)</item>
         <item>Cook Islands</item>
-        <item>CostaRica</item>
-        <item>Côted\'Ivoire</item>
+        <item>Costa Rica</item>
+        <item>Côte d'Ivoire</item>
         <item>Croatia</item>
         <item>Cuba</item>
         <item>Cyprus</item>
@@ -433,8 +433,8 @@
         <item>Dominican Republic</item>
         <item>Ecuador</item>
         <item>Egypt</item>
-        <item>ElSalvador</item>
-        <item>EquatorialGuinea</item>
+        <item>El Salvador</item>
+        <item>Equatorial Guinea</item>
         <item>Eritrea</item>
         <item>Estonia</item>
         <item>Ethiopia</item>
@@ -463,8 +463,8 @@
         <item>Guinea-Bissau</item>
         <item>Guyana</item>
         <item>Haiti</item>
-        <item>Heardand Mcdonald Islands</item>
-        <item>HolySee (Vatican City State)</item>
+        <item>Heard and McDonald Islands</item>
+        <item>Holy See (Vatican City State)</item>
         <item>Honduras</item>
         <item>Hungary</item>
         <item>Iceland</item>
@@ -473,7 +473,7 @@
         <item>Iran</item>
         <item>Iraq</item>
         <item>Ireland</item>
-        <item>Isleof Man</item>
+        <item>Isle of Man</item>
         <item>Israel</item>
         <item>Italy</item>
         <item>Jamaica</item>
@@ -483,8 +483,8 @@
         <item>Kazakhstan</item>
         <item>Kenya</item>
         <item>Kiribati</item>
-        <item>Korea(North)</item>
-        <item>Korea(South)</item>
+        <item>North Korea</item>
+        <item>South Korea</item>
         <item>Kuwait</item>
         <item>Kyrgyzstan</item>
         <item>Lao</item>
@@ -503,7 +503,7 @@
         <item>Maldives</item>
         <item>Mali</item>
         <item>Malta</item>
-        <item>MarshallIslands</item>
+        <item>Marshall Islands</item>
         <item>Martinique</item>
         <item>Mauritania</item>
         <item>Mauritius</item>
@@ -535,7 +535,7 @@
         <item>Oman</item>
         <item>Pakistan</item>
         <item>Palau</item>
-        <item>Palestinian Territory</item>
+        <item>Palestina</item>
         <item>Panama</item>
         <item>Papua New Guinea</item>
         <item>Paraguay</item>
@@ -544,71 +544,71 @@
         <item>Pitcairn</item>
         <item>Poland</item>
         <item>Portugal</item>
-        <item>PuertoRico</item>
+        <item>Puerto Rico</item>
         <item>Qatar</item>
         <item>Réunion</item>
         <item>Romania</item>
         <item>Russian Federation</item>
         <item>Rwanda</item>
-        <item>Saint-Barthélemy</item>
+        <item>Saint Barthélemy</item>
         <item>Saint Helena</item>
-        <item>Saint KittsandNevis</item>
-        <item>SaintLucia</item>
-        <item>Saint-Martin(Frenchpart)</item>
-        <item>SaintPierreandMiquelon</item>
-        <item>Saint Vincentand Grenadines</item>
+        <item>Saint Kitts and Nevis</item>
+        <item>Saint Lucia</item>
+        <item>Saint Martin</item>
+        <item>Saint Pierre and Miquelon</item>
+        <item>Saint Vincent and Grenadines</item>
         <item>Samoa</item>
         <item>San Marino</item>
-        <item>Sao Tomeand Principe</item>
-        <item>SaudiArabia</item>
+        <item>Sao Tome and Principe</item>
+        <item>Saudi Arabia</item>
         <item>Senegal</item>
         <item>Serbia</item>
         <item>Seychelles</item>
-        <item>SierraLeone</item>
+        <item>Sierra Leone</item>
         <item>Singapore</item>
         <item>Slovakia</item>
         <item>Slovenia</item>
-        <item>SolomonIslands</item>
+        <item>Solomon Islands</item>
         <item>Somalia</item>
-        <item>SouthAfrica</item>
-        <item>South Georgiaandthe South Sandwich Islands</item>
+        <item>South Africa</item>
+        <item>South Georgia and South Sandwich Islands</item>
         <item>South Sudan</item>
         <item>Spain</item>
         <item>Sri Lanka</item>
         <item>Sudan</item>
         <item>Suriname</item>
-        <item>Svalbardand Jan Mayen Islands</item>
+        <item>Svalbard and Jan Mayen Islands</item>
         <item>Swaziland</item>
         <item>Sweden</item>
         <item>Switzerland</item>
-        <item>Syrian ArabRepublic(Syria)</item>
-        <item>Taiwan, Republicof China</item>
+        <item>Syrian Arab Republic (Syria)</item>
+        <item>Taiwan</item>
         <item>Tajikistan</item>
         <item>Tanzania</item>
         <item>Thailand</item>
-        <item>Timor-Leste</item>
+        <item>Timor Leste</item>
         <item>Togo</item>
         <item>Tokelau</item>
         <item>Tonga</item>
-        <item>Trinidadand Tobago</item>
+        <item>Trinidad and Tobago</item>
         <item>Tunisia</item>
         <item>Turkey</item>
         <item>Turkmenistan</item>
-        <item>Turksand Caicos Islands</item>
+        <item>Turks and Caicos Islands</item>
         <item>Tuvalu</item>
         <item>Uganda</item>
         <item>Ukraine</item>
         <item>United Arab Emirates</item>
         <item>United Kingdom</item>
-        <item>USA</item>
+        <item>United States</item>
         <item>Minor Outlying Islands</item>
         <item>Uruguay</item>
         <item>Uzbekistan</item>
         <item>Vanuatu</item>
-        <item>Venezuela (BolivarianRepublic)</item>
-        <item>VietNam</item>
-        <item>Virgin Islands,</item>
-        <item>Wallisand Futuna Islands</item>
+        <item>Venezuela (Bolivarian Republic)</item>
+        <item>Vietnam</item>
+        <item>Virgin Islands</item>
+        <item>Wallis and Futuna Islands</item>
         <item>Western Sahara</item>
         <item>Yemen</item>
         <item>Zambia</item>

From ff3ce46a26d6f761cf1e9d3f896501dfaefad225 Mon Sep 17 00:00:00 2001
From: AndhikaWB <karagasnoelan@gmail.com>
Date: Fri, 26 Oct 2018 00:09:04 +0700
Subject: [PATCH 2/3] Update settings_keys.xml

---
 app/src/main/res/values/settings_keys.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index cd3eb625a..c7f6e7dc0 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -535,7 +535,7 @@
         <item>Oman</item>
         <item>Pakistan</item>
         <item>Palau</item>
-        <item>Palestina</item>
+        <item>Palestine</item>
         <item>Panama</item>
         <item>Papua New Guinea</item>
         <item>Paraguay</item>

From 7e95dd3c7678e71d8d2316acfda55dfc641550d1 Mon Sep 17 00:00:00 2001
From: Tobias Groza <TobiGr@users.noreply.github.com>
Date: Fri, 26 Oct 2018 16:22:35 +0700
Subject: [PATCH 3/3] =?UTF-8?q?Change=20from=20"C=C3=B4te=20d'Ivoire"=20to?=
 =?UTF-8?q?=20"C=C3=B4te=20d\'Ivoire"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: AndhikaWB <karagasnoelan@gmail.com>
---
 app/src/main/res/values/settings_keys.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index c7f6e7dc0..133a679c9 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -422,7 +422,7 @@
         <item>Kinshasa (Congo)</item>
         <item>Cook Islands</item>
         <item>Costa Rica</item>
-        <item>Côte d'Ivoire</item>
+        <item>Côte d\'Ivoire</item>
         <item>Croatia</item>
         <item>Cuba</item>
         <item>Cyprus</item>