diff options
| author | Kenny Root <kroot@google.com> | 2010-05-28 14:24:49 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-06-01 11:50:47 -0700 |
| commit | 8aede04bf2660f951eb0408567d923cdef9b0213 (patch) | |
| tree | 02fe59fa49647c081b6a800626534c8a714daa32 | |
| parent | 67dfcbf17b51cc99898e3265276716a2a061a286 (diff) | |
| download | android_development-8aede04bf2660f951eb0408567d923cdef9b0213.tar.gz android_development-8aede04bf2660f951eb0408567d923cdef9b0213.tar.bz2 android_development-8aede04bf2660f951eb0408567d923cdef9b0213.zip | |
Add positional parameters to aid in i18n
Different languages might have different word orders, so add in
positional parameters for strings that have more than one substitution.
Change-Id: Ie9fc74eb0a22471b272e65c6cd521f1518b322d1
| -rw-r--r-- | apps/Development/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | samples/SearchableDictionary/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | samples/Wiktionary/res/values/strings.xml | 6 | ||||
| -rw-r--r-- | samples/WiktionarySimple/res/values/strings.xml | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/apps/Development/res/values/strings.xml b/apps/Development/res/values/strings.xml index 1bb65cfde..181c4fa7d 100644 --- a/apps/Development/res/values/strings.xml +++ b/apps/Development/res/values/strings.xml @@ -190,7 +190,7 @@ <string name="status_sync_succeeded_format">Sync succeeded: %s</string> <string name="status_already_bound">Already bound to sync adapter</string> <string name="status_sync_adapter_not_selected">No selected sync adapter</string> - <string name="binding_connected_format">Connected to Sync Adapter\n\tauthority: %s\n\taccount type: %s</string> + <string name="binding_connected_format">Connected to Sync Adapter\n\tauthority: %1$s\n\taccount type: %2$s</string> <string name="binding_not_connected">Not connected to a sync adapter</string> <string name="binding_bind_failed">Bind failed</string> <string name="binding_waiting_for_connection">Waiting for service to be connected...</string> diff --git a/samples/SearchableDictionary/res/values/strings.xml b/samples/SearchableDictionary/res/values/strings.xml index 569e1d92c..ee628ced0 100644 --- a/samples/SearchableDictionary/res/values/strings.xml +++ b/samples/SearchableDictionary/res/values/strings.xml @@ -38,8 +38,8 @@ <!-- Shown above search results when we receive a search request. --> <plurals name="search_results"> - <item quantity="one">%d result for \"%s\": </item> - <item quantity="other">%d results for \"%s\": </item> + <item quantity="one">%1$d result for \"%2$s\": </item> + <item quantity="other">%1$d results for \"%2$s\": </item> </plurals> <!-- Search failure message. --> diff --git a/samples/Wiktionary/res/values/strings.xml b/samples/Wiktionary/res/values/strings.xml index 38d993768..ace442895 100644 --- a/samples/Wiktionary/res/values/strings.xml +++ b/samples/Wiktionary/res/values/strings.xml @@ -19,9 +19,9 @@ <string name="app_descrip">Example of a fast Wiktionary browser and Word-of-day widget</string> <string name="app_credits">"All dictionary content provided by Wiktionary under a GFDL license. http://en.wiktionary.org\n\nIcon derived from Tango Desktop Project under a public domain license. http://tango.freedesktop.org"</string> - <string name="template_user_agent">"%s/%s (Linux; Android)"</string> - <string name="template_wotd_title">"Wiktionary:Word of the day/%s %s"</string> - <string name="template_define_url">"http://en.wiktionary.org/wiki/%s"</string> + <string name="template_user_agent" translatable="false">"%1$s/%2$s (Linux; Android)"</string> + <string name="template_wotd_title">"Wiktionary:Word of the day/%1$s %2$s"</string> + <string name="template_define_url" translatable="false">"http://en.wiktionary.org/wiki/%s"</string> <string name="widget_name">Wiktionary</string> diff --git a/samples/WiktionarySimple/res/values/strings.xml b/samples/WiktionarySimple/res/values/strings.xml index 65e44cb86..7c7658572 100644 --- a/samples/WiktionarySimple/res/values/strings.xml +++ b/samples/WiktionarySimple/res/values/strings.xml @@ -17,9 +17,9 @@ <resources> <string name="app_name">Wiktionary simple example</string> - <string name="template_user_agent">"%s/%s (Linux; Android)"</string> - <string name="template_wotd_title">"Wiktionary:Word of the day/%s %s"</string> - <string name="template_define_url">"http://en.wiktionary.org/wiki/%s"</string> + <string name="template_user_agent" translatable="false">"%1$s/%2$s (Linux; Android)"</string> + <string name="template_wotd_title">"Wiktionary:Word of the day/%1$s %2$s"</string> + <string name="template_define_url" translatable="false">"http://en.wiktionary.org/wiki/%s"</string> <string name="widget_name">Wiktionary simple</string> |