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

Commit 3b0f2bf1 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Support addtionalMoreKeys"

parents 6029b43a 15c99e9f

java/res/values-ar/donottranslate-more-keys.xml

+10 −10
Original line number Diff line number Diff line
@@ -50,18 +50,18 @@ 
    <string name="keylabel_for_symbols_8">"٨"</string>

    <string name="keylabel_for_symbols_9">"٩"</string>

    <string name="keylabel_for_symbols_0">"٠"</string>

    <string name="more_keys_for_symbols_1">1</string>

    <string name="more_keys_for_symbols_2">2</string>

    <string name="more_keys_for_symbols_3">3</string>

    <string name="more_keys_for_symbols_4">4</string>

    <string name="more_keys_for_symbols_5">5</string>

    <string name="more_keys_for_symbols_6">6</string>

    <string name="more_keys_for_symbols_7">7</string>

    <string name="more_keys_for_symbols_8">8</string>

    <string name="more_keys_for_symbols_9">9</string>

    <string name="additional_more_keys_for_symbols_1">1</string>

    <string name="additional_more_keys_for_symbols_2">2</string>

    <string name="additional_more_keys_for_symbols_3">3</string>

    <string name="additional_more_keys_for_symbols_4">4</string>

    <string name="additional_more_keys_for_symbols_5">5</string>

    <string name="additional_more_keys_for_symbols_6">6</string>

    <string name="additional_more_keys_for_symbols_7">7</string>

    <string name="additional_more_keys_for_symbols_8">8</string>

    <string name="additional_more_keys_for_symbols_9">9</string>

    <!-- \u066b: ARABIC DECIMAL SEPARATOR

         \u066c: ARABIC THOUSANDS SEPARATOR -->

    <string name="more_keys_for_symbols_0">0,\u066b,\u066c</string>

    <string name="additional_more_keys_for_symbols_0">0,\u066b,\u066c</string>

    <string name="keylabel_for_comma">\u060c</string>

    <string name="keylabel_for_f1">\u060c</string>

    <string name="keylabel_for_symbols_question">\u061f</string>

java/res/values-ca/donottranslate-more-keys.xml

+4 −4
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ 
-->

<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_i">8,í,ï,ì,î,į,ī</string>

    <string name="more_keys_for_o">9,ò,ó,ö,ô,õ,ø,œ,ō,º</string>

    <string name="more_keys_for_u">7,ú,ü,ù,û,ū</string>

    <string name="more_keys_for_e">è,é,ë,ê,ę,ė,ē</string>

    <string name="more_keys_for_i">í,ï,ì,î,į,ī</string>

    <string name="more_keys_for_o">ò,ó,ö,ô,õ,ø,œ,ō,º</string>

    <string name="more_keys_for_u">ú,ü,ù,û,ū</string>

    <string name="more_keys_for_n">ñ,ń</string>

    <string name="more_keys_for_c">ç,ć,č</string>

    <string name="more_keys_for_l">ŀ,ł</string>

java/res/values-cs/donottranslate-more-keys.xml

+7 −7
Original line number Diff line number Diff line
@@ -19,16 +19,16 @@ 
-->

<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_i">8,í,î,ï,ì,į,ī</string>

    <string name="more_keys_for_o">9,ó,ö,ô,ò,õ,œ,ø,ō</string>

    <string name="more_keys_for_u">7,ú,ů,û,ü,ù,ū</string>

    <string name="more_keys_for_e">é,ě,è,ê,ë,ę,ė,ē</string>

    <string name="more_keys_for_i">í,î,ï,ì,į,ī</string>

    <string name="more_keys_for_o">ó,ö,ô,ò,õ,œ,ø,ō</string>

    <string name="more_keys_for_u">ú,ů,û,ü,ù,ū</string>

    <string name="more_keys_for_s">š,ß,ś</string>

    <string name="more_keys_for_n">ň,ñ,ń</string>

    <string name="more_keys_for_c">č,ç,ć</string>

    <string name="more_keys_for_y">ý,ÿ</string>

    <string name="more_keys_for_d">ď</string>

    <string name="more_keys_for_r">4,ř</string>

    <string name="more_keys_for_t">5,ť</string>

    <string name="more_keys_for_z">6,ž,ź,ż</string>

    <string name="more_keys_for_r">ř</string>

    <string name="more_keys_for_t">ť</string>

    <string name="more_keys_for_z">ž,ź,ż</string>

</resources>

java/res/values-da/donottranslate-more-keys.xml

+5 −5
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ 
-->

<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_i">8,í,ï</string>

    <string name="more_keys_for_o">9,ó,ô,ò,õ,œ,ō</string>

    <string name="more_keys_for_u">7,ú,ü,û,ù,ū</string>

    <string name="more_keys_for_e">é,ë</string>

    <string name="more_keys_for_i">í,ï</string>

    <string name="more_keys_for_o">ó,ô,ò,õ,œ,ō</string>

    <string name="more_keys_for_u">ú,ü,û,ù,ū</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_y">ý,ÿ</string>

    <string name="more_keys_for_d">ð</string>

    <string name="more_keys_for_l">ł</string>

    <string name="keylabel_for_scandinavia_row1_11">å</string>

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

deleted100644 → 0
+0 −23
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_y">6</string>

    <string name="more_keys_for_z"></string>

</resources>