[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 1dbbeb07c4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/19043053
Change-Id: I9028b7a8f1c2d4ad3f6fe17fb5665069cdc004ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 3133e27..9016149 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -357,13 +357,13 @@
<string name="list_language_title" msgid="1850167908665485738">"Ulimi"</string>
<string name="list_language_summary" msgid="7921756070782277559">"Khetha ulimi lwezindaba"</string>
<string-array name="list_language_entries">
- <item msgid="2347238508726934281">"English"</item>
+ <item msgid="2347238508726934281">"i-English"</item>
<item msgid="5172468397620875174">"isi-French"</item>
<item msgid="3978110664146015398">"isi-Spanish"</item>
<item msgid="2637764545851526369">"isi-Japanese"</item>
- <item msgid="6103816221834932751">"Korean"</item>
- <item msgid="3127367370005168399">"Chinese"</item>
- <item msgid="9130651361816196355">"Hebrew"</item>
+ <item msgid="6103816221834932751">"isi-Korean"</item>
+ <item msgid="3127367370005168399">"isi-Chinese"</item>
+ <item msgid="9130651361816196355">"isi-Hebrew"</item>
</string-array>
<string-array name="list_language_values">
<item msgid="798673247233934667">"1"</item>
diff --git a/src/com/android/phone/TelephonyShellCommand.java b/src/com/android/phone/TelephonyShellCommand.java
index 669e830..97676fc 100644
--- a/src/com/android/phone/TelephonyShellCommand.java
+++ b/src/com/android/phone/TelephonyShellCommand.java
@@ -1646,7 +1646,7 @@
String tag = CARRIER_CONFIG_SUBCOMMAND + " " + CC_SET_VALUES_FROM_XML + ": ";
// Parse all options
- CcOptionParseResult options = parseCcOptions(tag, false);
+ CcOptionParseResult options = parseCcOptions(tag, true);
if (options == null) {
return -1;
}