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

Commit d71c86ae authored by Kyrylo Mikos's avatar Kyrylo Mikos
Browse files

LatinIME: Fix one more merge conflict. 

Symblol more_keys_for_currency_general shoud be renamed to
more_keys_for_currency_generic.

Change-Id: I943e4022c9b338fa4f2377386582dc3c86bd42d1
parent 13743d3a

java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ public final class KeyboardTextsSet { 
        /* 46 */ "double_angle_quotes",

        /* 47 */ "more_keys_for_currency_dollar",

        /* 48 */ "keylabel_for_currency_generic",

        /* 49 */ "more_keys_for_currency_general",

        /* 49 */ "more_keys_for_currency_generic",

        /* 50 */ "more_keys_for_punctuation",

        /* 51 */ "more_keys_for_star",

        /* 52 */ "more_keys_for_bullet",

tools/maketext/res/values/donottranslate-more-keys.xml

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
         U+20B9: "₹" RUPEE SIGN -->

    <string name="more_keys_for_currency_dollar">&#x00A2;,&#x00A3;,&#x20AC;,&#x00A5;,&#x20B1;,&#x20B9;</string>

    <string name="keylabel_for_currency_generic">$</string>

    <string name="more_keys_for_currency_general">&#x00A2;,$,&#x20AC;,&#x00A3;,&#x00A5;,&#x20B1;,&#x20B9;</string>

    <string name="more_keys_for_currency_generic">&#x00A2;,$,&#x20AC;,&#x00A3;,&#x00A5;,&#x20B1;,&#x20B9;</string>

    <string name="more_keys_for_punctuation">"!fixedColumnOrder!8,\",\',#,-,:,!,\\,,\?,\@,&amp;,\\%,+,;,/,(,)"</string>

    <!-- U+2020: "†" DAGGER

         U+2021: "‡" DOUBLE DAGGER