am 540afe77: am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev

* commit '540afe774a201dc3a1ab4fff49c340bdb5b1fb8d':
  Fix issue #23079119: Description for write settings permission says...
This commit is contained in:
Dianne Hackborn
2015-08-11 23:48:49 +00:00
committed by Android Git Automerger

View File

@@ -6959,24 +6959,24 @@
<!-- Write Settings settings --> <!-- Write Settings settings -->
<!-- Settings title in main settings screen for WRITE_SETTINGS [CHAR LIMIT=30] --> <!-- Settings title in main settings screen for WRITE_SETTINGS [CHAR LIMIT=30] -->
<string name="write_settings">Write system settings</string> <string name="write_settings">Modify system settings</string>
<!-- Keyword for WRITE_SETTINGS --> <!-- Keyword for WRITE_SETTINGS -->
<string name="keywords_write_settings">write modify system settings</string> <string name="keywords_write_settings">write modify system settings</string>
<!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] --> <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
<string name="write_settings_summary"><xliff:g id="count" example="10">%d</xliff:g> of <xliff:g id="count" example="10">%d</xliff:g> apps allowed to read or write system settings</string> <string name="write_settings_summary"><xliff:g id="count" example="10">%d</xliff:g> of <xliff:g id="count" example="10">%d</xliff:g> apps allowed to modify system settings</string>
<!-- Label for showing apps that can write system settings [CHAR LIMIT=45] --> <!-- Label for showing apps that can write system settings [CHAR LIMIT=45] -->
<string name="filter_write_settings_apps">Can write system settings</string> <string name="filter_write_settings_apps">Can modify system settings</string>
<!-- Title for the apps that are allowed to write system settings [CHAR LIMIT=60] --> <!-- Title for the apps that are allowed to write system settings [CHAR LIMIT=60] -->
<string name="write_settings_title">Can write system settings</string> <string name="write_settings_title">Can modify system settings</string>
<!-- Main settings screen item's title to go into the write system settings screen [CHAR LIMIT=30] --> <!-- Main settings screen item's title to go into the write system settings screen [CHAR LIMIT=30] -->
<string name="write_system_settings">Write system settings</string> <string name="write_system_settings">Modify system settings</string>
<!-- Link to the apps page for WRITE_SETTINGS settings [CHAR LIMIT=52] --> <!-- Link to the apps page for WRITE_SETTINGS settings [CHAR LIMIT=52] -->
<string name="write_settings_preference">App write system settings permission</string> <string name="write_settings_preference">App modify system settings permission</string>
<!-- Label for setting which controls whether app can write system settings [CHAR LIMIT=45] --> <!-- Label for setting which controls whether app can write system settings [CHAR LIMIT=45] -->
<string name="permit_write_settings">Allow write system settings</string> <string name="permit_write_settings">Allow modify system settings</string>
<!-- Description of the write system settings [CHAR LIMIT=NONE] --> <!-- Description of the write system settings [CHAR LIMIT=NONE] -->
<string name="write_settings_description">This permission allows an app to read or write system settings.</string> <string name="write_settings_description">This permission allows an app to modify system settings.</string>
<!-- Summary of app allowed to write system settings [CHAR LIMIT=45] --> <!-- Summary of app allowed to write system settings [CHAR LIMIT=45] -->
<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] -->