PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update misc strings" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-26 04:59:29 +00:00
committed by Android (Google) Code Review
parent 0224a409a9 325d28ae6c
commit 34d30267e3
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/values/strings.xml
View File

@@ -2040,8 +2040,6 @@
<string name="wifi_p2p_delete_group_message">Forget this group?</string>
<!-- Wifi AP settings-->
<!-- Label for Wifi tether checkbox. Toggles Access Point on/off -->
<string name="wifi_tether_checkbox_text">Portable Wi\u2011Fi hotspot</string>
<!-- Label for Wifi tether checkbox. Toggles Access Point on/off [CHAR LIMIT=30] -->
<string name="wifi_hotspot_checkbox_text">Wi\u2011Fi hotspot</string>
<!-- Summary text when turning hotspot off -->
@@ -2055,13 +2053,13 @@
<!-- Wifi hotspot settings -->
<!-- Label for Wifi hotspot name. -->
<string name="wifi_hotspot_name_title">Wi\u2011Fi name</string>
<string name="wifi_hotspot_name_title">Hotspot name</string>
<!-- Summary for Wifi hotspot name when connection is in progress. -->
<string name="wifi_hotspot_name_summary_connecting">Turning on <xliff:g id="wifi_hotspot_name">%1$s</xliff:g>...</string>
<!-- Summary for Wifi hotspot name when connected. -->
<string name="wifi_hotspot_name_summary_connected">Other devices can connect to <xliff:g id="wifi_hotspot_name">%1$s</xliff:g></string>
<!-- Label for Wifi hotspot password. -->
<string name="wifi_hotspot_password_title">Wi\u2011Fi password</string>
<string name="wifi_hotspot_password_title">Hotspot password</string>
<!-- Label for Wifi hotspot AP Band. -->
<string name="wifi_hotspot_ap_band_title">AP Band</string>
<!-- Wifi hotspot footer info for regular hotspot [CHAR LIMIT=NONE]-->
@@ -3114,6 +3112,9 @@
<!-- Title for a screen containing all device reset options [CHAR LIMIT=50] -->
<string name="reset_dashboard_title">Reset options</string>
<!-- Summary text for a screen containing all device reset options [CHAR LIMIT=None] -->
<string name="reset_dashboard_summary">Network, apps, or device can be reset</string>
<!-- Reset Network -->
<!-- Button title to reset Wi-Fi settings, Mobile data setting, bluetooth settings -->
<string name="reset_network_title">Reset Wi-Fi, mobile &amp; Bluetooth</string>

1
res/xml/system_dashboard_fragment.xml
View File

@@ -57,6 +57,7 @@
<Preference
android:key="reset_dashboard"
android:title="@string/reset_dashboard_title"
android:summary="@string/reset_dashboard_summary"
android:icon="@drawable/ic_restore"
android:order="-20"
android:fragment="com.android.settings.system.ResetDashboardFragment" />

4
res/xml/tether_prefs.xml
View File

@@ -19,7 +19,7 @@
<Preference
android:key="wifi_tether"
android:title="@string/wifi_tether_checkbox_text"
android:title="@string/wifi_hotspot_checkbox_text"
android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.wifi.tether.WifiTetherSettings" />
@@ -30,7 +30,7 @@
<SwitchPreference
android:key="enable_wifi_ap"
android:title="@string/wifi_tether_checkbox_text"
android:title="@string/wifi_hotspot_checkbox_text"
android:summary="@string/summary_two_lines_placeholder" />
<Preference

6
res/xml/wifi_tether_settings.xml
View File

@@ -19,15 +19,15 @@
<com.android.settings.widget.ValidatedEditTextPreference
android:key="wifi_tether_network_name"
android:title="@string/wifi_ssid"
android:title="@string/wifi_hotspot_name_title"
android:summary="@string/summary_placeholder" />
<com.android.settings.widget.ValidatedEditTextPreference
android:key="wifi_tether_network_password"
android:title="@string/wifi_password" />
android:title="@string/wifi_hotspot_password_title" />
<ListPreference
android:key="wifi_tether_network_ap_band"
android:title="@string/wifi_ap_band_config"
android:title="@string/wifi_hotspot_ap_band_title"
android:summary="@string/summary_placeholder" />
</PreferenceScreen>