diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-11-14 17:37:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-14 17:37:30 -0800 |
| commit | 1aebcb9b934df59c6722212f5641285f5b80801b (patch) | |
| tree | 6fc37b2f449de52acc3e876221cad33ae2dd0a3e /core/res | |
| parent | e13dcf751a6de117c7dd5423a45c43d9a8a4939c (diff) | |
| parent | d21694476563e9a6efc833b78a141e9de2bb35d3 (diff) | |
| download | frameworks_base-1aebcb9b934df59c6722212f5641285f5b80801b.zip frameworks_base-1aebcb9b934df59c6722212f5641285f5b80801b.tar.gz frameworks_base-1aebcb9b934df59c6722212f5641285f5b80801b.tar.bz2 | |
am d2169447: am 2bced6dc: am a7a46a66: Merge "Update cast screen strings." into klp-dev
* commit 'd21694476563e9a6efc833b78a141e9de2bb35d3':
Update cast screen strings.
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/strings.xml | 11 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 225e7c1..d98d59a 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4104,9 +4104,12 @@ <!-- Content description of a MediaRouteButton for accessibility support --> <string name="media_route_button_content_description">Media output</string> - <!-- Title of the media route chooser dialog. [CHAR LIMIT=30] --> + <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] --> <string name="media_route_chooser_title">Connect to device</string> + <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] --> + <string name="media_route_chooser_title_for_remote_display">Cast screen to device</string> + <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] --> <string name="media_route_chooser_searching">Searching for devices\u2026</string> @@ -4149,11 +4152,11 @@ <string name="display_manager_overlay_display_secure_suffix">, secure</string> <!-- Title of the notification to indicate the process of connecting to a wifi display. [CHAR LIMIT=50] --> - <string name="wifi_display_notification_connecting_title">Starting screen cast</string> - <!-- Message of the notification to indicate the process of connectig to a wifi display. [CHAR LIMIT=80] --> + <string name="wifi_display_notification_connecting_title">Casting screen</string> + <!-- Message of the notification to indicate the process of connecting to a wifi display. [CHAR LIMIT=80] --> <string name="wifi_display_notification_connecting_message">Connecting to <xliff:g id="name">%1$s</xliff:g></string> <!-- Title of the notification to indicate an active wifi display connection. [CHAR LIMIT=50] --> - <string name="wifi_display_notification_connected_title">Screen cast in progress</string> + <string name="wifi_display_notification_connected_title">Casting screen</string> <!-- Message of the notification to indicate an active wifi display connection. [CHAR LIMIT=80] --> <string name="wifi_display_notification_connected_message">Connected to <xliff:g id="name">%1$s</xliff:g></string> <!-- Label of a button to disconnect an active wifi display connection. [CHAR LIMIT=25] --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index c6a931a..aaeb716 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1263,6 +1263,7 @@ <java-symbol type="id" name="media_route_disconnect_button" /> <java-symbol type="id" name="media_route_extended_settings_button" /> <java-symbol type="string" name="media_route_chooser_title" /> + <java-symbol type="string" name="media_route_chooser_title_for_remote_display" /> <java-symbol type="string" name="bluetooth_a2dp_audio_route_name" /> <java-symbol type="dimen" name="config_minScalingSpan" /> |