Rename language+country resources to just language
Bug: 26496609
Test: none
Change-Id: I4a83d7c286cc14b1d49ee864954f397b12d74145
diff --git a/res/values-be-rBY-keysexposed/strings.xml b/res/values-be-rBY-keysexposed/strings.xml
deleted file mode 100644
index 17a1e33..0000000
--- a/res/values-be-rBY-keysexposed/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="create_playlist_create_text_prompt" msgid="942607395076646686">"Назва плэйліста"</string>
- <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Перайменаваць плэйлiст \"<xliff:g id="PLAYLIST">%s</xliff:g>\":"</string>
- <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Перайменаваць плэйлiст \"<xliff:g id="PLAYLIST">%s</xliff:g>\":"</string>
-</resources>
diff --git a/res/values-be-rBY-keyshidden/strings.xml b/res/values-be-rBY-keyshidden/strings.xml
deleted file mode 100644
index ec2dc7e..0000000
--- a/res/values-be-rBY-keyshidden/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Адкрыйце клавіятуру, каб даць назву свайму новаму плэйлісту, ці выберыце \"Захаваць\", каб назваць яго \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
- <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Адкрыйце клавіятуру, каб перайменаваць плэйліст \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
- <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Адкрыйце клавіятуру, каб перайменаваць плэйліст \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\", або выберыце \"Захаваць\", каб назваць яго \"<xliff:g id="NAME">%2$s</xliff:g>\"."</string>
-</resources>
diff --git a/res/values-be-rBY/strings.xml b/res/values-be/strings.xml
similarity index 100%
rename from res/values-be-rBY/strings.xml
rename to res/values-be/strings.xml
diff --git a/res/values-be-rBY/strings2.xml b/res/values-be/strings2.xml
similarity index 100%
rename from res/values-be-rBY/strings2.xml
rename to res/values-be/strings2.xml
diff --git a/res/values-bn-rBD-keysexposed/strings.xml b/res/values-bn-keysexposed/strings.xml
similarity index 100%
rename from res/values-bn-rBD-keysexposed/strings.xml
rename to res/values-bn-keysexposed/strings.xml
diff --git a/res/values-bn-rBD-keyshidden/strings.xml b/res/values-bn-keyshidden/strings.xml
similarity index 100%
rename from res/values-bn-rBD-keyshidden/strings.xml
rename to res/values-bn-keyshidden/strings.xml
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn/strings.xml
similarity index 100%
rename from res/values-bn-rBD/strings.xml
rename to res/values-bn/strings.xml
diff --git a/res/values-et-rEE-keysexposed/strings.xml b/res/values-et-rEE-keysexposed/strings.xml
deleted file mode 100644
index 2217dd7..0000000
--- a/res/values-et-rEE-keysexposed/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="create_playlist_create_text_prompt" msgid="942607395076646686">"Esitusloendi nimi"</string>
- <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Nimeta <xliff:g id="PLAYLIST">%s</xliff:g> ümber:"</string>
- <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Nimeta <xliff:g id="PLAYLIST">%s</xliff:g> ümber:"</string>
-</resources>
diff --git a/res/values-et-rEE-keyshidden/strings.xml b/res/values-et-rEE-keyshidden/strings.xml
deleted file mode 100644
index eb57c5d..0000000
--- a/res/values-et-rEE-keyshidden/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Avage klaviatuur, et lisada oma esitusloendile nimi või valige käsk Salvesta, et lisada sellele nimi „<xliff:g id="PLAYLIST">%s</xliff:g>”."</string>
- <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Avage klaviatuur, et anda esitusloendile <xliff:g id="PLAYLIST">%s</xliff:g> uus nimi."</string>
- <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Avage klaviatuur, et lisada esitusloendile „<xliff:g id="PLAYLIST">%1$s</xliff:g>” uus nimi või valige käsk Salvesta, et lisada sellele nimi „<xliff:g id="NAME">%2$s</xliff:g>”."</string>
-</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et/strings.xml
similarity index 100%
rename from res/values-et-rEE/strings.xml
rename to res/values-et/strings.xml
diff --git a/res/values-et-rEE/strings2.xml b/res/values-et/strings2.xml
similarity index 100%
rename from res/values-et-rEE/strings2.xml
rename to res/values-et/strings2.xml
diff --git a/res/values-ms-rMY-keysexposed/strings.xml b/res/values-ms-rMY-keysexposed/strings.xml
deleted file mode 100644
index 51ce8a5..0000000
--- a/res/values-ms-rMY-keysexposed/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="create_playlist_create_text_prompt" msgid="942607395076646686">"Nama senarai main"</string>
- <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Namakan semula \"<xliff:g id="PLAYLIST">%s</xliff:g>\" kepada"</string>
- <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Namakan semula \"<xliff:g id="PLAYLIST">%s</xliff:g>\" kepada"</string>
-</resources>
diff --git a/res/values-ms-rMY-keyshidden/strings.xml b/res/values-ms-rMY-keyshidden/strings.xml
deleted file mode 100644
index 545aa0f..0000000
--- a/res/values-ms-rMY-keyshidden/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Buka papan kekunci untuk menamakan Senarai Main baru anda atau pilih Simpan untuk menamakannya \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
- <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Buka papan kekunci untuk memberi nama baru kepada senarai main \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
- <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Buka papan kekunci untuk memberi nama baru bagi senarai main \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" atau pilih Simpan untuk menamakannya \"<xliff:g id="NAME">%2$s</xliff:g>\"."</string>
-</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms/strings.xml
similarity index 100%
rename from res/values-ms-rMY/strings.xml
rename to res/values-ms/strings.xml
diff --git a/res/values-ms-rMY/strings2.xml b/res/values-ms/strings2.xml
similarity index 100%
rename from res/values-ms-rMY/strings2.xml
rename to res/values-ms/strings2.xml
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa/strings.xml
similarity index 100%
rename from res/values-pa-rIN/strings.xml
rename to res/values-pa/strings.xml