DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
Bug: 141248619
Change-Id: Ia88438d2da134b522b41e6b5545ba01e4e7b6e4d
diff --git a/car-apps-common/res/values-en-rCA/strings.xml b/car-apps-common/res/values-en-rCA/strings.xml
index 691ae06..1f7e3ee 100644
--- a/car-apps-common/res/values-en-rCA/strings.xml
+++ b/car-apps-common/res/values-en-rCA/strings.xml
@@ -19,7 +19,4 @@
<string name="control_bar_expand_collapse_button" msgid="3420351169078117938">"Expand/collapse button"</string>
<string name="car_drawer_open" msgid="2676372472514742324">"Open drawer"</string>
<string name="car_drawer_close" msgid="5329374630462464855">"Close drawer"</string>
- <string name="restricted_while_driving" msgid="2278031053760704437">"Feature not available while driving."</string>
- <string name="scroll_bar_page_down_button" msgid="8633547153186948066">"Scroll down"</string>
- <string name="scroll_bar_page_up_button" msgid="8306413844913744345">"Scroll up"</string>
</resources>
diff --git a/car-apps-common/res/values-en-rXC/strings.xml b/car-apps-common/res/values-en-rXC/strings.xml
index d9b3382..84a9342 100644
--- a/car-apps-common/res/values-en-rXC/strings.xml
+++ b/car-apps-common/res/values-en-rXC/strings.xml
@@ -19,7 +19,4 @@
<string name="control_bar_expand_collapse_button" msgid="3420351169078117938">"Expand/collapse button"</string>
<string name="car_drawer_open" msgid="2676372472514742324">"Open drawer"</string>
<string name="car_drawer_close" msgid="5329374630462464855">"Close drawer"</string>
- <string name="restricted_while_driving" msgid="2278031053760704437">"Feature not available while driving."</string>
- <string name="scroll_bar_page_down_button" msgid="8633547153186948066">"Scroll down"</string>
- <string name="scroll_bar_page_up_button" msgid="8306413844913744345">"Scroll up"</string>
</resources>
diff --git a/car-assist-client-lib/res/values-en-rCA/strings.xml b/car-assist-client-lib/res/values-en-rCA/strings.xml
index 2f5a3b7..19b57da 100644
--- a/car-assist-client-lib/res/values-en-rCA/strings.xml
+++ b/car-assist-client-lib/res/values-en-rCA/strings.xml
@@ -17,5 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="assist_action_failed_toast" msgid="3250146468076483714">"Could not request action from Assistant!"</string>
- <string name="says" msgid="8575666015622916107">"says"</string>
</resources>
diff --git a/car-assist-client-lib/res/values-en-rXC/strings.xml b/car-assist-client-lib/res/values-en-rXC/strings.xml
index d6611c0..883af6b 100644
--- a/car-assist-client-lib/res/values-en-rXC/strings.xml
+++ b/car-assist-client-lib/res/values-en-rXC/strings.xml
@@ -17,5 +17,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="assist_action_failed_toast" msgid="3250146468076483714">"Could not request action from Assistant!"</string>
- <string name="says" msgid="8575666015622916107">"says"</string>
</resources>
diff --git a/car-broadcastradio-support/res/values-en-rCA/strings.xml b/car-broadcastradio-support/res/values-en-rCA/strings.xml
index 806c9c8..07a0c33 100644
--- a/car-broadcastradio-support/res/values-en-rCA/strings.xml
+++ b/car-broadcastradio-support/res/values-en-rCA/strings.xml
@@ -18,7 +18,8 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="radio_am_text" msgid="571324921988967868">"a.m."</string>
<string name="radio_fm_text" msgid="1973045042281933494">"FM"</string>
- <string name="radio_dab_text" msgid="8456449462266648979">"DAB"</string>
+ <!-- no translation found for radio_dab_text (8456449462266648979) -->
+ <skip />
<string name="program_list_text" msgid="4414150317304422313">"Stations"</string>
<string name="favorites_list_text" msgid="7829827713977109155">"Favourites"</string>
</resources>
diff --git a/car-broadcastradio-support/res/values-en-rXC/strings.xml b/car-broadcastradio-support/res/values-en-rXC/strings.xml
index b06db6c..6fd3786 100644
--- a/car-broadcastradio-support/res/values-en-rXC/strings.xml
+++ b/car-broadcastradio-support/res/values-en-rXC/strings.xml
@@ -18,7 +18,8 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="radio_am_text" msgid="571324921988967868">"AM"</string>
<string name="radio_fm_text" msgid="1973045042281933494">"FM"</string>
- <string name="radio_dab_text" msgid="8456449462266648979">"DAB"</string>
+ <!-- no translation found for radio_dab_text (8456449462266648979) -->
+ <skip />
<string name="program_list_text" msgid="4414150317304422313">"Stations"</string>
<string name="favorites_list_text" msgid="7829827713977109155">"Favorites"</string>
</resources>
diff --git a/car-media-common/res/values-en-rCA/strings.xml b/car-media-common/res/values-en-rCA/strings.xml
index 98e3148..c2f2ef5 100644
--- a/car-media-common/res/values-en-rCA/strings.xml
+++ b/car-media-common/res/values-en-rCA/strings.xml
@@ -18,5 +18,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="album_art" msgid="3392647029019061691">"Album Art"</string>
- <string name="metadata_default_title" msgid="5902775732281325081">"No title"</string>
</resources>
diff --git a/car-media-common/res/values-en-rXC/strings.xml b/car-media-common/res/values-en-rXC/strings.xml
index ecdf930..8101b96 100644
--- a/car-media-common/res/values-en-rXC/strings.xml
+++ b/car-media-common/res/values-en-rXC/strings.xml
@@ -18,5 +18,4 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="album_art" msgid="3392647029019061691">"Album Art"</string>
- <string name="metadata_default_title" msgid="5902775732281325081">"No Title"</string>
</resources>
diff --git a/car-telephony-common/res/values-en-rCA/strings.xml b/car-telephony-common/res/values-en-rCA/strings.xml
index 06d1973..b3923a4 100644
--- a/car-telephony-common/res/values-en-rCA/strings.xml
+++ b/car-telephony-common/res/values-en-rCA/strings.xml
@@ -19,11 +19,11 @@
<string name="unknown" msgid="3237922751873109097">"Unknown"</string>
<string name="voicemail" msgid="2125552157407909509">"Voicemail"</string>
<string name="phone_label_with_info" msgid="4652109530699808645">"<xliff:g id="LABEL">%1$s</xliff:g> · <xliff:g id="DURATION">%2$s</xliff:g>"</string>
- <string name="call_state_connecting" msgid="5930724746375294866">"Connecting…"</string>
- <string name="call_state_dialing" msgid="1534599871716648114">"Dialling…"</string>
+ <string name="call_state_connecting" msgid="6844097368588248151">"Connecting"</string>
+ <string name="call_state_dialing" msgid="4397655224585553327">"Dialling"</string>
<string name="call_state_hold" msgid="6834028102796624100">"On Hold"</string>
<string name="call_state_call_ended" msgid="4159349597599886429">"Call Ended"</string>
<string name="call_state_call_active" msgid="2769644783657864202">"Connected"</string>
- <string name="call_state_call_ringing" msgid="4618803402954375017">"Ringing…"</string>
- <string name="call_state_call_ending" msgid="5037498349965472247">"Disconnecting…"</string>
+ <string name="call_state_call_ringing" msgid="2115824593555284816">"Ringing"</string>
+ <string name="call_state_call_ending" msgid="738099494362020903">"Disconnecting"</string>
</resources>
diff --git a/car-telephony-common/res/values-en-rXC/strings.xml b/car-telephony-common/res/values-en-rXC/strings.xml
index b80f8fa..ff35156 100644
--- a/car-telephony-common/res/values-en-rXC/strings.xml
+++ b/car-telephony-common/res/values-en-rXC/strings.xml
@@ -19,11 +19,11 @@
<string name="unknown" msgid="3237922751873109097">"Unknown"</string>
<string name="voicemail" msgid="2125552157407909509">"Voicemail"</string>
<string name="phone_label_with_info" msgid="4652109530699808645">"<xliff:g id="LABEL">%1$s</xliff:g> · <xliff:g id="DURATION">%2$s</xliff:g>"</string>
- <string name="call_state_connecting" msgid="5930724746375294866">"Connecting…"</string>
- <string name="call_state_dialing" msgid="1534599871716648114">"Dialing…"</string>
+ <string name="call_state_connecting" msgid="6844097368588248151">"Connecting"</string>
+ <string name="call_state_dialing" msgid="4397655224585553327">"Dialing"</string>
<string name="call_state_hold" msgid="6834028102796624100">"On Hold"</string>
<string name="call_state_call_ended" msgid="4159349597599886429">"Call Ended"</string>
<string name="call_state_call_active" msgid="2769644783657864202">"Connected"</string>
- <string name="call_state_call_ringing" msgid="4618803402954375017">"Ringing…"</string>
- <string name="call_state_call_ending" msgid="5037498349965472247">"Disconnecting…"</string>
+ <string name="call_state_call_ringing" msgid="2115824593555284816">"Ringing"</string>
+ <string name="call_state_call_ending" msgid="738099494362020903">"Disconnecting"</string>
</resources>