Bug 775142 - Use placeholder format strings for localization. r=mfinkle,Pike

This commit is contained in:
Brian Nicholson 2012-11-26 14:48:11 -08:00
parent 531578ec07
commit 892e4e85b0
2 changed files with 12 additions and 10 deletions

View File

@ -56,9 +56,9 @@
<!ENTITY close_tab "Close Tab">
<!ENTITY new_tab "New Tab">
<!ENTITY one_tab "1 tab">
<!-- Localization note (num_tabs) : Number of tabs is always more than one.
<!-- Localization note (num_tabs2) : Number of tabs is always more than one.
We can't use android plural forms, sadly. See bug #753859. -->
<!ENTITY num_tabs "&#037;d tabs">
<!ENTITY num_tabs2 "&formatD; tabs">
<!ENTITY new_tab_opened "New tab opened">
<!ENTITY settings "Settings">
@ -156,8 +156,6 @@ size. -->
<!ENTITY contextmenu_copyurl "Copy Address">
<!ENTITY contextmenu_edit_bookmark "Edit">
<!-- Localization note (history_removed) : Shown in a toast notificaion
after a page is removed from browser history. -->
<!ENTITY history_removed "Page removed">
<!ENTITY bookmark_edit_title "Edit Bookmark">
@ -240,10 +238,9 @@ just addresses the organization to follow, e.g. "This site is run by " -->
from Android">
<!ENTITY bookmarkhistory_import_wait "Please wait...">
<!-- Localization note (suggestions_prompt): The placeholder (&#037;s) should
be kept in the string; this will be replaced with the name of the search
engine. -->
<!ENTITY suggestions_prompt "Would you like to turn on &#037;s search suggestions?">
<!-- Localization note (suggestions_prompt2): The placeholder &formatS; will be
replaced with the name of the search engine. -->
<!ENTITY suggestions_prompt2 "Would you like to turn on &formatS; search suggestions?">
<!ENTITY webapp_generic_name "App">

View File

@ -8,7 +8,12 @@
#includesubst @BRANDPATH@
#includesubst @STRINGSPATH@
#includesubst @SYNCSTRINGSPATH@
<!-- C-style format strings. -->
<!ENTITY formatS "&#037;s">
<!ENTITY formatD "&#037;d">
]>
#includesubst @BOOKMARKSPATH@
<resources>
<string name="moz_app_displayname">@MOZ_APP_DISPLAYNAME@</string>
@ -129,7 +134,7 @@
<string name="new_tab">&new_tab;</string>
<string name="new_tab_opened">&new_tab_opened;</string>
<string name="one_tab">&one_tab;</string>
<string name="num_tabs">&num_tabs;</string>
<string name="num_tabs">&num_tabs2;</string>
<string name="addons">&addons;</string>
<string name="downloads">&downloads;</string>
<string name="apps">&apps;</string>
@ -243,6 +248,6 @@
<string name="updater_apply_select">&updater_apply_select2;</string>
<!-- Search suggestions opt-in -->
<string name="suggestions_prompt">&suggestions_prompt;</string>
<string name="suggestions_prompt">&suggestions_prompt2;</string>
</resources>