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

Commit 363e22f3 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'gingerbread' of... 

Merge branch 'gingerbread' of git://android.git.kernel.org/platform/packages/inputmethods/LatinIME into upstream-2.3.5

Conflicts:
	java/res/values-zh-rTW/strings.xml
	java/src/com/android/inputmethod/latin/InputLanguageSelection.java

Change-Id: I55b8626d8f5afc6aedddccdd3822497540a1fdb5
parents 6f8c6897 52fbad88

java/res/values-el/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
    <string name="tip_to_close_symbols" msgid="5227724217206927185"><b>"Επιστρέψτε στα γράμματα αγγίζοντας ξανά αυτό το πλήκτρο"</b></string>

    <string name="tip_to_launch_settings" msgid="8402961128983196128"><b>"Αγγίξτε και κρατήστε πατημένο αυτό το πληκτρολόγιο για να αλλάξετε τις ρυθμίσεις πληκτρολογίου, όπως η αυτόματη συμπλήρωση"</b></string>

    <string name="tip_to_start_typing" msgid="7213843601369174313"><b>"Δοκιμάστε το!"</b></string>

    <string name="label_go_key" msgid="1635148082137219148">"Μετάβαση"</string>

    <string name="label_go_key" msgid="1635148082137219148">"Μετ."</string>

    <string name="label_next_key" msgid="362972844525672568">"Επόμενο"</string>

    <string name="label_done_key" msgid="2441578748772529288">"Τέλος"</string>

    <string name="label_send_key" msgid="2815056534433717444">"Αποστολή"</string>

java/res/values-hr/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
    <string name="label_phone_key" msgid="4275497665515080551">"123"</string>

    <string name="label_alpha_key" msgid="8864943487292437456">"ABC"</string>

    <string name="label_alt_key" msgid="2846315350346694811">"ALT"</string>

    <string name="voice_warning_title" msgid="4419354150908395008">"Glasovni unos"</string>

    <string name="voice_warning_title" msgid="4419354150908395008">"Glasovni ulaz"</string>

    <string name="voice_warning_locale_not_supported" msgid="637923019716442333">"Vaš jezik trenutno nije podržan za glasovni unos, ali radi za engleski."</string>

    <string name="voice_warning_may_not_understand" msgid="4611518823070986445">"Glasovni unos je pokusna značajka koja koristi Googleovo umreženo prepoznavanje govora."</string>

    <string name="voice_warning_how_to_turn_off" msgid="5652369578498701761">"Za isključivanje glasovnog unosa idite na postavke tipkovnice."</string>
@@ -84,7 +84,7 @@ 
    <string name="voice_punctuation_hint" msgid="1611389463237317754"><b>"Savjet:"</b>" Sljedeći put pokušajte izgovoriti znakove interpunkcije poput \"točka, \"zarez\" ili \"upitnik\"."</string>

    <string name="cancel" msgid="6830980399865683324">"Odustani"</string>

    <string name="ok" msgid="7898366843681727667">"U redu"</string>

    <string name="voice_input" msgid="2466640768843347841">"Glasovni unos"</string>

    <string name="voice_input" msgid="2466640768843347841">"Glasovni ulaz"</string>

  <string-array name="voice_input_modes">

    <item msgid="1349082139076086774">"Na glavnoj tipkovnici"</item>

    <item msgid="8529385602829095903">"Na tipkovnici sa simbolima"</item>

java/res/values-nl/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
    <string name="tip_to_close_symbols" msgid="5227724217206927185"><b>"Ga terug naar letters door deze toets nogmaals aan te raken"</b></string>

    <string name="tip_to_launch_settings" msgid="8402961128983196128"><b>"Blijf deze toets aanraken om toetsenbordinstellingen te wijzigen, zoals auto-aanvullen"</b></string>

    <string name="tip_to_start_typing" msgid="7213843601369174313"><b>"Probeer het zelf!"</b></string>

    <string name="label_go_key" msgid="1635148082137219148">"Beginnen"</string>

    <string name="label_go_key" msgid="1635148082137219148">"Start"</string>

    <string name="label_next_key" msgid="362972844525672568">"Volgende"</string>

    <string name="label_done_key" msgid="2441578748772529288">"Gereed"</string>

    <string name="label_send_key" msgid="2815056534433717444">"Verzenden"</string>

java/res/values-ro/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
    <string name="tip_to_close_symbols" msgid="5227724217206927185"><b>"Reveniţi la litere prin atingerea acestei taste din nou"</b></string>

    <string name="tip_to_launch_settings" msgid="8402961128983196128"><b>"Apăsaţi şi ţineţi apăsată această tastă pentru a schimba setările tastaturii, cum ar fi completarea automată"</b></string>

    <string name="tip_to_start_typing" msgid="7213843601369174313"><b>"Încercaţi!"</b></string>

    <string name="label_go_key" msgid="1635148082137219148">"Accesaţi"</string>

    <string name="label_go_key" msgid="1635148082137219148">"OK"</string>

    <string name="label_next_key" msgid="362972844525672568">"Înainte"</string>

    <string name="label_done_key" msgid="2441578748772529288">"Terminat"</string>

    <string name="label_send_key" msgid="2815056534433717444">"Trimiteţi"</string>

java/res/values-tl/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
    <string name="tip_to_close_symbols" msgid="5227724217206927185"><b>"Pumunta muli sa mga titik sa pamamagitan ng muling paggalaw sa key na ito"</b></string>

    <string name="tip_to_launch_settings" msgid="8402961128983196128"><b>"Galawin &amp; pinduting nang matagal ang key na ito upang baguhin ang mga setting ng keyboard, tulad ng awtomatikong pagkumpleto"</b></string>

    <string name="tip_to_start_typing" msgid="7213843601369174313"><b>"Subukan ito!"</b></string>

    <string name="label_go_key" msgid="1635148082137219148">"Pumunta"</string>

    <string name="label_go_key" msgid="1635148082137219148">"Punta"</string>

    <string name="label_next_key" msgid="362972844525672568">"Susunod"</string>

    <string name="label_done_key" msgid="2441578748772529288">"Tapos na"</string>

    <string name="label_send_key" msgid="2815056534433717444">"Ipadala"</string>