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

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

Merge "Finalize setup wizard strings and mark as translatable"

parents bb5deb82 8712ac79

java/res/values/strings.xml

+21 −12
Original line number Diff line number Diff line
@@ -442,31 +442,40 @@ 
    <!-- Title of the button to revert to the default value of the device in the settings dialog [CHAR LIMIT=15] -->

    <string name="button_default">Default</string>



    <!-- TODO: Remove translatable="false" once wordings are finalized. -->

    <!-- Title of the setup wizard welcome screen. [CHAR LIMT=40] -->

    <string name="setup_welcome_title">"Welcome to <xliff:g id="application_name">%s</xliff:g>"</string>

    <!-- Additional title of the setup wizard welcome screen, just below the setup_welcome_title. [CHAR_LIMIT=64] -->

    <string name="setup_welcome_additional_description">with Gesture Typing</string>

    <!-- The label of the button that starts the setup wizard. [CHAR_LIMIT=64] -->

    <string name="setup_start_action">Get started</string>

    <!-- Title of the setup wizard. [CHAR LIMT=40] -->

    <string name="setup_title" translatable="false">"Installing <xliff:g id="application_name">%s</xliff:g>"</string>

    <string name="setup_steps_title">"Setting up <xliff:g id="application_name">%s</xliff:g>"</string>

    <!-- Ordinal number of the 1st step in the setup wizard. [CHAR LIMIT=5] -->

    <string name="setup_step1_bullet" translatable="false">1</string>

    <!-- Title of the 1st step in the setup wizard. [CHAR LIMIT=64] -->

    <string name="setup_step1_title" translatable="false">"Enable <xliff:g id="application_name">%s</xliff:g> in settings."</string>

    <string name="setup_step1_title">"Enable <xliff:g id="application_name">%s</xliff:g>"</string>

    <!-- Detailed instruction of the 1st step in the setup wizard. [CHAR LIMIT=80] -->

    <string name="setup_step1_instruction" translatable="false">"For security, please check \"<xliff:g id="application_name">%s</xliff:g>\""</string>

    <string name="setup_step1_instruction">"Please check \"<xliff:g id="application_name">%s</xliff:g>\" in your Language &amp; input settings. This will authorize it to run on your device."</string>

    <!-- Title of the Language & input settings. This should be aligned with msgid="5292716747264442359" -->

    <string name="setup_step1_action">Language &amp; input</string>

    <!-- Ordinal number of the 2nd step in the setup wizard. [CHAR LIMIT=5] -->

    <string name="setup_step2_bullet" translatable="false">2</string>

    <!-- Title of the 2nd step in the setup wizard. [CHAR LIMIT=64] -->

    <string name="setup_step2_title" translatable="false">"Switch to <xliff:g id="application_name">%s</xliff:g>."</string>

    <string name="setup_step2_title">"Switch to <xliff:g id="application_name">%s</xliff:g>"</string>

    <!-- Detailed instruction of the 2nd step in the setup wizard. [CHAR LIMIT=80] -->

    <string name="setup_step2_instruction" translatable="false">"Now that you've enabled <xliff:g id="application_name">%s</xliff:g>, you can switch to it."</string>

    <string name="setup_step2_instruction">"Now that it's enabled, select \"<xliff:g id="application_name">%s</xliff:g>\", one more time to activate it."</string>

    <!-- Title of the Input method picker. This should be aligned with msgid="4653387336791222978" -->

    <string name="setup_step2_action">Choose input method</string>

    <!-- Ordinal number of the 3rd step in the setup wizard. [CHAR LIMIT=5] -->

    <string name="setup_step3_bullet" translatable="false">3</string>

    <!-- Title of the 3rd step in the setup wizard. [CHAR LIMIT=64] -->

    <string name="setup_step3_title" translatable="false">"Congratulations, you're all set!"</string>

    <string name="setup_step3_title">"Congratulations, you're all set!"</string>

    <!-- Detailed instruction of the 3rd step in the setup wizard. [CHAR LIMIT=80] -->

    <string name="setup_step3_instruction" translatable="false">Configure additional languages</string>

    <!-- Title of the Language & input settings. This should be aligned with msgid="5292716747264442359" -->

    <string name="language_settings">Language &amp; input</string>

    <!-- Title of the Input method picker. This should be aligned with msgid="4653387336791222978" -->

    <string name="select_input_method">Choose input method</string>

    <string name="setup_step3_instruction">Now you can type in all your favorite apps with <xliff:g id="application_name">%s</xliff:g>.</string>

    <!-- The label of the button that triggers the screen for configuaring additional languages of the keyboard. [CHAR_LIMIT=64] -->

    <string name="setup_step3_action">Configure additional languages</string>

    <!-- The label of the button that finishes the setup wizard. [CHAR_LIMIT=64] -->

    <string name="setup_finish_action">Finished</string>

    <!-- Option to show setup wizard icon. [CHAR LIMIT=30]-->

    <string name="show_setup_wizard_icon" translatable="false">Show setup wizard icon</string>

java/src/com/android/inputmethod/latin/setup/SetupActivity.java

+5 −5
Original line number Diff line number Diff line
@@ -113,13 +113,13 @@ public final class SetupActivity extends Activity { 
        // the SDK version.

        final TextView titleView = (TextView)findViewById(R.id.setup_title);

        final int appName = getApplicationInfo().labelRes;

        titleView.setText(getString(R.string.setup_title, getString(appName)));

        titleView.setText(getString(R.string.setup_steps_title, getString(appName)));



        mStepIndicatorView = (SetupStepIndicatorView)findViewById(R.id.setup_step_indicator);



        final SetupStep step1 = new SetupStep(findViewById(R.id.setup_step1),

                appName, R.string.setup_step1_title, R.string.setup_step1_instruction,

                R.drawable.ic_settings_language, R.string.language_settings);

                R.drawable.ic_settings_language, R.string.setup_step1_action);

        step1.setAction(new Runnable() {

            @Override

            public void run() {
@@ -131,7 +131,7 @@ public final class SetupActivity extends Activity { 


        final SetupStep step2 = new SetupStep(findViewById(R.id.setup_step2),

                appName, R.string.setup_step2_title, R.string.setup_step2_instruction,

                0 /* actionIcon */, R.string.select_input_method);

                0 /* actionIcon */, R.string.setup_step2_action);

        step2.setAction(new Runnable() {

            @Override

            public void run() {
@@ -143,8 +143,8 @@ public final class SetupActivity extends Activity { 
        mSetupSteps.addStep(STEP_2, step2);



        final SetupStep step3 = new SetupStep(findViewById(R.id.setup_step3),

                appName, R.string.setup_step3_title, 0 /* instruction */,

                R.drawable.sym_keyboard_language_switch, R.string.setup_step3_instruction);

                appName, R.string.setup_step3_title, R.string.setup_step3_instruction,

                R.drawable.sym_keyboard_language_switch, R.string.setup_step3_action);

        step3.setAction(new Runnable() {

            @Override

            public void run() {