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

Merge "Move strings to SettingsLib so TV can use them" into oc-dev

Browse Source 
am: 685041559a

Change-Id: I9ff3757e28b82caac7d83394f3734eee040a7b00
This commit is contained in:
Tony Mantler
2017-06-03 22:00:17 +00:00
committed by android-build-merger
parent d8895787c9 685041559a
commit ea71adb730
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@@ -3609,8 +3609,6 @@
<!-- Text for filter option in ManageApps screen to display list of <!-- Text for filter option in ManageApps screen to display list of
packages installed on sdcard. --> packages installed on sdcard. -->
<string name="filter_apps_onsdcard" product="default">On SD card</string> <string name="filter_apps_onsdcard" product="default">On SD card</string>
<!-- [CHAR LIMIT=25] Manage applications, text telling using an application is disabled. -->
<string name="disabled">Disabled</string>
<!-- [CHAR LIMIT=30] Manage applications, text telling using an application is not installed for the current user. The key part is that it's not installed. --> <!-- [CHAR LIMIT=30] Manage applications, text telling using an application is not installed for the current user. The key part is that it's not installed. -->
<string name="not_installed">Not installed for this user</string> <string name="not_installed">Not installed for this user</string>
<!-- [CHAR LIMIT=30] App details, text telling an application is installed. --> <!-- [CHAR LIMIT=30] App details, text telling an application is installed. -->
@@ -7671,8 +7669,6 @@
<!-- Summary of app not allowed to display over other apps [CHAR LIMIT=60] --> <!-- Summary of app not allowed to display over other apps [CHAR LIMIT=60] -->
<string name="system_alert_window_off">No</string> <string name="system_alert_window_off">No</string>
<!-- Title for settings screen for controlling apps that can install other apps on device [CHAR LIMIT=50] -->
<string name="install_other_apps">Install unknown apps</string>
<!-- Keywords for setting screen for controlling apps that can install other apps on device --> <!-- Keywords for setting screen for controlling apps that can install other apps on device -->
<string name="keywords_install_other_apps">install apps unknown sources</string> <string name="keywords_install_other_apps">install apps unknown sources</string>
@@ -7702,10 +7698,6 @@
<string name="write_settings_on">Yes</string> <string name="write_settings_on">Yes</string>
<!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] --> <!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
<string name="write_settings_off">No</string> <string name="write_settings_off">No</string>
<!-- Summary of app trusted to install apps [CHAR LIMIT=45] -->
<string name="external_source_trusted">Allowed</string>
<!-- Summary of app not trusted to install apps [CHAR LIMIT=45] -->
<string name="external_source_untrusted">Not allowed</string>
<!-- Title of switch preference that controls whether an external app source is trusted or not [CHAR LIMIT=50] --> <!-- Title of switch preference that controls whether an external app source is trusted or not [CHAR LIMIT=50] -->
<string name="external_source_switch_title">Allow from this source</string> <string name="external_source_switch_title">Allow from this source</string>