Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed043c61 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android Git Automerger
Browse files

am 4b23789e: Merge "DO NOT MERGE. Fix more keys for fr_CA and fr_CH. Also... 

am 4b23789e: Merge "DO NOT MERGE.  Fix more keys for fr_CA and fr_CH.  Also tidy up more keys for de_ZZ as well." into ics-mr1

* commit '4b23789e':
  DO NOT MERGE.  Fix more keys for fr_CA and fr_CH.  Also tidy up more keys for de_ZZ as well.
parents e7fecbc5 4b23789e

java/res/values-de-rZZ/donottranslate-more-keys.xml

+0 −6
Original line number Diff line number Diff line
@@ -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>

java/res/values-fr-rCA/donottranslate-more-keys.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?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>

java/res/values-fr-rCH/donottranslate-more-keys.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?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>