From 2168795ea6255fb21216dfccd28db82d2add0f6c Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Sat, 24 Dec 2011 17:29:02 +0900
Subject: [PATCH] DO NOT MERGE.  Fix more keys for fr_CA and fr_CH.  Also tidy
 up more keys for de_ZZ as well.

This is a cherry pick of http://android-git.corp.google.com/g/156427 from master.

bug: 5800592
Change-Id: Ifb249e8b6d432bbd1a5faf1a8731deea02962d39
---
 .../donottranslate-more-keys.xml              |  6 -----
 .../donottranslate-more-keys.xml              | 25 ++++++++++++++++++
 .../donottranslate-more-keys.xml              | 26 +++++++++++++++++++
 3 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 java/res/values-fr-rCA/donottranslate-more-keys.xml
 create mode 100644 java/res/values-fr-rCH/donottranslate-more-keys.xml

diff --git a/java/res/values-de-rZZ/donottranslate-more-keys.xml b/java/res/values-de-rZZ/donottranslate-more-keys.xml
index 06e76b03c..e7ec5e152 100644
--- a/java/res/values-de-rZZ/donottranslate-more-keys.xml
+++ b/java/res/values-de-rZZ/donottranslate-more-keys.xml
@@ -18,12 +18,6 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="more_keys_for_a">ä,â,à,á,æ,ã,å,ā</string>
-    <string name="more_keys_for_e">3,ė</string>
-    <string name="more_keys_for_o">9,ö,ô,ò,ó,õ,œ,ø,ō</string>
-    <string name="more_keys_for_u">7,ü,û,ù,ú,ū</string>
-    <string name="more_keys_for_s">ß,ś,š</string>
-    <string name="more_keys_for_n">ñ,ń</string>
     <string name="more_keys_for_y">6</string>
     <string name="more_keys_for_z"></string>
 </resources>
diff --git a/java/res/values-fr-rCA/donottranslate-more-keys.xml b/java/res/values-fr-rCA/donottranslate-more-keys.xml
new file mode 100644
index 000000000..80e9d9346
--- /dev/null
+++ b/java/res/values-fr-rCA/donottranslate-more-keys.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, 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="more_keys_for_a">à,â,æ,á,ä,ã,å,ā,ª</string>
+    <string name="more_keys_for_q">1</string>
+    <string name="more_keys_for_w">2</string>
+    <string name="more_keys_for_z"></string>
+</resources>
diff --git a/java/res/values-fr-rCH/donottranslate-more-keys.xml b/java/res/values-fr-rCH/donottranslate-more-keys.xml
new file mode 100644
index 000000000..561c5e52f
--- /dev/null
+++ b/java/res/values-fr-rCH/donottranslate-more-keys.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, 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="more_keys_for_a">à,â,æ,á,ä,ã,å,ā,ª</string>
+    <string name="more_keys_for_y">ÿ</string>
+    <string name="more_keys_for_q">1</string>
+    <string name="more_keys_for_w">2</string>
+    <string name="more_keys_for_z">6</string>
+</resources>