Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 965377 - Add android:summary text to settings. r=liuche

Browse Source
This commit is contained in:
Margaret Leibovic 2014-09-22 17:36:41 -07:00
parent fb05df118d
commit 4de3cf4798
6 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mobile/android/base/locales/en-US/android_strings.dtd
View File

@ -78,11 +78,13 @@
<!ENTITY settings_title "Settings">
<!ENTITY pref_category_advanced "Advanced">
<!ENTITY pref_category_customize "Customize">
<!ENTITY pref_category_customize_summary "Home, search, tabs, import">
<!-- Localization note (pref_category_language) : This is the preferences
section in which the user picks the locale in which to display Firefox
UI. The locale includes both language and region concepts. -->
<!ENTITY pref_category_language "Language">
<!ENTITY pref_category_language_summary "Change the language of your browser">
<!ENTITY pref_browser_locale "Browser language">
<!-- Localization note (locale_system_default) : This string indicates that
@ -116,8 +118,11 @@
<!ENTITY pref_category_search3 "Search">
<!ENTITY pref_category_search_summary "Customize your search providers">
<!ENTITY pref_category_display "Display">
<!ENTITY pref_category_display_summary "Text, title bar, full-screen browsing">
<!ENTITY pref_category_privacy_short "Privacy">
<!ENTITY pref_category_privacy_summary "Control passwords, cookies, tracking, data">
<!ENTITY pref_category_vendor "&vendorShortName;">
<!ENTITY pref_category_vendor_summary "About &brandShortName;, FAQs, data choices">
<!ENTITY pref_category_datareporting "Data choices">
<!ENTITY pref_learn_more "Learn more">
<!ENTITY pref_category_installed_search_engines "Installed search engines">
@ -132,6 +137,7 @@
it is applicable. -->
<!ENTITY pref_search_hint "TIP: Add any website to your list of search providers by long-pressing on its search field and then tapping the &formatI; icon.">
<!ENTITY pref_category_devtools "Developer tools">
<!ENTITY pref_category_devtools_summary "Remote debugging, paint flashing">
<!ENTITY pref_developer_paint_flashing "Paint flashing">
<!ENTITY pref_developer_remotedebugging "Remote debugging">
<!ENTITY pref_remember_signons "Remember passwords">
@ -207,8 +213,10 @@ size. -->
<!ENTITY pref_use_master_password "Use master password">
<!ENTITY pref_sync "Sync">
<!ENTITY pref_sync_summary "Sync your tabs, bookmarks, passwords, history">
<!ENTITY pref_search_suggestions "Show search suggestions">
<!ENTITY pref_import_android "Import from Android">
<!ENTITY pref_import_android_summary "Import bookmarks and history from the native browser">
<!ENTITY pref_private_data_history2 "Browsing history">
<!ENTITY pref_private_data_formdata "Form &amp; search history">
<!ENTITY pref_private_data_cookies2 "Cookies &amp; active logins">

7
mobile/android/base/resources/xml-v11/preferences.xml
View File

@ -13,15 +13,18 @@
<org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
android:title="@string/pref_sync"
android:summary="@string/pref_sync_summary"
android:persistent="false" />
<PreferenceScreen android:title="@string/pref_category_customize"
android:summary="@string/pref_category_customize_summary"
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
<extra android:name="resource"
android:value="preferences_customize"/>
</PreferenceScreen>
<PreferenceScreen android:title="@string/pref_category_display"
android:summary="@string/pref_category_display_summary"
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
<extra android:name="resource"
android:value="preferences_display" />
@ -29,24 +32,28 @@
<PreferenceScreen android:title="@string/pref_category_privacy_short"
android:summary="@string/pref_category_privacy_summary"
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
<extra android:name="resource"
android:value="preferences_privacy" />
</PreferenceScreen>
<PreferenceScreen android:title="@string/pref_category_language"
android:summary="@string/pref_category_language_summary"
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
<extra android:name="resource"
android:value="preferences_locale" />
</PreferenceScreen>
<PreferenceScreen android:title="@string/pref_category_vendor"
android:summary="@string/pref_category_vendor_summary"
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
<extra android:name="resource"
android:value="preferences_vendor"/>
</PreferenceScreen>
<PreferenceScreen android:title="@string/pref_category_devtools"
android:summary="@string/pref_category_devtools_summary"
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
<extra android:name="resource"
android:value="preferences_devtools"/>

1
mobile/android/base/resources/xml-v11/preferences_customize.xml
View File

@ -37,6 +37,7 @@
gecko:initialValues="@array/pref_import_android_defaults"
gecko:entryKeys="@array/pref_import_android_keys"
android:title="@string/pref_import_android"
android:summary="@string/pref_import_android_summary"
android:positiveButtonText="@string/bookmarkhistory_button_import"
android:negativeButtonText="@string/button_cancel"
android:persistent="false" />

19
mobile/android/base/resources/xml/preferences.xml
View File

@ -13,9 +13,11 @@
<org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
android:title="@string/pref_sync"
android:summary="@string/pref_category_customize_summary"
android:persistent="false" />
<PreferenceScreen android:title="@string/pref_category_customize" >
<PreferenceScreen android:title="@string/pref_category_customize"
android:summary="@string/pref_category_customize_summary" >
<intent android:action="android.intent.action.VIEW"
android:targetPackage="@string/android_package_name"
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
@ -25,7 +27,8 @@
</intent>
</PreferenceScreen>
<PreferenceScreen android:title="@string/pref_category_display" >
<PreferenceScreen android:title="@string/pref_category_display"
android:summary="@string/pref_category_display_summary" >
<intent android:action="android.intent.action.VIEW"
android:targetPackage="@string/android_package_name"
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
@ -35,7 +38,8 @@
</intent>
</PreferenceScreen>
<PreferenceScreen android:title="@string/pref_category_privacy_short" >
<PreferenceScreen android:title="@string/pref_category_privacy_short"
android:summary="@string/pref_category_privacy_summary" >
<intent android:action="android.intent.action.VIEW"
android:targetPackage="@string/android_package_name"
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
@ -45,7 +49,8 @@
</intent>
</PreferenceScreen>
<PreferenceScreen android:title="@string/pref_category_language" >
<PreferenceScreen android:title="@string/pref_category_language"
android:summary="@string/pref_category_language_summary" >
<intent android:action="android.intent.action.VIEW"
android:targetPackage="@string/android_package_name"
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
@ -55,7 +60,8 @@
</intent>
</PreferenceScreen>
<PreferenceScreen android:title="@string/pref_category_vendor">
<PreferenceScreen android:title="@string/pref_category_vendor"
android:summary="@string/pref_category_vendor_summary" >
<intent android:action="android.intent.action.VIEW"
android:targetPackage="@string/android_package_name"
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
@ -64,7 +70,8 @@
android:value="preferences_vendor" />
</intent>
</PreferenceScreen>
<PreferenceScreen android:title="@string/pref_category_devtools">
<PreferenceScreen android:title="@string/pref_category_devtools"
android:summary="@string/pref_category_devtools_summary" >
<intent android:action="android.intent.action.VIEW"
android:targetPackage="@string/android_package_name"
android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >

1
mobile/android/base/resources/xml/preferences_customize.xml
View File

@ -45,6 +45,7 @@
gecko:initialValues="@array/pref_import_android_defaults"
gecko:entryKeys="@array/pref_import_android_keys"
android:title="@string/pref_import_android"
android:summary="@string/pref_import_android_summary"
android:positiveButtonText="@string/bookmarkhistory_button_import"
android:negativeButtonText="@string/button_cancel"
android:persistent="false" />

8
mobile/android/base/strings.xml.in
View File

@ -125,11 +125,15 @@
<string name="settings_title">&settings_title;</string>
<string name="pref_category_advanced">&pref_category_advanced;</string>
<string name="pref_category_customize">&pref_category_customize;</string>
<string name="pref_category_customize_summary">&pref_category_customize_summary;</string>
<string name="pref_category_search">&pref_category_search3;</string>
<string name="pref_category_search_summary">&pref_category_search_summary;</string>
<string name="pref_category_display">&pref_category_display;</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_summary">&pref_category_privacy_summary;</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_datareporting">&pref_category_datareporting;</string>
<string name="pref_category_installed_search_engines">&pref_category_installed_search_engines;</string>
<string name="pref_category_add_search_providers">&pref_category_add_search_providers;</string>
@ -139,10 +143,12 @@
<string name="pref_search_hint">&pref_search_hint;</string>
<string name="pref_category_language">&pref_category_language;</string>
<string name="pref_category_language_summary">&pref_category_language_summary;</string>
<string name="pref_browser_locale">&pref_browser_locale;</string>
<string name="locale_system_default">&locale_system_default;</string>
<string name="pref_category_devtools">&pref_category_devtools;</string>
<string name="pref_category_devtools_summary">&pref_category_devtools_summary;</string>
<string name="pref_developer_paint_flashing">&pref_developer_paint_flashing;</string>
<string name="pref_developer_remotedebugging">&pref_developer_remotedebugging;</string>
@ -206,6 +212,7 @@
<string name="pref_restore_always">&pref_restore_always;</string>
<string name="pref_restore_quit">&pref_restore_quit;</string>
<string name="pref_sync">&pref_sync;</string>
<string name="pref_sync_summary">&pref_sync_summary;</string>
<string name="pref_search_suggestions">&pref_search_suggestions;</string>
<string name="pref_private_data_history2">&pref_private_data_history2;</string>
<string name="pref_private_data_formdata">&pref_private_data_formdata;</string>
@ -216,6 +223,7 @@
<string name="pref_private_data_siteSettings">&pref_private_data_siteSettings2;</string>
<string name="pref_private_data_downloadFiles2">&pref_private_data_downloadFiles2;</string>
<string name="pref_import_android">&pref_import_android;</string>
<string name="pref_import_android_summary">&pref_import_android_summary;</string>
<string name="pref_update_autodownload">&pref_update_autodownload2;</string>
<string name="pref_update_autodownload_wifi">&pref_update_autodownload_wifi;</string>
<string name="pref_update_autodownload_disabled">&pref_update_autodownload_never;</string>