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

Commit d66eede8 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 HEAD
parents b6684441 d060ed99

java/res/values-ca/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
    <string name="prediction_summary" msgid="459788228830873110">"Activa l\'emplenament automàtic mentre s\'escriu"</string>

    <string name="auto_complete_dialog_title" msgid="2172048590607201920">"Emplenament automàtic"</string>

    <string name="prediction_landscape" msgid="4874601565593216183">"Augmenta la mida del camp de text"</string>

    <string name="prediction_landscape_summary" msgid="6736551095997839472">"Oculta els suggeriments de paraules en visualització horitzontal"</string>

    <string name="prediction_landscape_summary" msgid="6736551095997839472">"Amaga els suggeriments de paraules en visualització horitzontal"</string>

    <string name="auto_cap" msgid="1719746674854628252">"Majúscules automàtiques"</string>

    <string name="auto_cap_summary" msgid="3260681697600786825">"Posa l\'inici d\'una frase en majúscula"</string>

    <string name="auto_punctuate" msgid="7276672334264521751">"Puntuació automàtica"</string>

java/res/values-cs/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ 
    <string name="has_dictionary" msgid="6071847973466625007">"K dispozici je slovník"</string>

    <string name="prefs_enable_log" msgid="6620424505072963557">"Aktivovat zasílání statistik užívání a zpráv o selhání"</string>

    <string name="prefs_description_log" msgid="5827825607258246003">"Automatickým zasíláním statistik o užívání editoru zadávání dat a zpráv o jeho selhání do Googlu můžete přispět k vylepšení tohoto nástroje."</string>

    <string name="prefs_enable_recorrection" msgid="4588408906649533582">"Aktivovat opravy dotykem"</string>

    <string name="prefs_enable_recorrection" msgid="4588408906649533582">"Dotykem aktivovat opravy"</string>

    <string name="prefs_enable_recorrection_summary" msgid="1056068922330206170">"Opravy napsaných slov dotykem"</string>

    <string name="keyboard_layout" msgid="437433231038683666">"Motiv klávesnice"</string>

    <string name="subtype_mode_keyboard" msgid="2242090416595003881">"klávesnice"</string>

java/res/values-es-rUS/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    <string name="english_ime_input_options" msgid="3909945612939668554">"Opciones de entrada"</string>

    <string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibrar al pulsar teclas"</string>

    <string name="sound_on_keypress" msgid="6093592297198243644">"Sonar al pulsar las teclas"</string>

    <string name="popup_on_keypress" msgid="123894815723512944">"Aviso emergente sobre keypress"</string>

    <string name="popup_on_keypress" msgid="123894815723512944">"Aviso emergente al pulsar tecla"</string>

    <string name="hit_correction" msgid="4855351009261318389">"Corregir errores de escritura"</string>

    <string name="hit_correction_summary" msgid="8761701873008070796">"Habilitar corrección de error de entrada"</string>

    <string name="hit_correction_land" msgid="2567691684825205448">"Errores de entrada apaisada"</string>

java/res/values-fr/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ 
    <string name="show_suggestions" msgid="507074425254289133">"Afficher les suggestions"</string>

    <string name="show_suggestions_summary" msgid="1989672863935759654">"Afficher les suggestions de terme lors de la saisie"</string>

    <string name="auto_complete" msgid="1103196318775486023">"Saisie semi-automatique"</string>

    <string name="auto_complete_summary" msgid="6113149638718274624">"Insérer auto. le terme surligné avec barre espace/ponctuation"</string>

    <string name="prefs_settings_key" msgid="4623341240804046498">"Afficher touche paramètr."</string>

    <string name="auto_complete_summary" msgid="6113149638718274624">"Insérer autom. terme surligné (pression sur barre espace/ponctuation)"</string>

    <string name="prefs_settings_key" msgid="4623341240804046498">"Afficher touche param."</string>

    <string name="settings_key_mode_auto_name" msgid="2993460277873684680">"Automatique"</string>

    <string name="settings_key_mode_always_show_name" msgid="3047567041784760575">"Toujours afficher"</string>

    <string name="settings_key_mode_always_hide_name" msgid="7833948046716923994">"Toujours masquer"</string>
@@ -132,7 +132,7 @@ 
    <string name="has_dictionary" msgid="6071847973466625007">"Dictionnaire disponible"</string>

    <string name="prefs_enable_log" msgid="6620424505072963557">"Autoriser les commentaires des utilisateurs"</string>

    <string name="prefs_description_log" msgid="5827825607258246003">"Contribuer à l\'amélioration de cet éditeur du mode de saisie grâce à l\'envoi automatique de statistiques d\'utilisation et de rapports d\'incident à Google."</string>

    <string name="prefs_enable_recorrection" msgid="4588408906649533582">"Appuyer pour corriger les suggestions"</string>

    <string name="prefs_enable_recorrection" msgid="4588408906649533582">"Appuyer pour corriger"</string>

    <string name="prefs_enable_recorrection_summary" msgid="1056068922330206170">"Appuyer sur les mots saisis pour les corriger"</string>

    <string name="keyboard_layout" msgid="437433231038683666">"Thème du clavier"</string>

    <string name="subtype_mode_keyboard" msgid="2242090416595003881">"clavier"</string>

java/res/values-it/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
    <string name="obey_haptic_feedback_summary">Nessuna vibrazione se il feedback aptico non è attivo nelle impostazioni di sistema</string>



    <string name="sound_on_keypress" msgid="6093592297198243644">"Suono tasti"</string>

    <string name="popup_on_keypress" msgid="123894815723512944">"Popup alla pressione di un tasto"</string>

    <string name="popup_on_keypress" msgid="123894815723512944">"Popup sui tasti"</string>

    <string name="hit_correction" msgid="4855351009261318389">"Correggi errori di digitazione"</string>

    <string name="hit_correction_summary" msgid="8761701873008070796">"Attiva la correzione degli errori di inserimento"</string>

    <string name="hit_correction_land" msgid="2567691684825205448">"Errori di inserimento in visualizzazione orizzontale"</string>
@@ -61,7 +61,7 @@ 
    <string name="show_suggestions_summary" msgid="1989672863935759654">"Visualizza le parole suggerite durante la digitazione"</string>

    <string name="auto_complete" msgid="1103196318775486023">"Completamento autom."</string>

    <string name="auto_complete_summary" msgid="6113149638718274624">"Barra spaziatrice e punteggiatura inseriscono la parola evidenziata"</string>

    <string name="prefs_settings_key" msgid="4623341240804046498">"Mostra tasto impostazioni"</string>

    <string name="prefs_settings_key" msgid="4623341240804046498">"Mostra tasto impostaz."</string>

    <string name="settings_key_mode_auto_name" msgid="2993460277873684680">"Automatico"</string>

    <string name="settings_key_mode_always_show_name" msgid="3047567041784760575">"Mostra sempre"</string>

    <string name="settings_key_mode_always_hide_name" msgid="7833948046716923994">"Nascondi sempre"</string>
@@ -145,7 +145,7 @@ 
    <string name="has_dictionary" msgid="6071847973466625007">"Dizionario disponibile"</string>

    <string name="prefs_enable_log" msgid="6620424505072963557">"Attiva commenti degli utenti"</string>

    <string name="prefs_description_log" msgid="5827825607258246003">"Aiuta a migliorare l\'editor del metodo di inserimento inviando automaticamente a Google statistiche sull\'utilizzo e segnalazioni sugli arresti anomali."</string>

    <string name="prefs_enable_recorrection" msgid="4588408906649533582">"Tocca per correggere le parole"</string>

    <string name="prefs_enable_recorrection" msgid="4588408906649533582">"Tocca per correggere"</string>

    <string name="prefs_enable_recorrection_summary" msgid="1056068922330206170">"Tocca le parole inserite per correggerle"</string>

    <string name="keyboard_layout" msgid="437433231038683666">"Tema della tastiera"</string>

    <string name="subtype_mode_keyboard" msgid="2242090416595003881">"tastiera"</string>