Bug 1121681 - Passwords category. r=margaret

This commit is contained in:
Chenxia Liu 2015-02-24 16:52:52 -08:00
parent f59f23ba32
commit d9bc51df5e
3 changed files with 17 additions and 11 deletions

View File

@ -122,7 +122,6 @@
<!ENTITY pref_category_display_summary "Text, title bar, full-screen browsing"> <!ENTITY pref_category_display_summary "Text, title bar, full-screen browsing">
<!ENTITY pref_category_privacy_short "Privacy"> <!ENTITY pref_category_privacy_short "Privacy">
<!ENTITY pref_category_privacy_summary "Control passwords, cookies, tracking, data"> <!ENTITY pref_category_privacy_summary "Control passwords, cookies, tracking, data">
<!ENTITY pref_manage_logins "Manage logins">
<!ENTITY pref_category_vendor "&vendorShortName;"> <!ENTITY pref_category_vendor "&vendorShortName;">
<!ENTITY pref_category_vendor_summary "About &brandShortName;, FAQs, data choices"> <!ENTITY pref_category_vendor_summary "About &brandShortName;, FAQs, data choices">
<!ENTITY pref_category_datareporting "Data choices"> <!ENTITY pref_category_datareporting "Data choices">
@ -142,7 +141,9 @@
<!ENTITY pref_category_devtools_summary "Remote debugging, paint flashing"> <!ENTITY pref_category_devtools_summary "Remote debugging, paint flashing">
<!ENTITY pref_developer_paint_flashing "Paint flashing"> <!ENTITY pref_developer_paint_flashing "Paint flashing">
<!ENTITY pref_developer_remotedebugging "Remote debugging"> <!ENTITY pref_developer_remotedebugging "Remote debugging">
<!ENTITY pref_category_logins "Logins">
<!ENTITY pref_remember_signons "Remember passwords"> <!ENTITY pref_remember_signons "Remember passwords">
<!ENTITY pref_manage_logins "Manage logins">
<!ENTITY pref_category_home "Home"> <!ENTITY pref_category_home "Home">
<!ENTITY pref_category_home_summary "Customize your homepage"> <!ENTITY pref_category_home_summary "Customize your homepage">

View File

@ -36,17 +36,21 @@
android:entryValues="@array/pref_cookies_values" android:entryValues="@array/pref_cookies_values"
android:persistent="false" /> android:persistent="false" />
<org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.signon.manage" <PreferenceCategory android:title="@string/pref_category_logins">
android:title="@string/pref_manage_logins"
url="about:passwords"/>
<CheckBoxPreference android:key="signon.rememberSignons" <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.signon.manage"
android:title="@string/pref_remember_signons" android:title="@string/pref_manage_logins"
android:persistent="false" /> url="about:passwords"/>
<CheckBoxPreference android:key="privacy.masterpassword.enabled" <CheckBoxPreference android:key="signon.rememberSignons"
android:title="@string/pref_use_master_password" android:title="@string/pref_remember_signons"
android:persistent="false" /> android:persistent="false" />
<CheckBoxPreference android:key="privacy.masterpassword.enabled"
android:title="@string/pref_use_master_password"
android:persistent="false" />
</PreferenceCategory>
<!-- keys prefixed with "android.not_a_preference." are not synced with Gecko --> <!-- keys prefixed with "android.not_a_preference." are not synced with Gecko -->
<PreferenceCategory android:title="@string/pref_clear_private_data_category"> <PreferenceCategory android:title="@string/pref_clear_private_data_category">

View File

@ -132,7 +132,6 @@
<string name="pref_category_display_summary">&pref_category_display_summary;</string> <string name="pref_category_display_summary">&pref_category_display_summary;</string>
<string name="pref_category_privacy_short">&pref_category_privacy_short;</string> <string name="pref_category_privacy_short">&pref_category_privacy_short;</string>
<string name="pref_category_privacy_summary">&pref_category_privacy_summary;</string> <string name="pref_category_privacy_summary">&pref_category_privacy_summary;</string>
<string name="pref_manage_logins">&pref_manage_logins;</string>
<string name="pref_category_vendor">&pref_category_vendor;</string> <string name="pref_category_vendor">&pref_category_vendor;</string>
<string name="pref_category_vendor_summary">&pref_category_vendor_summary;</string> <string name="pref_category_vendor_summary">&pref_category_vendor_summary;</string>
<string name="pref_category_datareporting">&pref_category_datareporting;</string> <string name="pref_category_datareporting">&pref_category_datareporting;</string>
@ -175,7 +174,9 @@
<string name="pref_learn_more">&pref_learn_more;</string> <string name="pref_learn_more">&pref_learn_more;</string>
<string name="pref_category_logins">&pref_category_logins;</string>
<string name="pref_remember_signons">&pref_remember_signons;</string> <string name="pref_remember_signons">&pref_remember_signons;</string>
<string name="pref_manage_logins">&pref_manage_logins;</string>
<string name="pref_cookies_menu">&pref_cookies_menu;</string> <string name="pref_cookies_menu">&pref_cookies_menu;</string>
<string name="pref_cookies_accept_all">&pref_cookies_accept_all;</string> <string name="pref_cookies_accept_all">&pref_cookies_accept_all;</string>