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

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

Merge "Update keyboard settings wording" into jb-mr1-dev

parents 1c820c41 9458e71c
Loading
Loading
Loading
Loading
+13 −8
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@
    <!-- Category title for text prediction -->
    <string name="correction_category">Text correction</string>

    <!-- Category title for gesture typing -->
    <string name="gesture_typing_category">Gesture typing</string>

    <!-- Category title for misc options  -->
    <string name="misc_category">Other options</string>

@@ -80,6 +83,8 @@

    <!-- Option to enable auto capitalization of sentences -->
    <string name="auto_cap">Auto-capitalization</string>
    <!-- Description for option to enable auto capitalization of sentences -->
    <string name="auto_cap_summary">Capitalize the first word of each sentence</string>

    <!-- Option to configure dictionaries -->
    <string name="configure_dictionaries_title">Add-on dictionaries</string>
@@ -91,12 +96,12 @@
    <!-- Description for show suggestions -->
    <string name="prefs_show_suggestions_summary">Display suggested words while typing</string>
    <string name="prefs_suggestion_visibility_show_name">Always show</string>
    <string name="prefs_suggestion_visibility_show_only_portrait_name">Show on portrait mode</string>
    <string name="prefs_suggestion_visibility_show_only_portrait_name">Show in portrait mode</string>
    <string name="prefs_suggestion_visibility_hide_name">Always hide</string>

    <!-- Option to decide the auto correction threshold score -->
    <!-- Option to enable auto correction [CHAR LIMIT=20]-->
    <string name="auto_correction">Auto correction</string>
    <string name="auto_correction">Auto-correction</string>
    <!-- Description for auto correction [CHAR LIMIT=65 (two lines) or 30 (fits on one line, preferable)] -->
    <string name="auto_correction_summary">Spacebar and punctuation automatically correct mistyped words</string>
    <!-- Option to disable auto correction. [CHAR LIMIT=20] -->
@@ -109,20 +114,20 @@
    <string name="auto_correction_threshold_mode_very_aggeressive">Very aggressive</string>

    <!-- Option to enable using next word suggestions. After the user types a space, with this option on, the keyboard will try to predict the next word. -->
    <string name="bigram_prediction">Next word suggestions</string>
    <string name="bigram_prediction">Next-word suggestions</string>
    <!-- Description for "next word suggestion" option. This displays suggestions even when there is no input, based on the previous word. -->
    <string name="bigram_prediction_summary">Based on previous word</string>
    <string name="bigram_prediction_summary">Use the previous word in making suggestions</string>

    <!-- Option to enable gesture input. The user can input a word by tracing the letters of a word without releasing the finger from the screen. [CHAR LIMIT=30]-->
    <string name="gesture_input">Gesture input</string>
    <string name="gesture_input">Enable gesture typing</string>
    <!-- Description for "gesture_input" option. The user can input a word by tracing the letters of a word without releasing the finger from the screen. [CHAR LIMIT=65]-->
    <string name="gesture_input_summary">Input a word by tracing the letters of a word</string>
    <string name="gesture_input_summary">Input a word by sliding through the letters</string>
    <!-- Option to enable gesture trail preview. The user can see a trail of the gesture during gesture input. [CHAR LIMIT=30]-->
    <string name="gesture_preview_trail">Show gesture trail</string>
    <!-- Option to enable gesture floating text preview. The user can see a suggested word floating under the moving finger during a gesture input. [CHAR LIMIT=30]-->
    <string name="gesture_floating_preview_text">Show gesture word</string>
    <string name="gesture_floating_preview_text">Dynamic floating preview</string>
    <!-- Description for "gesture_floating_preview_text" option. The user can see a suggested word floating under the moving finger during a gesture input. [CHAR LIMIT=65]-->
    <string name="gesture_floating_preview_text_summary">Show floating preview word with gesture</string>
    <string name="gesture_floating_preview_text_summary">See the suggested word while gesturing</string>

    <!-- Indicates that a word has been added to the dictionary -->
    <string name="added_word"><xliff:g id="word">%s</xliff:g> : Saved</string>
+22 −17
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@
        <CheckBoxPreference
            android:key="auto_cap"
            android:title="@string/auto_cap"
            android:summary="@string/auto_cap_summary"
            android:persistent="true"
            android:defaultValue="true" />
        <CheckBoxPreference
@@ -77,6 +78,27 @@
            android:entries="@array/prefs_suggestion_visibilities"
            android:defaultValue="@string/prefs_suggestion_visibility_default_value" />
    </PreferenceCategory>
    <PreferenceCategory
        android:title="@string/gesture_typing_category"
        android:key="gesture_typing_settings">
        <CheckBoxPreference
            android:key="gesture_input"
            android:title="@string/gesture_input"
            android:summary="@string/gesture_input_summary"
            android:persistent="true"
            android:defaultValue="true" />
        <CheckBoxPreference
            android:key="pref_show_gesture_floating_preview_text"
            android:title="@string/gesture_floating_preview_text"
            android:summary="@string/gesture_floating_preview_text_summary"
            android:persistent="true"
            android:defaultValue="false" />
        <CheckBoxPreference
            android:key="pref_gesture_preview_trail"
            android:title="@string/gesture_preview_trail"
            android:persistent="true"
            android:defaultValue="true" />
    </PreferenceCategory>
    <PreferenceCategory
        android:title="@string/misc_category"
        android:key="misc_settings">
@@ -86,12 +108,6 @@
            android:summary="@string/bigram_prediction_summary"
            android:persistent="true"
            android:defaultValue="true" />
        <CheckBoxPreference
            android:key="gesture_input"
            android:title="@string/gesture_input"
            android:summary="@string/gesture_input_summary"
            android:persistent="true"
            android:defaultValue="true" />
        <PreferenceScreen
            android:key="pref_advanced_settings"
            android:title="@string/advanced_settings"
@@ -128,17 +144,6 @@
            <PreferenceScreen
                android:key="pref_keypress_sound_volume"
                android:title="@string/prefs_keypress_sound_volume_settings" />
            <CheckBoxPreference
                android:key="pref_gesture_preview_trail"
                android:title="@string/gesture_preview_trail"
                android:persistent="true"
                android:defaultValue="true" />
            <CheckBoxPreference
                android:key="pref_show_gesture_floating_preview_text"
                android:title="@string/gesture_floating_preview_text"
                android:summary="@string/gesture_floating_preview_text_summary"
                android:persistent="true"
                android:defaultValue="false" />
        </PreferenceScreen>
        <PreferenceScreen
            android:key="debug_settings"