am 2d8d20f4: am 5c681c17: Merge "Add translatable="false" to setup wizard\'s string resources" into jb-mr2-dev

* commit '2d8d20f4458db015f1a38d9128a4c933c7f2a7ed':
  Add translatable="false" to setup wizard's string resources
This commit is contained in:
Tadashi G. Takaoka 2013-03-01 05:32:17 -08:00 committed by Android Git Automerger
commit d1258a0276

View file

@ -409,26 +409,27 @@
<!-- Title of the button to revert to the default value of the device in the settings dialog [CHAR LIMIT=15] --> <!-- 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> <string name="button_default">Default</string>
<!-- TODO: Remove translatable="false" once wordings are finalized. -->
<!-- Title of the setup wizard. [CHAR LIMT=40] --> <!-- Title of the setup wizard. [CHAR LIMT=40] -->
<string name="setup_title">"Installing <xliff:g id="application_name">%s</xliff:g>"</string> <string name="setup_title" translatable="false">"Installing <xliff:g id="application_name">%s</xliff:g>"</string>
<!-- Ordinal number of the 1st step in the setup wizard. [CHAR LIMIT=5] --> <!-- Ordinal number of the 1st step in the setup wizard. [CHAR LIMIT=5] -->
<string name="setup_step1_bullet">1</string> <string name="setup_step1_bullet" translatable="false">1</string>
<!-- Title of the 1st step in the setup wizard. [CHAR LIMIT=64] --> <!-- Title of the 1st step in the setup wizard. [CHAR LIMIT=64] -->
<string name="setup_step1_title">"Enable <xliff:g id="application_name">%s</xliff:g> in settings."</string> <string name="setup_step1_title" translatable="false">"Enable <xliff:g id="application_name">%s</xliff:g> in settings."</string>
<!-- Detailed instruction of the 1st step in the setup wizard. [CHAR LIMIT=80] --> <!-- Detailed instruction of the 1st step in the setup wizard. [CHAR LIMIT=80] -->
<string name="setup_step1_instruction">"For security, please check \"<xliff:g id="application_name">%s</xliff:g>\""</string> <string name="setup_step1_instruction" translatable="false">"For security, please check \"<xliff:g id="application_name">%s</xliff:g>\""</string>
<!-- Ordinal number of the 2nd step in the setup wizard. [CHAR LIMIT=5] --> <!-- Ordinal number of the 2nd step in the setup wizard. [CHAR LIMIT=5] -->
<string name="setup_step2_bullet">2</string> <string name="setup_step2_bullet" translatable="false">2</string>
<!-- Title of the 2nd step in the setup wizard. [CHAR LIMIT=64] --> <!-- Title of the 2nd step in the setup wizard. [CHAR LIMIT=64] -->
<string name="setup_step2_title">"Switch to <xliff:g id="application_name">%s</xliff:g>."</string> <string name="setup_step2_title" translatable="false">"Switch to <xliff:g id="application_name">%s</xliff:g>."</string>
<!-- Detailed instruction of the 2nd step in the setup wizard. [CHAR LIMIT=80] --> <!-- Detailed instruction of the 2nd step in the setup wizard. [CHAR LIMIT=80] -->
<string name="setup_step2_instruction">"Now that you've enabled <xliff:g id="application_name">%s</xliff:g>, you can switch to it."</string> <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>
<!-- Ordinal number of the 3rd step in the setup wizard. [CHAR LIMIT=5] --> <!-- Ordinal number of the 3rd step in the setup wizard. [CHAR LIMIT=5] -->
<string name="setup_step3_bullet">3</string> <string name="setup_step3_bullet" translatable="false">3</string>
<!-- Title of the 3rd step in the setup wizard. [CHAR LIMIT=64] --> <!-- Title of the 3rd step in the setup wizard. [CHAR LIMIT=64] -->
<string name="setup_step3_title">"Congratulations, you're all set!"</string> <string name="setup_step3_title" translatable="false">"Congratulations, you're all set!"</string>
<!-- Detailed instruction of the 3rd step in the setup wizard. [CHAR LIMIT=80] --> <!-- Detailed instruction of the 3rd step in the setup wizard. [CHAR LIMIT=80] -->
<string name="setup_step3_instruction">Configure additional languages</string> <string name="setup_step3_instruction" translatable="false">Configure additional languages</string>
<!-- Title of the Language & input settings. This should be aligned with msgid="5292716747264442359" --> <!-- Title of the Language & input settings. This should be aligned with msgid="5292716747264442359" -->
<string name="language_settings">Language &amp; input</string> <string name="language_settings">Language &amp; input</string>
<!-- Title of the Input method picker. This should be aligned with msgid="4653387336791222978" --> <!-- Title of the Input method picker. This should be aligned with msgid="4653387336791222978" -->