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

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

Merge "Add tablet keyboards supported in Gingerbread" into honeycomb

parents 69f8b148 79b965e0
Loading
Loading
Loading
Loading
+29 −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="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_n">ñ,ń</string>
    <string name="alternates_for_c">ç,ć,č</string>
    <string name="alternates_for_l">ŀ,ł</string>
</resources>
+10 −9
Original line number Diff line number Diff line
@@ -18,16 +18,17 @@
*/
-->
<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_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_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_z">6,ž,ź,ż</string>
</resources>
+10 −15
Original line number Diff line number Diff line
@@ -18,23 +18,18 @@
*/
-->
<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_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_y">6,ý,ÿ</string>
    <string name="alternates_for_d">ð</string>
    <string name="alternates_for_l">ł</string>
    <string name="alternates_for_v">w</string>
    <string name="keylabel_for_scandinavia_row2_10">æ</string>
    <string name="keylabel_for_scandinavia_row2_11">ø</string>
    <string name="alternates_for_scandinavia_row2_10">ä</string>
    <string name="alternates_for_scandinavia_row2_11">ö</string>
    <string name="alternates_for_scandinavia_row2_11">ö</string>
</resources>
+7 −3
Original line number Diff line number Diff line
@@ -18,8 +18,12 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="alternates_for_a">ä</string>
    <string name="alternates_for_o">9,ö</string>
    <string name="alternates_for_y">ý,ÿ</string>
    <string name="alternates_for_a">ä,â,à,á,æ,ã,å,ā</string>
    <string name="alternates_for_e">3,ė</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_y"></string>
    <string name="alternates_for_z">6</string>
</resources>
+6 −4
Original line number Diff line number Diff line
@@ -18,9 +18,11 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="alternates_for_a">à,á,â,ã,ä,å,ā</string>
    <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_i">8,î,ï,í,ī,ì</string>
    <string name="alternates_for_o">9,ô,ö,ò,ó,œ,ø,ō,õ</string>
    <string name="alternates_for_u">7,û,ü,ù,ú,ū</string>
    <string name="alternates_for_n">ñ</string>
    <string name="alternates_for_c">ç</string>
</resources>
Loading