From 87d0dc827db4f440ed5ad36ca14377e916df3ab5 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Fri, 10 Sep 2010 13:22:47 -0700
Subject: Rename altchars.xml to keep translation imports from altering it.

It looks like these files are now being maintained in the source tree
instead of by the translators, so add a "donottranslate" prefix so that
reimporting translations will not overwrite the changes.

Change-Id: I471744ef7d5786ddb705cbda494bb1fbced3028b
---
 java/res/values-cs/altchars.xml                    | 34 ----------------
 java/res/values-cs/donottranslate-altchars.xml     | 34 ++++++++++++++++
 java/res/values-da/altchars.xml                    | 38 ------------------
 java/res/values-da/donottranslate-altchars.xml     | 38 ++++++++++++++++++
 java/res/values-de/altchars.xml                    | 31 ---------------
 java/res/values-de/donottranslate-altchars.xml     | 31 +++++++++++++++
 java/res/values-el/altchars.xml                    | 30 --------------
 java/res/values-el/donottranslate-altchars.xml     | 30 ++++++++++++++
 java/res/values-en/altchars.xml                    | 27 -------------
 java/res/values-en/donottranslate-altchars.xml     | 27 +++++++++++++
 java/res/values-es-rUS/altchars.xml                | 30 --------------
 java/res/values-es-rUS/donottranslate-altchars.xml | 30 ++++++++++++++
 java/res/values-es/altchars.xml                    | 30 --------------
 java/res/values-es/donottranslate-altchars.xml     | 30 ++++++++++++++
 java/res/values-fr/altchars.xml                    | 33 ----------------
 java/res/values-fr/donottranslate-altchars.xml     | 33 ++++++++++++++++
 java/res/values-it/altchars.xml                    | 30 --------------
 java/res/values-it/donottranslate-altchars.xml     | 30 ++++++++++++++
 java/res/values-ja/altchars.xml                    | 30 --------------
 java/res/values-ja/donottranslate-altchars.xml     | 30 ++++++++++++++
 java/res/values-ko/altchars.xml                    | 30 --------------
 java/res/values-ko/donottranslate-altchars.xml     | 30 ++++++++++++++
 java/res/values-nb/altchars.xml                    | 37 -----------------
 java/res/values-nb/donottranslate-altchars.xml     | 37 +++++++++++++++++
 java/res/values-nl/altchars.xml                    | 30 --------------
 java/res/values-nl/donottranslate-altchars.xml     | 30 ++++++++++++++
 java/res/values-pl/altchars.xml                    | 32 ---------------
 java/res/values-pl/donottranslate-altchars.xml     | 32 +++++++++++++++
 java/res/values-pt-rPT/altchars.xml                | 30 --------------
 java/res/values-pt-rPT/donottranslate-altchars.xml | 30 ++++++++++++++
 java/res/values-pt/altchars.xml                    | 30 --------------
 java/res/values-pt/donottranslate-altchars.xml     | 30 ++++++++++++++
 java/res/values-rm/altchars.xml                    | 30 --------------
 java/res/values-rm/donottranslate-altchars.xml     | 30 ++++++++++++++
 java/res/values-ru/altchars.xml                    | 32 ---------------
 java/res/values-ru/donottranslate-altchars.xml     | 32 +++++++++++++++
 java/res/values-sv/altchars.xml                    | 38 ------------------
 java/res/values-sv/donottranslate-altchars.xml     | 38 ++++++++++++++++++
 java/res/values-tr/altchars.xml                    | 31 ---------------
 java/res/values-tr/donottranslate-altchars.xml     | 31 +++++++++++++++
 java/res/values-zh-rCN/altchars.xml                | 30 --------------
 java/res/values-zh-rCN/donottranslate-altchars.xml | 30 ++++++++++++++
 java/res/values-zh-rTW/altchars.xml                | 30 --------------
 java/res/values-zh-rTW/donottranslate-altchars.xml | 30 ++++++++++++++
 java/res/values/altchars.xml                       | 46 ----------------------
 java/res/values/donottranslate-altchars.xml        | 46 ++++++++++++++++++++++
 46 files changed, 739 insertions(+), 739 deletions(-)
 delete mode 100644 java/res/values-cs/altchars.xml
 create mode 100644 java/res/values-cs/donottranslate-altchars.xml
 delete mode 100644 java/res/values-da/altchars.xml
 create mode 100644 java/res/values-da/donottranslate-altchars.xml
 delete mode 100644 java/res/values-de/altchars.xml
 create mode 100644 java/res/values-de/donottranslate-altchars.xml
 delete mode 100644 java/res/values-el/altchars.xml
 create mode 100644 java/res/values-el/donottranslate-altchars.xml
 delete mode 100644 java/res/values-en/altchars.xml
 create mode 100644 java/res/values-en/donottranslate-altchars.xml
 delete mode 100644 java/res/values-es-rUS/altchars.xml
 create mode 100644 java/res/values-es-rUS/donottranslate-altchars.xml
 delete mode 100644 java/res/values-es/altchars.xml
 create mode 100644 java/res/values-es/donottranslate-altchars.xml
 delete mode 100644 java/res/values-fr/altchars.xml
 create mode 100644 java/res/values-fr/donottranslate-altchars.xml
 delete mode 100644 java/res/values-it/altchars.xml
 create mode 100644 java/res/values-it/donottranslate-altchars.xml
 delete mode 100644 java/res/values-ja/altchars.xml
 create mode 100644 java/res/values-ja/donottranslate-altchars.xml
 delete mode 100644 java/res/values-ko/altchars.xml
 create mode 100644 java/res/values-ko/donottranslate-altchars.xml
 delete mode 100644 java/res/values-nb/altchars.xml
 create mode 100644 java/res/values-nb/donottranslate-altchars.xml
 delete mode 100644 java/res/values-nl/altchars.xml
 create mode 100644 java/res/values-nl/donottranslate-altchars.xml
 delete mode 100644 java/res/values-pl/altchars.xml
 create mode 100644 java/res/values-pl/donottranslate-altchars.xml
 delete mode 100644 java/res/values-pt-rPT/altchars.xml
 create mode 100644 java/res/values-pt-rPT/donottranslate-altchars.xml
 delete mode 100644 java/res/values-pt/altchars.xml
 create mode 100644 java/res/values-pt/donottranslate-altchars.xml
 delete mode 100644 java/res/values-rm/altchars.xml
 create mode 100644 java/res/values-rm/donottranslate-altchars.xml
 delete mode 100644 java/res/values-ru/altchars.xml
 create mode 100644 java/res/values-ru/donottranslate-altchars.xml
 delete mode 100644 java/res/values-sv/altchars.xml
 create mode 100644 java/res/values-sv/donottranslate-altchars.xml
 delete mode 100644 java/res/values-tr/altchars.xml
 create mode 100644 java/res/values-tr/donottranslate-altchars.xml
 delete mode 100644 java/res/values-zh-rCN/altchars.xml
 create mode 100644 java/res/values-zh-rCN/donottranslate-altchars.xml
 delete mode 100644 java/res/values-zh-rTW/altchars.xml
 create mode 100644 java/res/values-zh-rTW/donottranslate-altchars.xml
 delete mode 100644 java/res/values/altchars.xml
 create mode 100644 java/res/values/donottranslate-altchars.xml

(limited to 'java')

diff --git a/java/res/values-cs/altchars.xml b/java/res/values-cs/altchars.xml
deleted file mode 100644
index d91a0e449..000000000
--- a/java/res/values-cs/altchars.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">áàâãäåæ</string>
-    <string name="alternates_for_e">3éěèêë</string>
-    <string name="alternates_for_i">íìîï8</string>
-    <string name="alternates_for_o">óòôõöœø9</string>
-    <string name="alternates_for_u">ůúùûü7</string>
-    <string name="alternates_for_s">š§ß</string>
-    <string name="alternates_for_n">ňñ</string>
-    <string name="alternates_for_c">čç</string>
-    <string name="alternates_for_y">ýÿ6</string>
-    <string name="alternates_for_d">ď</string>
-    <string name="alternates_for_r">ř4</string>
-    <string name="alternates_for_t">ť5</string>
-    <string name="alternates_for_z">ž</string>
-</resources>
diff --git a/java/res/values-cs/donottranslate-altchars.xml b/java/res/values-cs/donottranslate-altchars.xml
new file mode 100644
index 000000000..d91a0e449
--- /dev/null
+++ b/java/res/values-cs/donottranslate-altchars.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">áàâãäåæ</string>
+    <string name="alternates_for_e">3éěèêë</string>
+    <string name="alternates_for_i">íìîï8</string>
+    <string name="alternates_for_o">óòôõöœø9</string>
+    <string name="alternates_for_u">ůúùûü7</string>
+    <string name="alternates_for_s">š§ß</string>
+    <string name="alternates_for_n">ňñ</string>
+    <string name="alternates_for_c">čç</string>
+    <string name="alternates_for_y">ýÿ6</string>
+    <string name="alternates_for_d">ď</string>
+    <string name="alternates_for_r">ř4</string>
+    <string name="alternates_for_t">ť5</string>
+    <string name="alternates_for_z">ž</string>
+</resources>
diff --git a/java/res/values-da/altchars.xml b/java/res/values-da/altchars.xml
deleted file mode 100644
index b1cc8b627..000000000
--- a/java/res/values-da/altchars.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">áàâąã</string>
-    <string name="alternates_for_e">3éèêëę€</string>
-    <string name="alternates_for_i">íìîï8</string>
-    <string name="alternates_for_o">óòôõ9</string>
-    <string name="alternates_for_u">úùûū7</string>
-    <string name="alternates_for_s">śšşß</string>
-    <string name="alternates_for_n">ńñň</string>
-    <string name="alternates_for_c">çćč</string>
-    <string name="alternates_for_y">ýÿü6</string>
-    <string name="alternates_for_d">ðď</string>
-    <string name="alternates_for_r">ř4</string>
-    <string name="alternates_for_t">ťþ5</string>
-    <string name="alternates_for_z">źžż</string>
-    <string name="alternates_for_l">ł</string>
-    <string name="alternates_for_v">w</string>
-    <string name="alternates_for_ae">ä</string>
-    <string name="alternates_for_oe">öœ</string>
-</resources>
diff --git a/java/res/values-da/donottranslate-altchars.xml b/java/res/values-da/donottranslate-altchars.xml
new file mode 100644
index 000000000..b1cc8b627
--- /dev/null
+++ b/java/res/values-da/donottranslate-altchars.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">áàâąã</string>
+    <string name="alternates_for_e">3éèêëę€</string>
+    <string name="alternates_for_i">íìîï8</string>
+    <string name="alternates_for_o">óòôõ9</string>
+    <string name="alternates_for_u">úùûū7</string>
+    <string name="alternates_for_s">śšşß</string>
+    <string name="alternates_for_n">ńñň</string>
+    <string name="alternates_for_c">çćč</string>
+    <string name="alternates_for_y">ýÿü6</string>
+    <string name="alternates_for_d">ðď</string>
+    <string name="alternates_for_r">ř4</string>
+    <string name="alternates_for_t">ťþ5</string>
+    <string name="alternates_for_z">źžż</string>
+    <string name="alternates_for_l">ł</string>
+    <string name="alternates_for_v">w</string>
+    <string name="alternates_for_ae">ä</string>
+    <string name="alternates_for_oe">öœ</string>
+</resources>
diff --git a/java/res/values-de/altchars.xml b/java/res/values-de/altchars.xml
deleted file mode 100644
index df27bce28..000000000
--- a/java/res/values-de/altchars.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">ä</string>
-    <string name="alternates_for_e">3èéêë</string>
-    <string name="alternates_for_i">ìíîï8</string>
-    <string name="alternates_for_o">ö9</string>
-    <string name="alternates_for_u">ùúûü7</string>
-    <string name="alternates_for_s">§ß</string>
-    <string name="alternates_for_n">ñ</string>
-    <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ýÿ</string>
-    <string name="alternates_for_z">6</string>
-</resources>
diff --git a/java/res/values-de/donottranslate-altchars.xml b/java/res/values-de/donottranslate-altchars.xml
new file mode 100644
index 000000000..df27bce28
--- /dev/null
+++ b/java/res/values-de/donottranslate-altchars.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">ä</string>
+    <string name="alternates_for_e">3èéêë</string>
+    <string name="alternates_for_i">ìíîï8</string>
+    <string name="alternates_for_o">ö9</string>
+    <string name="alternates_for_u">ùúûü7</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+    <string name="alternates_for_z">6</string>
+</resources>
diff --git a/java/res/values-el/altchars.xml b/java/res/values-el/altchars.xml
deleted file mode 100644
index d3beafade..000000000
--- a/java/res/values-el/altchars.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">àáâãäåæ</string>
-    <string name="alternates_for_e">3èéêë</string>
-    <string name="alternates_for_i">ìíîï8</string>
-    <string name="alternates_for_o">òóôõöœø9</string>
-    <string name="alternates_for_u">ùúûü7</string>
-    <string name="alternates_for_s">§ß</string>
-    <string name="alternates_for_n">ñ</string>
-    <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ýÿ6</string>
-</resources>
diff --git a/java/res/values-el/donottranslate-altchars.xml b/java/res/values-el/donottranslate-altchars.xml
new file mode 100644
index 000000000..d3beafade
--- /dev/null
+++ b/java/res/values-el/donottranslate-altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">3èéêë</string>
+    <string name="alternates_for_i">ìíîï8</string>
+    <string name="alternates_for_o">òóôõöœø9</string>
+    <string name="alternates_for_u">ùúûü7</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ6</string>
+</resources>
diff --git a/java/res/values-en/altchars.xml b/java/res/values-en/altchars.xml
deleted file mode 100644
index 083befa19..000000000
--- a/java/res/values-en/altchars.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">àáâãäåāæ</string>
-    <string name="alternates_for_e">3èéêëē</string>
-    <string name="alternates_for_i">ìíîïī8</string>
-    <string name="alternates_for_o">òóôõöōœø9</string>
-    <string name="alternates_for_u">ùúûüū7</string>
-    <string name="alternates_for_y">ýÿ6</string>
-</resources>
diff --git a/java/res/values-en/donottranslate-altchars.xml b/java/res/values-en/donottranslate-altchars.xml
new file mode 100644
index 000000000..083befa19
--- /dev/null
+++ b/java/res/values-en/donottranslate-altchars.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">àáâãäåāæ</string>
+    <string name="alternates_for_e">3èéêëē</string>
+    <string name="alternates_for_i">ìíîïī8</string>
+    <string name="alternates_for_o">òóôõöōœø9</string>
+    <string name="alternates_for_u">ùúûüū7</string>
+    <string name="alternates_for_y">ýÿ6</string>
+</resources>
diff --git a/java/res/values-es-rUS/altchars.xml b/java/res/values-es-rUS/altchars.xml
deleted file mode 100644
index d3beafade..000000000
--- a/java/res/values-es-rUS/altchars.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">àáâãäåæ</string>
-    <string name="alternates_for_e">3èéêë</string>
-    <string name="alternates_for_i">ìíîï8</string>
-    <string name="alternates_for_o">òóôõöœø9</string>
-    <string name="alternates_for_u">ùúûü7</string>
-    <string name="alternates_for_s">§ß</string>
-    <string name="alternates_for_n">ñ</string>
-    <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ýÿ6</string>
-</resources>
diff --git a/java/res/values-es-rUS/donottranslate-altchars.xml b/java/res/values-es-rUS/donottranslate-altchars.xml
new file mode 100644
index 000000000..d3beafade
--- /dev/null
+++ b/java/res/values-es-rUS/donottranslate-altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">3èéêë</string>
+    <string name="alternates_for_i">ìíîï8</string>
+    <string name="alternates_for_o">òóôõöœø9</string>
+    <string name="alternates_for_u">ùúûü7</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ6</string>
+</resources>
diff --git a/java/res/values-es/altchars.xml b/java/res/values-es/altchars.xml
deleted file mode 100644
index 721062d2d..000000000
--- a/java/res/values-es/altchars.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">á</string>
-    <string name="alternates_for_e">3é</string>
-    <string name="alternates_for_i">ìíîï8</string>
-    <string name="alternates_for_o">ó9</string>
-    <string name="alternates_for_u">ùúûü7</string>
-    <string name="alternates_for_s">§ß</string>
-    <string name="alternates_for_n">ñ</string>
-    <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ýÿ6</string>
-</resources>
diff --git a/java/res/values-es/donottranslate-altchars.xml b/java/res/values-es/donottranslate-altchars.xml
new file mode 100644
index 000000000..721062d2d
--- /dev/null
+++ b/java/res/values-es/donottranslate-altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">á</string>
+    <string name="alternates_for_e">3é</string>
+    <string name="alternates_for_i">ìíîï8</string>
+    <string name="alternates_for_o">ó9</string>
+    <string name="alternates_for_u">ùúûü7</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ6</string>
+</resources>
diff --git a/java/res/values-fr/altchars.xml b/java/res/values-fr/altchars.xml
deleted file mode 100644
index 874d89dab..000000000
--- a/java/res/values-fr/altchars.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">1àáâãäåæ</string>
-    <string name="alternates_for_e">3èéêë</string>
-    <string name="alternates_for_i">ìíîï8</string>
-    <string name="alternates_for_o">òóôõöœø9</string>
-    <string name="alternates_for_u">ùúûü7</string>
-    <string name="alternates_for_s">§ß</string>
-    <string name="alternates_for_n">ñ</string>
-    <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ýÿ6</string>
-    <string name="alternates_for_q"></string>
-    <string name="alternates_for_w"></string>
-    <string name="alternates_for_z">2</string>
-</resources>
diff --git a/java/res/values-fr/donottranslate-altchars.xml b/java/res/values-fr/donottranslate-altchars.xml
new file mode 100644
index 000000000..874d89dab
--- /dev/null
+++ b/java/res/values-fr/donottranslate-altchars.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">1àáâãäåæ</string>
+    <string name="alternates_for_e">3èéêë</string>
+    <string name="alternates_for_i">ìíîï8</string>
+    <string name="alternates_for_o">òóôõöœø9</string>
+    <string name="alternates_for_u">ùúûü7</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ6</string>
+    <string name="alternates_for_q"></string>
+    <string name="alternates_for_w"></string>
+    <string name="alternates_for_z">2</string>
+</resources>
diff --git a/java/res/values-it/altchars.xml b/java/res/values-it/altchars.xml
deleted file mode 100644
index 23960171b..000000000
--- a/java/res/values-it/altchars.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">àá</string>
-    <string name="alternates_for_e">3èé</string>
-    <string name="alternates_for_i">ìíîï8</string>
-    <string name="alternates_for_o">òó9</string>
-    <string name="alternates_for_u">ùúûü7</string>
-    <string name="alternates_for_s">§</string>
-    <string name="alternates_for_n">ñ</string>
-    <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ýÿ6</string>
-</resources>
diff --git a/java/res/values-it/donottranslate-altchars.xml b/java/res/values-it/donottranslate-altchars.xml
new file mode 100644
index 000000000..23960171b
--- /dev/null
+++ b/java/res/values-it/donottranslate-altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">àá</string>
+    <string name="alternates_for_e">3èé</string>
+    <string name="alternates_for_i">ìíîï8</string>
+    <string name="alternates_for_o">òó9</string>
+    <string name="alternates_for_u">ùúûü7</string>
+    <string name="alternates_for_s">§</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ6</string>
+</resources>
diff --git a/java/res/values-ja/altchars.xml b/java/res/values-ja/altchars.xml
deleted file mode 100644
index d3beafade..000000000
--- a/java/res/values-ja/altchars.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">àáâãäåæ</string>
-    <string name="alternates_for_e">3èéêë</string>
-    <string name="alternates_for_i">ìíîï8</string>
-    <string name="alternates_for_o">òóôõöœø9</string>
-    <string name="alternates_for_u">ùúûü7</string>
-    <string name="alternates_for_s">§ß</string>
-    <string name="alternates_for_n">ñ</string>
-    <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ýÿ6</string>
-</resources>
diff --git a/java/res/values-ja/donottranslate-altchars.xml b/java/res/values-ja/donottranslate-altchars.xml
new file mode 100644
index 000000000..d3beafade
--- /dev/null
+++ b/java/res/values-ja/donottranslate-altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">3èéêë</string>
+    <string name="alternates_for_i">ìíîï8</string>
+    <string name="alternates_for_o">òóôõöœø9</string>
+    <string name="alternates_for_u">ùúûü7</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ6</string>
+</resources>
diff --git a/java/res/values-ko/altchars.xml b/java/res/values-ko/altchars.xml
deleted file mode 100644
index d3beafade..000000000
--- a/java/res/values-ko/altchars.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">àáâãäåæ</string>
-    <string name="alternates_for_e">3èéêë</string>
-    <string name="alternates_for_i">ìíîï8</string>
-    <string name="alternates_for_o">òóôõöœø9</string>
-    <string name="alternates_for_u">ùúûü7</string>
-    <string name="alternates_for_s">§ß</string>
-    <string name="alternates_for_n">ñ</string>
-    <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ýÿ6</string>
-</resources>
diff --git a/java/res/values-ko/donottranslate-altchars.xml b/java/res/values-ko/donottranslate-altchars.xml
new file mode 100644
index 000000000..d3beafade
--- /dev/null
+++ b/java/res/values-ko/donottranslate-altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">3èéêë</string>
+    <string name="alternates_for_i">ìíîï8</string>
+    <string name="alternates_for_o">òóôõöœø9</string>
+    <string name="alternates_for_u">ùúûü7</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ6</string>
+</resources>
diff --git a/java/res/values-nb/altchars.xml b/java/res/values-nb/altchars.xml
deleted file mode 100644
index 6257dfc31..000000000
--- a/java/res/values-nb/altchars.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">äáàâąã</string>
-    <string name="alternates_for_e">3éèêëę€</string>
-    <string name="alternates_for_i">íìîï8</string>
-    <string name="alternates_for_o">öóòôõ9</string>
-    <string name="alternates_for_u">üúùûū7</string>
-    <string name="alternates_for_s">śšşß</string>
-    <string name="alternates_for_n">ńñň</string>
-    <string name="alternates_for_c">çćč</string>
-    <string name="alternates_for_y">ýÿ6</string>
-    <string name="alternates_for_d">ðď</string>
-    <string name="alternates_for_r">ř4</string>
-    <string name="alternates_for_t">ťþ5</string>
-    <string name="alternates_for_z">źžż</string>
-    <string name="alternates_for_l">ł</string>
-    <string name="alternates_for_v">w</string>
-    <string name="alternates_for_oe">œ</string>
-</resources>
diff --git a/java/res/values-nb/donottranslate-altchars.xml b/java/res/values-nb/donottranslate-altchars.xml
new file mode 100644
index 000000000..6257dfc31
--- /dev/null
+++ b/java/res/values-nb/donottranslate-altchars.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">äáàâąã</string>
+    <string name="alternates_for_e">3éèêëę€</string>
+    <string name="alternates_for_i">íìîï8</string>
+    <string name="alternates_for_o">öóòôõ9</string>
+    <string name="alternates_for_u">üúùûū7</string>
+    <string name="alternates_for_s">śšşß</string>
+    <string name="alternates_for_n">ńñň</string>
+    <string name="alternates_for_c">çćč</string>
+    <string name="alternates_for_y">ýÿ6</string>
+    <string name="alternates_for_d">ðď</string>
+    <string name="alternates_for_r">ř4</string>
+    <string name="alternates_for_t">ťþ5</string>
+    <string name="alternates_for_z">źžż</string>
+    <string name="alternates_for_l">ł</string>
+    <string name="alternates_for_v">w</string>
+    <string name="alternates_for_oe">œ</string>
+</resources>
diff --git a/java/res/values-nl/altchars.xml b/java/res/values-nl/altchars.xml
deleted file mode 100644
index d3beafade..000000000
--- a/java/res/values-nl/altchars.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">àáâãäåæ</string>
-    <string name="alternates_for_e">3èéêë</string>
-    <string name="alternates_for_i">ìíîï8</string>
-    <string name="alternates_for_o">òóôõöœø9</string>
-    <string name="alternates_for_u">ùúûü7</string>
-    <string name="alternates_for_s">§ß</string>
-    <string name="alternates_for_n">ñ</string>
-    <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ýÿ6</string>
-</resources>
diff --git a/java/res/values-nl/donottranslate-altchars.xml b/java/res/values-nl/donottranslate-altchars.xml
new file mode 100644
index 000000000..d3beafade
--- /dev/null
+++ b/java/res/values-nl/donottranslate-altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">3èéêë</string>
+    <string name="alternates_for_i">ìíîï8</string>
+    <string name="alternates_for_o">òóôõöœø9</string>
+    <string name="alternates_for_u">ùúûü7</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ6</string>
+</resources>
diff --git a/java/res/values-pl/altchars.xml b/java/res/values-pl/altchars.xml
deleted file mode 100644
index da6b5fd5c..000000000
--- a/java/res/values-pl/altchars.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">ą</string>
-    <string name="alternates_for_e">ę3</string>
-    <string name="alternates_for_i">ìíîï8</string>
-    <string name="alternates_for_o">ó9</string>
-    <string name="alternates_for_u">ùúûü7</string>
-    <string name="alternates_for_s">ś</string>
-    <string name="alternates_for_n">ń</string>
-    <string name="alternates_for_c">ć</string>
-    <string name="alternates_for_y">ýÿ6</string>
-    <string name="alternates_for_z">źż</string>
-    <string name="alternates_for_l">ł</string>
-</resources>
diff --git a/java/res/values-pl/donottranslate-altchars.xml b/java/res/values-pl/donottranslate-altchars.xml
new file mode 100644
index 000000000..da6b5fd5c
--- /dev/null
+++ b/java/res/values-pl/donottranslate-altchars.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">ą</string>
+    <string name="alternates_for_e">ę3</string>
+    <string name="alternates_for_i">ìíîï8</string>
+    <string name="alternates_for_o">ó9</string>
+    <string name="alternates_for_u">ùúûü7</string>
+    <string name="alternates_for_s">ś</string>
+    <string name="alternates_for_n">ń</string>
+    <string name="alternates_for_c">ć</string>
+    <string name="alternates_for_y">ýÿ6</string>
+    <string name="alternates_for_z">źż</string>
+    <string name="alternates_for_l">ł</string>
+</resources>
diff --git a/java/res/values-pt-rPT/altchars.xml b/java/res/values-pt-rPT/altchars.xml
deleted file mode 100644
index d3beafade..000000000
--- a/java/res/values-pt-rPT/altchars.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">àáâãäåæ</string>
-    <string name="alternates_for_e">3èéêë</string>
-    <string name="alternates_for_i">ìíîï8</string>
-    <string name="alternates_for_o">òóôõöœø9</string>
-    <string name="alternates_for_u">ùúûü7</string>
-    <string name="alternates_for_s">§ß</string>
-    <string name="alternates_for_n">ñ</string>
-    <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ýÿ6</string>
-</resources>
diff --git a/java/res/values-pt-rPT/donottranslate-altchars.xml b/java/res/values-pt-rPT/donottranslate-altchars.xml
new file mode 100644
index 000000000..d3beafade
--- /dev/null
+++ b/java/res/values-pt-rPT/donottranslate-altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">3èéêë</string>
+    <string name="alternates_for_i">ìíîï8</string>
+    <string name="alternates_for_o">òóôõöœø9</string>
+    <string name="alternates_for_u">ùúûü7</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ6</string>
+</resources>
diff --git a/java/res/values-pt/altchars.xml b/java/res/values-pt/altchars.xml
deleted file mode 100644
index d3beafade..000000000
--- a/java/res/values-pt/altchars.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">àáâãäåæ</string>
-    <string name="alternates_for_e">3èéêë</string>
-    <string name="alternates_for_i">ìíîï8</string>
-    <string name="alternates_for_o">òóôõöœø9</string>
-    <string name="alternates_for_u">ùúûü7</string>
-    <string name="alternates_for_s">§ß</string>
-    <string name="alternates_for_n">ñ</string>
-    <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ýÿ6</string>
-</resources>
diff --git a/java/res/values-pt/donottranslate-altchars.xml b/java/res/values-pt/donottranslate-altchars.xml
new file mode 100644
index 000000000..d3beafade
--- /dev/null
+++ b/java/res/values-pt/donottranslate-altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">3èéêë</string>
+    <string name="alternates_for_i">ìíîï8</string>
+    <string name="alternates_for_o">òóôõöœø9</string>
+    <string name="alternates_for_u">ùúûü7</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ6</string>
+</resources>
diff --git a/java/res/values-rm/altchars.xml b/java/res/values-rm/altchars.xml
deleted file mode 100644
index f17026fa9..000000000
--- a/java/res/values-rm/altchars.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">àáâãäåæ</string>
-    <string name="alternates_for_e">3èéêë</string>
-    <string name="alternates_for_i">ìíîï8</string>
-    <string name="alternates_for_o">òóöôõœø9</string>
-    <string name="alternates_for_u">ùúûü7</string>
-    <string name="alternates_for_s">§ß</string>
-    <string name="alternates_for_n">ñ</string>
-    <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ýÿ6</string>
-</resources>
diff --git a/java/res/values-rm/donottranslate-altchars.xml b/java/res/values-rm/donottranslate-altchars.xml
new file mode 100644
index 000000000..f17026fa9
--- /dev/null
+++ b/java/res/values-rm/donottranslate-altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">3èéêë</string>
+    <string name="alternates_for_i">ìíîï8</string>
+    <string name="alternates_for_o">òóöôõœø9</string>
+    <string name="alternates_for_u">ùúûü7</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ6</string>
+</resources>
diff --git a/java/res/values-ru/altchars.xml b/java/res/values-ru/altchars.xml
deleted file mode 100644
index 46241a62a..000000000
--- a/java/res/values-ru/altchars.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">àáâãäåæ</string>
-    <string name="alternates_for_e">èéêë</string>
-    <string name="alternates_for_i">ìíîï</string>
-    <string name="alternates_for_o">òóôõöœø</string>
-    <string name="alternates_for_u">ùúûü</string>
-    <string name="alternates_for_s">§ß</string>
-    <string name="alternates_for_n">ñ</string>
-    <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ýÿ</string>
-    <string name="alternates_for_cyrillic_e">ё5</string>
-    <string name="alternates_for_cyrillic_soft_sign">ъ</string>
-</resources>
diff --git a/java/res/values-ru/donottranslate-altchars.xml b/java/res/values-ru/donottranslate-altchars.xml
new file mode 100644
index 000000000..46241a62a
--- /dev/null
+++ b/java/res/values-ru/donottranslate-altchars.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+    <string name="alternates_for_cyrillic_e">ё5</string>
+    <string name="alternates_for_cyrillic_soft_sign">ъ</string>
+</resources>
diff --git a/java/res/values-sv/altchars.xml b/java/res/values-sv/altchars.xml
deleted file mode 100644
index 4d26e6c47..000000000
--- a/java/res/values-sv/altchars.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">áàâąã</string>
-    <string name="alternates_for_e">3éèêëę€</string>
-    <string name="alternates_for_i">íìîï8</string>
-    <string name="alternates_for_o">óòôõ9</string>
-    <string name="alternates_for_u">úùûū7</string>
-    <string name="alternates_for_s">śšşß</string>
-    <string name="alternates_for_n">ńñň</string>
-    <string name="alternates_for_c">çćč</string>
-    <string name="alternates_for_y">ýÿü6</string>
-    <string name="alternates_for_d">ðď</string>
-    <string name="alternates_for_r">ř4</string>
-    <string name="alternates_for_t">ťþ5</string>
-    <string name="alternates_for_z">źžż</string>
-    <string name="alternates_for_l">ł</string>
-    <string name="alternates_for_v">w</string>
-    <string name="alternates_for_a_umlaut">æ</string>
-    <string name="alternates_for_o_umlaut">øœ</string>
-</resources>
diff --git a/java/res/values-sv/donottranslate-altchars.xml b/java/res/values-sv/donottranslate-altchars.xml
new file mode 100644
index 000000000..4d26e6c47
--- /dev/null
+++ b/java/res/values-sv/donottranslate-altchars.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">áàâąã</string>
+    <string name="alternates_for_e">3éèêëę€</string>
+    <string name="alternates_for_i">íìîï8</string>
+    <string name="alternates_for_o">óòôõ9</string>
+    <string name="alternates_for_u">úùûū7</string>
+    <string name="alternates_for_s">śšşß</string>
+    <string name="alternates_for_n">ńñň</string>
+    <string name="alternates_for_c">çćč</string>
+    <string name="alternates_for_y">ýÿü6</string>
+    <string name="alternates_for_d">ðď</string>
+    <string name="alternates_for_r">ř4</string>
+    <string name="alternates_for_t">ťþ5</string>
+    <string name="alternates_for_z">źžż</string>
+    <string name="alternates_for_l">ł</string>
+    <string name="alternates_for_v">w</string>
+    <string name="alternates_for_a_umlaut">æ</string>
+    <string name="alternates_for_o_umlaut">øœ</string>
+</resources>
diff --git a/java/res/values-tr/altchars.xml b/java/res/values-tr/altchars.xml
deleted file mode 100644
index 4200d949e..000000000
--- a/java/res/values-tr/altchars.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">àáâãäåæ</string>
-    <string name="alternates_for_e">3èéêë</string>
-    <string name="alternates_for_i">ìíîï8</string>
-    <string name="alternates_for_o">öòóôõœø9</string>
-    <string name="alternates_for_u">üùúû7</string>
-    <string name="alternates_for_s">ş§ß</string>
-    <string name="alternates_for_n">ñ</string>
-    <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ýÿ6</string>
-    <string name="alternates_for_g">ğ</string>
-</resources>
\ No newline at end of file
diff --git a/java/res/values-tr/donottranslate-altchars.xml b/java/res/values-tr/donottranslate-altchars.xml
new file mode 100644
index 000000000..4200d949e
--- /dev/null
+++ b/java/res/values-tr/donottranslate-altchars.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">3èéêë</string>
+    <string name="alternates_for_i">ìíîï8</string>
+    <string name="alternates_for_o">öòóôõœø9</string>
+    <string name="alternates_for_u">üùúû7</string>
+    <string name="alternates_for_s">ş§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ6</string>
+    <string name="alternates_for_g">ğ</string>
+</resources>
\ No newline at end of file
diff --git a/java/res/values-zh-rCN/altchars.xml b/java/res/values-zh-rCN/altchars.xml
deleted file mode 100644
index c165b11c5..000000000
--- a/java/res/values-zh-rCN/altchars.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">àáâãäåæ</string>
-    <string name="alternates_for_e">èéêë</string>
-    <string name="alternates_for_i">ìíîï</string>
-    <string name="alternates_for_o">òóôõöœø</string>
-    <string name="alternates_for_u">ùúûü</string>
-    <string name="alternates_for_s">§ß</string>
-    <string name="alternates_for_n">ñ</string>
-    <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ýÿ</string>
-</resources>
diff --git a/java/res/values-zh-rCN/donottranslate-altchars.xml b/java/res/values-zh-rCN/donottranslate-altchars.xml
new file mode 100644
index 000000000..c165b11c5
--- /dev/null
+++ b/java/res/values-zh-rCN/donottranslate-altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values-zh-rTW/altchars.xml b/java/res/values-zh-rTW/altchars.xml
deleted file mode 100644
index c165b11c5..000000000
--- a/java/res/values-zh-rTW/altchars.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">àáâãäåæ</string>
-    <string name="alternates_for_e">èéêë</string>
-    <string name="alternates_for_i">ìíîï</string>
-    <string name="alternates_for_o">òóôõöœø</string>
-    <string name="alternates_for_u">ùúûü</string>
-    <string name="alternates_for_s">§ß</string>
-    <string name="alternates_for_n">ñ</string>
-    <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ýÿ</string>
-</resources>
diff --git a/java/res/values-zh-rTW/donottranslate-altchars.xml b/java/res/values-zh-rTW/donottranslate-altchars.xml
new file mode 100644
index 000000000..c165b11c5
--- /dev/null
+++ b/java/res/values-zh-rTW/donottranslate-altchars.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+</resources>
diff --git a/java/res/values/altchars.xml b/java/res/values/altchars.xml
deleted file mode 100644
index bba7282c9..000000000
--- a/java/res/values/altchars.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="alternates_for_a">àáâãäåæ</string>
-    <string name="alternates_for_e">èéêë</string>
-    <string name="alternates_for_i">ìíîï</string>
-    <string name="alternates_for_o">òóôõöœø</string>
-    <string name="alternates_for_u">ùúûü</string>
-    <string name="alternates_for_s">§ß</string>
-    <string name="alternates_for_n">ñ</string>
-    <string name="alternates_for_c">ç</string>
-    <string name="alternates_for_y">ýÿ</string>
-    <string name="alternates_for_q">1</string>
-    <string name="alternates_for_w">2</string>
-    <string name="alternates_for_d"></string>
-    <string name="alternates_for_r">4</string>
-    <string name="alternates_for_t">5</string>
-    <string name="alternates_for_z"></string>
-    <string name="alternates_for_l"></string>
-    <string name="alternates_for_g"></string>
-    <string name="alternates_for_p">0</string>
-    <string name="alternates_for_v"></string>
-    <string name="alternates_for_ae"></string>
-    <string name="alternates_for_oe"></string>
-    <string name="alternates_for_cyrillic_e"></string>
-    <string name="alternates_for_cyrillic_soft_sign"></string>
-    <string name="alternates_for_a_umlaut"></string>
-    <string name="alternates_for_o_umlaut"></string>
-</resources>
diff --git a/java/res/values/donottranslate-altchars.xml b/java/res/values/donottranslate-altchars.xml
new file mode 100644
index 000000000..bba7282c9
--- /dev/null
+++ b/java/res/values/donottranslate-altchars.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="alternates_for_a">àáâãäåæ</string>
+    <string name="alternates_for_e">èéêë</string>
+    <string name="alternates_for_i">ìíîï</string>
+    <string name="alternates_for_o">òóôõöœø</string>
+    <string name="alternates_for_u">ùúûü</string>
+    <string name="alternates_for_s">§ß</string>
+    <string name="alternates_for_n">ñ</string>
+    <string name="alternates_for_c">ç</string>
+    <string name="alternates_for_y">ýÿ</string>
+    <string name="alternates_for_q">1</string>
+    <string name="alternates_for_w">2</string>
+    <string name="alternates_for_d"></string>
+    <string name="alternates_for_r">4</string>
+    <string name="alternates_for_t">5</string>
+    <string name="alternates_for_z"></string>
+    <string name="alternates_for_l"></string>
+    <string name="alternates_for_g"></string>
+    <string name="alternates_for_p">0</string>
+    <string name="alternates_for_v"></string>
+    <string name="alternates_for_ae"></string>
+    <string name="alternates_for_oe"></string>
+    <string name="alternates_for_cyrillic_e"></string>
+    <string name="alternates_for_cyrillic_soft_sign"></string>
+    <string name="alternates_for_a_umlaut"></string>
+    <string name="alternates_for_o_umlaut"></string>
+</resources>
-- 
cgit v1.2.3-83-g751a