wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 974942 - Don't share link{tos,privacy} strings. r=rnewman

Browse Source
This commit is contained in:
Nick Alexander 2014-03-13 22:31:55 -07:00
parent 9384dae95d
commit 3e1728664e
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mobile/android/base/locales/en-US/sync_strings.dtd
View File

@ -120,6 +120,11 @@
Firefox. -->
<!ENTITY fxaccount_back_to_browsing 'Back to browsing'>
<!-- Localization note: the following two strings are interpolated
into fxaccount_create_account_policy_text; see note for that
string as well. Compare fxaccount_status_{linktos,linkprivacy}:
these strings are separated to accommodate languages that decline
the two uses differently. -->
<!ENTITY fxaccount_policy_linktos 'Terms of Service'>
<!ENTITY fxaccount_policy_linkprivacy 'Privacy Notice'>
@ -178,6 +183,12 @@
<!ENTITY fxaccount_status_passwords 'Passwords'>
<!ENTITY fxaccount_status_tabs 'Open tabs'>
<!ENTITY fxaccount_status_legal 'Legal' >
<!-- Localization note: when tapped, the following two strings link to
external web pages. Compare fxaccount_policy_{linktos,linkprivacy}:
these strings are separated to accommodate languages that decline
the two uses differently. -->
<!ENTITY fxaccount_status_linktos 'Terms of Service'>
<!ENTITY fxaccount_status_linkprivacy 'Privacy Notice'>
<!-- Localization note: this is the name shown by the Android system
itself for a Firefox Account. Don't localize this. -->

4
mobile/android/base/resources/xml/fxaccount_status_prefscreen.xml
View File

@ -56,14 +56,14 @@
<PreferenceCategory
android:key="legal_category"
android:title="@string/fxaccount_status_legal" >
<Preference android:title="@string/fxaccount_policy_linktos" >
<Preference android:title="@string/fxaccount_status_linktos" >
<intent
android:action="android.intent.action.VIEW"
android:data="@string/fxaccount_link_tos"
android:targetClass="@string/browser_intent_class"
android:targetPackage="@string/browser_intent_package" />
</Preference>
<Preference android:title="@string/fxaccount_policy_linkprivacy" >
<Preference android:title="@string/fxaccount_status_linkprivacy" >
<intent
android:action="android.intent.action.VIEW"
android:data="@string/fxaccount_link_pn"

2
mobile/android/services/strings.xml.in
View File

@ -177,6 +177,8 @@
<string name="fxaccount_status_passwords">&fxaccount_status_passwords;</string>
<string name="fxaccount_status_tabs">&fxaccount_status_tabs;</string>
<string name="fxaccount_status_legal">&fxaccount_status_legal;</string>
<string name="fxaccount_status_linktos">&fxaccount_status_linktos;</string>
<string name="fxaccount_status_linkprivacy">&fxaccount_status_linkprivacy;</string>
<string name="fxaccount_label">&fxaccount_account_type_label;</string>