am 8ef4774a: Merge "Revert "Fix description of setup wizard 1st step"" into jb-mr2-dev

* commit '8ef4774a8614e8b67f995f016d3200ff3fd16e30':
  Revert "Fix description of setup wizard 1st step"
This commit is contained in:
Tadashi G. Takaoka 2013-02-28 22:38:26 +00:00 committed by Android Git Automerger
commit 100b6ae5ca

View file

@ -415,7 +415,7 @@
<string name="setup_step1_bullet">1</string> <string name="setup_step1_bullet">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">"Enable <xliff:g id="application_name">%s</xliff:g> in settings."</string>
<!-- Detailed instruction of the 1st step in the setup wizard. "Check application_name" means "enable application_name by ticking the checkbox". [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">"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">2</string>