am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev

* commit '2bd619d5ed2cdf5a34c3e3830469edc3b29a6eb0':
  Text changes to assist & voice input
This commit is contained in:
Jorim Jaggi
2015-07-06 21:04:31 +00:00
committed by Android Git Automerger

View File

@@ -6754,20 +6754,20 @@
<string name="inactive_app_active_summary">Active. Touch to toggle.</string>
<!-- Title for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=40] -->
<string name="assist_access_context_title">Use current context</string>
<string name="assist_access_context_title">Use text from screen</string>
<!-- Summary for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=NONE] -->
<string name="assist_access_context_summary">Allow the assist app to access content and metadata from the app you\u2019re using</string>
<string name="assist_access_context_summary">Allow the assist app to access the screen contents as text</string>
<!-- Title for the "screenshot" preference to determine whether assist can access the screenshot of your screen [CHAR LIMIT=40] -->
<string name="assist_access_screenshot_title">Use screenshots</string>
<string name="assist_access_screenshot_title">Use screenshot</string>
<!-- Summary for the "screenshot" preference to determine whether assist can access the screenshot of your screen [CHAR LIMIT=NONE] -->
<string name="assist_access_screenshot_summary">Allow the assist app to analyze images of the app you\u2019re using</string>
<string name="assist_access_screenshot_summary">Allow the assist app to access an image of the screen</string>
<!-- Footer text in the manage assist screen. [CHAR LIMIT=NONE] -->
<string name="assist_footer">Assist apps help you identify and act on useful information without having to ask. Some apps support both launcher and voice input services to give you integrated assistance.</string>
<string name="assist_footer">Assist apps can help you based on information from the screen you\u2019re viewing. Some apps support both launcher and voice input services to give you integrated assistance.</string>
<!-- Label for average memory use section [CHAR LIMIT=30] -->
<string name="average_memory_use">Average memory use</string>